Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/opt/photoviewer into cm-13.0HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0

Android 6.0.1 release 22

4 files changed, 1 insertions, 35 deletions

diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 3b96aa3..c40a0ec 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -21,5 +21,4 @@
     <string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="COUNT">%d</xliff:g> ədəddən <xliff:g id="CURRENT_POS">%d</xliff:g>"</string>
     <string name="retry" msgid="3319517143224679074">"Yenidən sınayın"</string>
     <string name="failed" msgid="1458877219699376279">"Şəkil yüklənmədi"</string>
-    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 828da99..adf9620 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -19,7 +19,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> از <xliff:g id="COUNT">%d</xliff:g>"</string>
-    <string name="retry" msgid="3319517143224679074">"تلاش مجدد"</string>
+    <string name="retry" msgid="3319517143224679074">"سعی مجدد"</string>
     <string name="failed" msgid="1458877219699376279">"تصویر بارگیری نشد"</string>
     <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>،‏ <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 6c05393..0000000
--- a/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2012 Google Inc.
-     Licensed to The Android Open Source Project.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> de <xliff:g id="COUNT">%d</xliff:g>"</string>
-    <string name="retry" msgid="3319517143224679074">"Tentar novamente"</string>
-    <string name="failed" msgid="1458877219699376279">"Impossível carregar a imagem"</string>
-    <string name="titles" msgid="8072357561981153438">"<xliff:g id="TITLE_0">%s</xliff:g>, <xliff:g id="SUBTITLE">%s</xliff:g>"</string>
-</resources>
diff --git a/sample/res/values-pt-rBR/strings.xml b/sample/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 16e146a..0000000
--- a/sample/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="559800164925277094">"AmostraPhotoViewer"</string>
-    <string name="menu_settings" msgid="1259682084875185697">"Configurações"</string>
-    <string name="title_activity_main" msgid="7695239211427024237">"AtividadePrincipal"</string>
-    <string name="launch" msgid="2345080120370773520">"Iniciar o Visualizador de fotos"</string>
-</resources>