Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/screensavers/PhotoTable into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

6 files changed, 3 insertions, 93 deletions

diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
deleted file mode 100644
index 7ace481..0000000
--- a/res/values-gu-rIN/strings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2012 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="app_name" msgid="6441943862284988546">"ફોટો સ્ક્રીનસેવર્સ"</string>
-    <string name="table_screensaver_name" msgid="1150228032617397055">"ફોટો કોષ્ટક"</string>
-    <string name="flipper_screensaver_name" msgid="6988572107391523141">"ફોટો ફ્રેમ"</string>
-    <string name="posts_album_name" msgid="5628151551239729515">"પોસ્ટ્સમાંથી ફોટા"</string>
-    <string name="unknown_album_name" msgid="2135521368192091267">"અનામાંકિત આલ્બમ"</string>
-    <string name="stock_photo_album_name" msgid="3150527596227525460">"સ્ટોક ફોટા"</string>
-    <string name="local_source_name" msgid="6487253091085518505">"ઉપકરણ પરના ફોટા"</string>
-    <string name="need_to_configure" msgid="1269102638159389032">"કોઈ ફોટા પસંદ કરેલ નથી."</string>
-    <string name="photodream_select_all" msgid="6364858563337927827">"બધા પસંદ કરો"</string>
-    <string name="photodream_select_none" msgid="8816452124894525861">"તમામની પસંદગી હટાવો"</string>
-    <string name="no_photos" msgid="4262083523147564199">"ઉપકરણ પર કોઇ ફોટા નથી."</string>
-</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
deleted file mode 100644
index f8a865c..0000000
--- a/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2012 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="app_name" msgid="6441943862284988546">"Proteções de tela fotográficas"</string>
-    <string name="table_screensaver_name" msgid="1150228032617397055">"Tabela de fotos"</string>
-    <string name="flipper_screensaver_name" msgid="6988572107391523141">"Porta-retrato"</string>
-    <string name="posts_album_name" msgid="5628151551239729515">"Fotos de postagens"</string>
-    <string name="unknown_album_name" msgid="2135521368192091267">"Álbum sem nome"</string>
-    <string name="stock_photo_album_name" msgid="3150527596227525460">"Banco de fotos"</string>
-    <string name="local_source_name" msgid="6487253091085518505">"Fotos no dispositivo"</string>
-    <string name="need_to_configure" msgid="1269102638159389032">"Nenhuma foto selecionada."</string>
-    <string name="photodream_select_all" msgid="6364858563337927827">"Selecionar tudo"</string>
-    <string name="photodream_select_none" msgid="8816452124894525861">"Desmarcar tudo"</string>
-    <string name="no_photos" msgid="4262083523147564199">"Nenhuma foto no dispositivo."</string>
-</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9b0a70e..e572071 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -23,7 +23,7 @@
     <string name="unknown_album_name" msgid="2135521368192091267">"Album bez názvu"</string>
     <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotografie z fotobanky"</string>
     <string name="local_source_name" msgid="6487253091085518505">"Fotografie v zariadení"</string>
-    <string name="need_to_configure" msgid="1269102638159389032">"Nie sú vybrané žiadne fotky."</string>
+    <string name="need_to_configure" msgid="1269102638159389032">"Nie sú vybraté žiadne fotografie."</string>
     <string name="photodream_select_all" msgid="6364858563337927827">"Vybrať všetko"</string>
     <string name="photodream_select_none" msgid="8816452124894525861">"Zrušiť výber"</string>
     <string name="no_photos" msgid="4262083523147564199">"Zariadenie neobsahuje žiadne fotografie."</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
deleted file mode 100644
index e77a51c..0000000
--- a/res/values-sq-rAL/strings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2012 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="app_name" msgid="6441943862284988546">"Mbrojtësit e ekranit me fotografi"</string>
-    <string name="table_screensaver_name" msgid="1150228032617397055">"Tavolina e fotove"</string>
-    <string name="flipper_screensaver_name" msgid="6988572107391523141">"Korniza e fotos"</string>
-    <string name="posts_album_name" msgid="5628151551239729515">"Fotografitë nga postimet"</string>
-    <string name="unknown_album_name" msgid="2135521368192091267">"Album pa emër"</string>
-    <string name="stock_photo_album_name" msgid="3150527596227525460">"Ruaj fotot"</string>
-    <string name="local_source_name" msgid="6487253091085518505">"Fotografitë në pajisje"</string>
-    <string name="need_to_configure" msgid="1269102638159389032">"Nuk u zgjodh asnjë fotografi."</string>
-    <string name="photodream_select_all" msgid="6364858563337927827">"Zgjidhi të gjitha"</string>
-    <string name="photodream_select_none" msgid="8816452124894525861">"Çzgjidhi të gjitha"</string>
-    <string name="no_photos" msgid="4262083523147564199">"Nuk ka fotografi në pajisje."</string>
-</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6c2fcf4..fe6bd55 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -23,7 +23,7 @@
     <string name="unknown_album_name" msgid="2135521368192091267">"Альбом без назви"</string>
     <string name="stock_photo_album_name" msgid="3150527596227525460">"Фотографії з фотобанку"</string>
     <string name="local_source_name" msgid="6487253091085518505">"Фотографії на пристрої"</string>
-    <string name="need_to_configure" msgid="1269102638159389032">"Нічого не вибрано."</string>
+    <string name="need_to_configure" msgid="1269102638159389032">"Не вибрано жодної фотографії."</string>
     <string name="photodream_select_all" msgid="6364858563337927827">"Вибрати все"</string>
     <string name="photodream_select_none" msgid="8816452124894525861">"Відмінити все"</string>
     <string name="no_photos" msgid="4262083523147564199">"На пристрої немає фотографій."</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index b0a7eb1..ed744c0 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -23,7 +23,7 @@
     <string name="unknown_album_name" msgid="2135521368192091267">"Nomlanmagan albom"</string>
     <string name="stock_photo_album_name" msgid="3150527596227525460">"Ilovadagi rasmlar"</string>
     <string name="local_source_name" msgid="6487253091085518505">"Qurilmadagi rasmlar"</string>
-    <string name="need_to_configure" msgid="1269102638159389032">"Hech narsa tanlanmadi."</string>
+    <string name="need_to_configure" msgid="1269102638159389032">"Hech qanday rasm tanlanmadi."</string>
     <string name="photodream_select_all" msgid="6364858563337927827">"Hammasini tanlash"</string>
     <string name="photodream_select_none" msgid="8816452124894525861">"Barcha tanlovlarni bekor qilish"</string>
     <string name="no_photos" msgid="4262083523147564199">"Qurilmada rasmlar yo‘q."</string>