Merge stage-aosp-master into pi-dev-plus-aosp
am: 9519c61d4c
Change-Id: Iacc017149c304749da73928f505fdbf03f3b3ff5
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
new file mode 100644
index 0000000..3df8773
--- /dev/null
+++ b/res/values-as/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2013 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-array name="timezone_rename_labels">
+ <item msgid="4609638052107641231">"অষ্ট্ৰেলিয়াৰ কেন্দ্ৰীয় সময় - NT"</item>
+ <item msgid="4345275500159159867">"অষ্ট্ৰেলিয়াৰ কেন্দ্ৰীয় সময় - SA"</item>
+ <item msgid="6771274300523132094">"অষ্ট্ৰেলিয়াৰ প্ৰাচ্য সময় - QLD"</item>
+ <item msgid="4685547681424666687">"অষ্ট্ৰেলিয়াৰ প্ৰাচ্য সময় - NSW"</item>
+ <item msgid="5259393186526893961">"পৰ্ব্বতীয় মান সময় - ডাউচ\'ন ক্ৰেক"</item>
+ <item msgid="5984634754870859705">"কেন্দ্ৰীয় মান সময় - ছাছকাটছেৱান"</item>
+ <item msgid="5340374311583423836">"প্ৰাচ্য মান সময় - আটিক\'কান"</item>
+ <item msgid="8922086438245451625">"আটলাণ্টিক মান সময় - কিউবেক"</item>
+ <item msgid="8353677384517034413">"হাৱাই-এলুৱেটিয়ান - হাৱাই"</item>
+ <item msgid="6426791761018806420">"হাৱাই-এলুৱেটিয়ান - আলাস্কা"</item>
+ <item msgid="7076353182411415610">"প্ৰশান্ত মান সময় - মেটলাকাটলা"</item>
+ <item msgid="373990592918179890">"পৰ্ব্বতীয় মান সময় - আৰিজোৱানা"</item>
+ <item msgid="353899326999279114">"প্ৰশান্ত মহাসাগৰীয় সময় - বাজা কেলিফ\'ৰ্নিয়া"</item>
+ <item msgid="6432134534714673873">"পৰ্ব্বতীয় মান সময় - চিহুৱাহুৱা"</item>
+ <item msgid="7629345735485663968">"কেন্দ্ৰীয় সময় - টামাওলিপাচ"</item>
+ <item msgid="3874729044260979505">"পৰ্ব্বতীয় মান সময় - চ\'ন\'ৰা"</item>
+ <item msgid="1106209575683600471">"পূব আফ্ৰিকাৰ সময়"</item>
+ <item msgid="6538017087072480128">"আটলাণ্টিক মান সময়"</item>
+ <item msgid="6758957851822881177">"আটলাণ্টিক মান সময়"</item>
+ <item msgid="2477556470536619081">"প্ৰাচ্য ইউৰোপীয় সময়"</item>
+ <item msgid="7328461310893621937">"কালিনিনগ্ৰাডৰ সময়"</item>
+ <item msgid="4212642599758736931">"আমাজনৰ সময় - ৰ\'ণ্ড\'নিয়া"</item>
+ <item msgid="2370319280810537375">"ব্ৰাজিলিয়াৰ সময় - পেৰে"</item>
+ </string-array>
+ <string-array name="backup_country_names">
+ <item msgid="9141777876082196578">"ছেইণ্ট মাৰ্টিন"</item>
+ <item msgid="5330962017221568054">"কেৰিবিয়ান নেডাৰলেণ্ড"</item>
+ <item msgid="1465164631761814300">"কাৰাকাও"</item>
+ <item msgid="8972081011408691260">"দক্ষিণ ছুডান"</item>
+ </string-array>
+</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
new file mode 100644
index 0000000..94c1751
--- /dev/null
+++ b/res/values-as/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2013 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="hint_time_zone_search" msgid="804776560897143016">"দেশৰ নাম লিখক"</string>
+ <string name="searchview_description_clear" msgid="1603860069305867810">"প্ৰশ্ন মচক"</string>
+ <string name="no_results_found" msgid="5475293015394772651">"কোনো ফলাফল পোৱা নগ’ল"</string>
+ <string name="palestine_display_name" msgid="3485026339977302148">"পেলেষ্টাইন"</string>
+</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 35d7305..39e2f16 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -18,7 +18,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hint_time_zone_search" msgid="804776560897143016">"Unesite ime države"</string>
- <string name="searchview_description_clear" msgid="1603860069305867810">"Izbrisati upit"</string>
- <string name="no_results_found" msgid="5475293015394772651">"Rezultati nisu pronađeni"</string>
+ <string name="searchview_description_clear" msgid="1603860069305867810">"Obriši upit"</string>
+ <string name="no_results_found" msgid="5475293015394772651">"Nije pronađen nijedan rezultat"</string>
<string name="palestine_display_name" msgid="3485026339977302148">"Palestina"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 87c5ed0..92026dc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="hint_time_zone_search" msgid="804776560897143016">"Indtast landenavn"</string>
+ <string name="hint_time_zone_search" msgid="804776560897143016">"Angiv landenavn"</string>
<string name="searchview_description_clear" msgid="1603860069305867810">"Ryd forespørgslen"</string>
<string name="no_results_found" msgid="5475293015394772651">"Der blev ikke fundet nogen resultater"</string>
<string name="palestine_display_name" msgid="3485026339977302148">"Palæstina"</string>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index 0fbf370..8d9b28a 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -18,34 +18,34 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="timezone_rename_labels">
- <item msgid="4609638052107641231">"Australian Central - NT"</item>
- <item msgid="4345275500159159867">"Australian Central - SA"</item>
- <item msgid="6771274300523132094">"Australian Eastern - QLD"</item>
- <item msgid="4685547681424666687">"Australian Eastern - NSW"</item>
- <item msgid="5259393186526893961">"Mountain Standard - Dawson Creek"</item>
- <item msgid="5984634754870859705">"Central Standard - Saskatchewan"</item>
- <item msgid="5340374311583423836">"Eastern Standard - Atikokan"</item>
- <item msgid="8922086438245451625">"Atlantic Standard - Quebec"</item>
- <item msgid="8353677384517034413">"Hawaii-Aleutian - Hawaii"</item>
- <item msgid="6426791761018806420">"Hawaii-Aleutian - Alaska"</item>
- <item msgid="7076353182411415610">"Pacific Standard - Metlakatla"</item>
- <item msgid="373990592918179890">"Mountain Standard - Arizona"</item>
- <item msgid="353899326999279114">"Pacific - Baja California"</item>
- <item msgid="6432134534714673873">"Mountain - Chihuahua"</item>
- <item msgid="7629345735485663968">"Central - Tamaulipas"</item>
- <item msgid="3874729044260979505">"Mountain - Sonora"</item>
- <item msgid="1106209575683600471">"East Africa Time"</item>
- <item msgid="6538017087072480128">"Atlantic Standard Time"</item>
- <item msgid="6758957851822881177">"Atlantic Standard Time"</item>
- <item msgid="2477556470536619081">"Eastern European Time"</item>
- <item msgid="7328461310893621937">"Kaliningrad Time"</item>
- <item msgid="4212642599758736931">"Amazon - Rondônia"</item>
- <item msgid="2370319280810537375">"Brasilia - Pará"</item>
+ <item msgid="4609638052107641231">"Australian Central - NT"</item>
+ <item msgid="4345275500159159867">"Australian Central - SA"</item>
+ <item msgid="6771274300523132094">"Australian Eastern - QLD"</item>
+ <item msgid="4685547681424666687">"Australian Eastern - NSW"</item>
+ <item msgid="5259393186526893961">"Mountain Standard - Dawson Creek"</item>
+ <item msgid="5984634754870859705">"Central Standard - Saskatchewan"</item>
+ <item msgid="5340374311583423836">"Eastern Standard - Atikokan"</item>
+ <item msgid="8922086438245451625">"Atlantic Standard - Quebec"</item>
+ <item msgid="8353677384517034413">"Hawaii-Aleutian - Hawaii"</item>
+ <item msgid="6426791761018806420">"Hawaii-Aleutian - Alaska"</item>
+ <item msgid="7076353182411415610">"Pacific Standard - Metlakatla"</item>
+ <item msgid="373990592918179890">"Mountain Standard - Arizona"</item>
+ <item msgid="353899326999279114">"Pacific - Baja California"</item>
+ <item msgid="6432134534714673873">"Mountain - Chihuahua"</item>
+ <item msgid="7629345735485663968">"Central - Tamaulipas"</item>
+ <item msgid="3874729044260979505">"Mountain - Sonora"</item>
+ <item msgid="1106209575683600471">"East Africa Time"</item>
+ <item msgid="6538017087072480128">"Atlantic Standard Time"</item>
+ <item msgid="6758957851822881177">"Atlantic Standard Time"</item>
+ <item msgid="2477556470536619081">"Eastern European Time"</item>
+ <item msgid="7328461310893621937">"Kaliningrad Time"</item>
+ <item msgid="4212642599758736931">"Amazon - Rondônia"</item>
+ <item msgid="2370319280810537375">"Brasilia - Pará"</item>
</string-array>
<string-array name="backup_country_names">
- <item msgid="9141777876082196578">"Sint Maarten"</item>
- <item msgid="5330962017221568054">"Caribbean Netherlands"</item>
- <item msgid="1465164631761814300">"Curaçao"</item>
- <item msgid="8972081011408691260">"South Sudan"</item>
+ <item msgid="9141777876082196578">"Sint Maarten"</item>
+ <item msgid="5330962017221568054">"Caribbean Netherlands"</item>
+ <item msgid="1465164631761814300">"Curaçao"</item>
+ <item msgid="8972081011408691260">"South Sudan"</item>
</string-array>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 9cd5ae2..f48241d 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -17,8 +17,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="hint_time_zone_search" msgid="804776560897143016">"Type country name"</string>
- <string name="searchview_description_clear" msgid="1603860069305867810">"Clear query"</string>
- <string name="no_results_found" msgid="5475293015394772651">"No results found"</string>
- <string name="palestine_display_name" msgid="3485026339977302148">"Palestine"</string>
+ <string name="hint_time_zone_search" msgid="804776560897143016">"Type country name"</string>
+ <string name="searchview_description_clear" msgid="1603860069305867810">"Clear query"</string>
+ <string name="no_results_found" msgid="5475293015394772651">"No results found"</string>
+ <string name="palestine_display_name" msgid="3485026339977302148">"Palestine"</string>
</resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index e1e6144..61f3247 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -43,7 +43,7 @@
<item msgid="2370319280810537375">"Brazília – Pará"</item>
</string-array>
<string-array name="backup_country_names">
- <item msgid="9141777876082196578">"Sint Maarten"</item>
+ <item msgid="9141777876082196578">"Svätý Martin (hol.)"</item>
<item msgid="5330962017221568054">"Karibské Holandsko"</item>
<item msgid="1465164631761814300">"Curaçao"</item>
<item msgid="8972081011408691260">"Južný Sudán"</item>
