diff --git a/res/values-az-rAZ/arrays.xml b/res/values-az/arrays.xml
similarity index 100%
rename from res/values-az-rAZ/arrays.xml
rename to res/values-az/arrays.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
similarity index 100%
rename from res/values-az-rAZ/strings.xml
rename to res/values-az/strings.xml
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
new file mode 100644
index 0000000..3baeac6
--- /dev/null
+++ b/res/values-be/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">"Усходнеаўстрал. час - Квінсленд"</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-my-rMM/strings.xml b/res/values-be/strings.xml
similarity index 78%
copy from res/values-my-rMM/strings.xml
copy to res/values-be/strings.xml
index a35422c..e1209d2 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-be/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">"နိုင်ငံ အမည်ကို တိုက်ရိုက်ပါ"</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>
+    <string name="hint_time_zone_search" msgid="804776560897143016">"Увядзіце назву краіны"</string>
+    <string name="searchview_description_clear" msgid="1603860069305867810">"Выдалiць запыт"</string>
+    <string name="no_results_found" msgid="5475293015394772651">"Вынікі не знойдзены"</string>
+    <string name="palestine_display_name" msgid="3485026339977302148">"Палестына"</string>
 </resources>
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn/arrays.xml
similarity index 100%
rename from res/values-bn-rBD/arrays.xml
rename to res/values-bn/arrays.xml
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml
similarity index 100%
rename from res/values-bn-rBD/strings.xml
rename to res/values-bn/strings.xml
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
new file mode 100644
index 0000000..ee0525d
--- /dev/null
+++ b/res/values-bs/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">"Australijsko centralno - SV"</item>
+    <item msgid="4345275500159159867">"Australijsko centralno - JA"</item>
+    <item msgid="6771274300523132094">"Australijsko istočno - QLD"</item>
+    <item msgid="4685547681424666687">"Australijsko istočno- NSW"</item>
+    <item msgid="5259393186526893961">"Planinsko  standardno - Dawson Creek"</item>
+    <item msgid="5984634754870859705">"centralno standardno - Saskatchewan"</item>
+    <item msgid="5340374311583423836">"istočno standardno - Atikokan"</item>
+    <item msgid="8922086438245451625">"atlantsko standardno - Quebec"</item>
+    <item msgid="8353677384517034413">"Hawaii-Aleutian - Hawaii"</item>
+    <item msgid="6426791761018806420">"Hawaii-Aleutian - Aljaska"</item>
+    <item msgid="7076353182411415610">"Pacifičko standardno - Metlakatla"</item>
+    <item msgid="373990592918179890">"Planinsko standardno - Arizona"</item>
+    <item msgid="353899326999279114">"Pacifik - Baja Kalifornija"</item>
+    <item msgid="6432134534714673873">"Planina - Chihuahua"</item>
+    <item msgid="7629345735485663968">"Centralno - Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Planina - Sonora"</item>
+    <item msgid="1106209575683600471">"Istočnoafričko vrijeme"</item>
+    <item msgid="6538017087072480128">"Atlantsko standardno vrijeme"</item>
+    <item msgid="6758957851822881177">"Atlantsko standardno vrijeme"</item>
+    <item msgid="2477556470536619081">"Istočnoevropsko vrijeme"</item>
+    <item msgid="7328461310893621937">"Vrijeme u Kaljiningradu"</item>
+    <item msgid="4212642599758736931">"Amazon - Rondônia"</item>
+    <item msgid="2370319280810537375">"Brazilija - Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Sint Maarten"</item>
+    <item msgid="5330962017221568054">"Karibi Nizozemska"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Južni Sudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-bs/strings.xml
similarity index 78%
copy from res/values-my-rMM/strings.xml
copy to res/values-bs/strings.xml
index a35422c..35d7305 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-bs/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">"နိုင်ငံ အမည်ကို တိုက်ရိုက်ပါ"</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>
+    <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="palestine_display_name" msgid="3485026339977302148">"Palestina"</string>
 </resources>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et/arrays.xml
similarity index 100%
rename from res/values-et-rEE/arrays.xml
rename to res/values-et/arrays.xml
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
similarity index 100%
rename from res/values-et-rEE/strings.xml
rename to res/values-et/strings.xml
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu/arrays.xml
similarity index 100%
rename from res/values-eu-rES/arrays.xml
rename to res/values-eu/arrays.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
similarity index 100%
rename from res/values-eu-rES/strings.xml
rename to res/values-eu/strings.xml
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 81b5224..be6b2a3 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -19,6 +19,6 @@
     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="no_results_found" msgid="5475293015394772651">"نتیجه‌ای پیدا نشد"</string>
     <string name="palestine_display_name" msgid="3485026339977302148">"فلسطین"</string>
 </resources>
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl/arrays.xml
similarity index 100%
rename from res/values-gl-rES/arrays.xml
rename to res/values-gl/arrays.xml
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
similarity index 100%
rename from res/values-gl-rES/strings.xml
rename to res/values-gl/strings.xml
diff --git a/res/values-gu-rIN/arrays.xml b/res/values-gu/arrays.xml
similarity index 100%
rename from res/values-gu-rIN/arrays.xml
rename to res/values-gu/arrays.xml
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml
similarity index 100%
rename from res/values-gu-rIN/strings.xml
rename to res/values-gu/strings.xml
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy/arrays.xml
similarity index 100%
rename from res/values-hy-rAM/arrays.xml
rename to res/values-hy/arrays.xml
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml
similarity index 100%
rename from res/values-hy-rAM/strings.xml
rename to res/values-hy/strings.xml
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is/arrays.xml
similarity index 100%
rename from res/values-is-rIS/arrays.xml
rename to res/values-is/arrays.xml
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml
similarity index 100%
rename from res/values-is-rIS/strings.xml
rename to res/values-is/strings.xml
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka/arrays.xml
similarity index 100%
rename from res/values-ka-rGE/arrays.xml
rename to res/values-ka/arrays.xml
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml
similarity index 100%
rename from res/values-ka-rGE/strings.xml
rename to res/values-ka/strings.xml
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk/arrays.xml
similarity index 100%
rename from res/values-kk-rKZ/arrays.xml
rename to res/values-kk/arrays.xml
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml
similarity index 100%
rename from res/values-kk-rKZ/strings.xml
rename to res/values-kk/strings.xml
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km/arrays.xml
similarity index 100%
rename from res/values-km-rKH/arrays.xml
rename to res/values-km/arrays.xml
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml
similarity index 100%
rename from res/values-km-rKH/strings.xml
rename to res/values-km/strings.xml
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn/arrays.xml
similarity index 100%
rename from res/values-kn-rIN/arrays.xml
rename to res/values-kn/arrays.xml
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml
similarity index 100%
rename from res/values-kn-rIN/strings.xml
rename to res/values-kn/strings.xml
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky/arrays.xml
similarity index 100%
rename from res/values-ky-rKG/arrays.xml
rename to res/values-ky/arrays.xml
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml
similarity index 100%
rename from res/values-ky-rKG/strings.xml
rename to res/values-ky/strings.xml
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo/arrays.xml
similarity index 100%
rename from res/values-lo-rLA/arrays.xml
rename to res/values-lo/arrays.xml
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml
similarity index 100%
rename from res/values-lo-rLA/strings.xml
rename to res/values-lo/strings.xml
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk/arrays.xml
similarity index 100%
rename from res/values-mk-rMK/arrays.xml
rename to res/values-mk/arrays.xml
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml
similarity index 100%
rename from res/values-mk-rMK/strings.xml
rename to res/values-mk/strings.xml
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml/arrays.xml
similarity index 100%
rename from res/values-ml-rIN/arrays.xml
rename to res/values-ml/arrays.xml
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml
similarity index 100%
rename from res/values-ml-rIN/strings.xml
rename to res/values-ml/strings.xml
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn/arrays.xml
similarity index 100%
rename from res/values-mn-rMN/arrays.xml
rename to res/values-mn/arrays.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml
similarity index 100%
rename from res/values-mn-rMN/strings.xml
rename to res/values-mn/strings.xml
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr/arrays.xml
similarity index 100%
rename from res/values-mr-rIN/arrays.xml
rename to res/values-mr/arrays.xml
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml
similarity index 100%
rename from res/values-mr-rIN/strings.xml
rename to res/values-mr/strings.xml
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms/arrays.xml
similarity index 100%
rename from res/values-ms-rMY/arrays.xml
rename to res/values-ms/arrays.xml
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml
similarity index 100%
rename from res/values-ms-rMY/strings.xml
rename to res/values-ms/strings.xml
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my/arrays.xml
similarity index 100%
rename from res/values-my-rMM/arrays.xml
rename to res/values-my/arrays.xml
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml
similarity index 95%
rename from res/values-my-rMM/strings.xml
rename to res/values-my/strings.xml
index a35422c..5e0f6cc 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my/strings.xml
@@ -19,6 +19,6 @@
     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="no_results_found" msgid="5475293015394772651">"ရလဒ်များ မတွေ့ပါ"</string>
     <string name="palestine_display_name" msgid="3485026339977302148">"ပါလက်စ်တိုင်း"</string>
 </resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne/arrays.xml
similarity index 100%
rename from res/values-ne-rNP/arrays.xml
rename to res/values-ne/arrays.xml
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml
similarity index 100%
rename from res/values-ne-rNP/strings.xml
rename to res/values-ne/strings.xml
diff --git a/res/values-pa-rIN/arrays.xml b/res/values-pa/arrays.xml
similarity index 100%
rename from res/values-pa-rIN/arrays.xml
rename to res/values-pa/arrays.xml
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml
similarity index 100%
rename from res/values-pa-rIN/strings.xml
rename to res/values-pa/strings.xml
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 51e00ea..b5226c9 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -40,7 +40,7 @@
     <item msgid="2477556470536619081">"Czas wschodnioeuropejski"</item>
     <item msgid="7328461310893621937">"Czas Kaliningradu"</item>
     <item msgid="4212642599758736931">"Amazonia – Rondônia"</item>
-    <item msgid="2370319280810537375">"Brazylia – Pará"</item>
+    <item msgid="2370319280810537375">"Brasilia – Pará"</item>
   </string-array>
   <string-array name="backup_country_names">
     <item msgid="9141777876082196578">"Sint Maarten"</item>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si/arrays.xml
similarity index 100%
rename from res/values-si-rLK/arrays.xml
rename to res/values-si/arrays.xml
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml
similarity index 100%
rename from res/values-si-rLK/strings.xml
rename to res/values-si/strings.xml
diff --git a/res/values-sq-rAL/arrays.xml b/res/values-sq/arrays.xml
similarity index 100%
rename from res/values-sq-rAL/arrays.xml
rename to res/values-sq/arrays.xml
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml
similarity index 100%
rename from res/values-sq-rAL/strings.xml
rename to res/values-sq/strings.xml
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta/arrays.xml
similarity index 100%
rename from res/values-ta-rIN/arrays.xml
rename to res/values-ta/arrays.xml
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml
similarity index 100%
rename from res/values-ta-rIN/strings.xml
rename to res/values-ta/strings.xml
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te/arrays.xml
similarity index 100%
rename from res/values-te-rIN/arrays.xml
rename to res/values-te/arrays.xml
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml
similarity index 100%
rename from res/values-te-rIN/strings.xml
rename to res/values-te/strings.xml
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur/arrays.xml
similarity index 100%
rename from res/values-ur-rPK/arrays.xml
rename to res/values-ur/arrays.xml
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml
similarity index 100%
rename from res/values-ur-rPK/strings.xml
rename to res/values-ur/strings.xml
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz/arrays.xml
similarity index 100%
rename from res/values-uz-rUZ/arrays.xml
rename to res/values-uz/arrays.xml
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml
similarity index 100%
rename from res/values-uz-rUZ/strings.xml
rename to res/values-uz/strings.xml