Merge "Merge Android Pie into master"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index abf6ed2..0ddeef2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -26,5 +26,5 @@
     <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>
+    <string name="no_photos" msgid="4262083523147564199">"لا يحتوي الجهاز على أي صور."</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
new file mode 100644
index 0000000..a81d1c5
--- /dev/null
+++ b/res/values-as/strings.xml
@@ -0,0 +1,30 @@
+<?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-bn/strings.xml b/res/values-bn/strings.xml
index 89e491f..52ce6b2 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -22,7 +22,7 @@
     <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="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>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..6e661d9
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,30 @@
+<?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">"Photo Screensavers"</string>
+    <string name="table_screensaver_name" msgid="1150228032617397055">"Photo Table"</string>
+    <string name="flipper_screensaver_name" msgid="6988572107391523141">"Photo Frame"</string>
+    <string name="posts_album_name" msgid="5628151551239729515">"Photos From Posts"</string>
+    <string name="unknown_album_name" msgid="2135521368192091267">"Unnamed Album"</string>
+    <string name="stock_photo_album_name" msgid="3150527596227525460">"Stock photos"</string>
+    <string name="local_source_name" msgid="6487253091085518505">"Photos on Device"</string>
+    <string name="need_to_configure" msgid="1269102638159389032">"No photos selected."</string>
+    <string name="photodream_select_all" msgid="6364858563337927827">"Select All"</string>
+    <string name="photodream_select_none" msgid="8816452124894525861">"Deselect All"</string>
+    <string name="no_photos" msgid="4262083523147564199">"No photos on the device."</string>
+</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..43b38d0
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,30 @@
+<?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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‎Photo Screensavers‎‏‎‎‏‎"</string>
+    <string name="table_screensaver_name" msgid="1150228032617397055">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎Photo Table‎‏‎‎‏‎"</string>
+    <string name="flipper_screensaver_name" msgid="6988572107391523141">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎Photo Frame‎‏‎‎‏‎"</string>
+    <string name="posts_album_name" msgid="5628151551239729515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎Photos from Posts‎‏‎‎‏‎"</string>
+    <string name="unknown_album_name" msgid="2135521368192091267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎Unnamed Album‎‏‎‎‏‎"</string>
+    <string name="stock_photo_album_name" msgid="3150527596227525460">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎Stock Photos‎‏‎‎‏‎"</string>
+    <string name="local_source_name" msgid="6487253091085518505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎Photos on Device‎‏‎‎‏‎"</string>
+    <string name="need_to_configure" msgid="1269102638159389032">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎No photos selected.‎‏‎‎‏‎"</string>
+    <string name="photodream_select_all" msgid="6364858563337927827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎Select All‎‏‎‎‏‎"</string>
+    <string name="photodream_select_none" msgid="8816452124894525861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎Deselect All‎‏‎‎‏‎"</string>
+    <string name="no_photos" msgid="4262083523147564199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎No photos on the device.‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
new file mode 100644
index 0000000..aa6d160
--- /dev/null
+++ b/res/values-or/strings.xml
@@ -0,0 +1,30 @@
+<?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-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b394d7b..92bd1d4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -23,8 +23,8 @@
     <string name="unknown_album_name" msgid="2135521368192091267">"Álbum Sem Nome"</string>
     <string name="stock_photo_album_name" msgid="3150527596227525460">"Banco de Imagens"</string>
     <string name="local_source_name" msgid="6487253091085518505">"Fotos no Dispositivo"</string>
-    <string name="need_to_configure" msgid="1269102638159389032">"Nenhuma fotografia selecionada."</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">"Sem fotografias no dispositivo."</string>
+    <string name="no_photos" msgid="4262083523147564199">"Sem fotos no dispositivo."</string>
 </resources>