diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 50aa126..8785179 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Land"</string>
-    <string name="country" msgid="4435526943498223723">"Land"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT-skikking"</string>
-    <string name="local_time" msgid="6767659693881978111">"Plaaslike tyd (uur)"</string>
-    <string name="results_country" msgid="8042876404471058354">"TYDSONES IN <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"TYDSONES IN GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"TYDSONES BY <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Vee navraag uit"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
new file mode 100644
index 0000000..d420f58
--- /dev/null
+++ b/res/values-am/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">"የአውስትራሊያ ማዕከላዊ - ኤን ቲ"</item>
+    <item msgid="4345275500159159867">"የአውትራሊያ ማዕከላዊ - ኤስ ኤ"</item>
+    <item msgid="6771274300523132094">"የአውትራሊያ ምስራቃዊ - ኪዩ ኤል ዲ"</item>
+    <item msgid="4685547681424666687">"የአውስትራሊያ ምስራቃዊ - ኤን ኤስ ደብልዩ"</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-am/strings.xml b/res/values-am/strings.xml
index 0c26b6f..2c7df7a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"አገር"</string>
-    <string name="country" msgid="4435526943498223723">"አገር"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"የጂ ኤም ቲ ሽግሽግ"</string>
-    <string name="local_time" msgid="6767659693881978111">"የአካባቢው ሰዓት (ሰ)"</string>
-    <string name="results_country" msgid="8042876404471058354">"በ<xliff:g id="COUNTRY">%s</xliff:g> ያሉ የሰዓት ሰቆች"</string>
-    <string name="results_gmt" msgid="150119647642882676">"በጂ ኤም ቲ <xliff:g id="OFFSET">%s</xliff:g> ያሉ የሰዓት ሰቆች"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"<xliff:g id="LOCAL_TIME">%s</xliff:g> ላይ ያሉ የሰዓት ሰቆች"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"መጠይቅ ያጽዱ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bd88c0f..7fa9a19 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"البلد"</string>
-    <string name="country" msgid="4435526943498223723">"البلد"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"موازنة توقيت غرينيتش"</string>
-    <string name="local_time" msgid="6767659693881978111">"التوقيت المحلي (بالساعات)"</string>
-    <string name="results_country" msgid="8042876404471058354">"المناطق الزمنية في <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"المناطق الزمنية بتوقيت غرينيتش <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"المناطق الزمنية بتوقيت <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"محو طلب البحث"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index dadf6cb..209d7bd 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Краіна"</string>
-    <string name="country" msgid="4435526943498223723">"Краіна"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Часавы пояс"</string>
-    <string name="local_time" msgid="6767659693881978111">"Мясцовы час (гадзіны)"</string>
-    <string name="results_country" msgid="8042876404471058354">"Часавыя паясы: <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"Часавыя паясы (GMT): <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"Часавыя паясы: <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Выдалiць запыт"</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
new file mode 100644
index 0000000..683323c
--- /dev/null
+++ b/res/values-bg/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">"Центр. австрал. – Сев. територия"</item>
+    <item msgid="4345275500159159867">"Центр. австрал. – Южна Австралия"</item>
+    <item msgid="6771274300523132094">"Австралийско източно – Куинсланд"</item>
+    <item msgid="4685547681424666687">"Австр. източно – Нови Южен Уелс"</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-bg/strings.xml b/res/values-bg/strings.xml
index af93f4f..96bd5d9 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Държава"</string>
-    <string name="country" msgid="4435526943498223723">"Държава"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Часова разлика спрямо GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Местно време (ч)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ЧАСОВИ ЗОНИ ВЪВ: <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ЧАСОВИ ЗОНИ В GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ЧАСОВИ ЗОНИ ВЪВ: <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Изчистване на заявката"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
new file mode 100644
index 0000000..8d0505d
--- /dev/null
+++ b/res/values-ca/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">"Hora del centre d\'Austràlia - NT"</item>
+    <item msgid="4345275500159159867">"Hora del centre d\'Austràlia - SA"</item>
+    <item msgid="6771274300523132094">"Hora de l\'est d\'Austràlia - QLD"</item>
+    <item msgid="4685547681424666687">"Hora de l\'est d\'Austràlia - NSW"</item>
+    <item msgid="5259393186526893961">"Hora estàndard de les Muntanyes - Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Hora estàndard central - Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Hora estàndard de l\'est - Atikokan"</item>
+    <item msgid="8922086438245451625">"Hora estàndard de l\'Atlàntic - Quebec"</item>
+    <item msgid="8353677384517034413">"Hora de Hawaii-Illes Aleutianes - Hawaii"</item>
+    <item msgid="6426791761018806420">"Hora de Hawaii-Illes Aleutianes - Alaska"</item>
+    <item msgid="7076353182411415610">"Hora estàndard del Pacífic - Metlakatla"</item>
+    <item msgid="373990592918179890">"Hora estàndard de les Muntanyes - Arizona"</item>
+    <item msgid="353899326999279114">"Hora del Pacífic - Baix Califòrnia"</item>
+    <item msgid="6432134534714673873">"Hora de les Muntanyes - Chihuahua"</item>
+    <item msgid="7629345735485663968">"Hora central - Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Hora de les Muntanyes - Sonora"</item>
+    <item msgid="1106209575683600471">"Hora de l\'Àfrica Oriental"</item>
+    <item msgid="6538017087072480128">"Hora estàndard de l\'Atlàntic"</item>
+    <item msgid="6758957851822881177">"Hora estàndard de l\'Atlàntic"</item>
+    <item msgid="2477556470536619081">"Hora de l\'est d\'Europa"</item>
+    <item msgid="7328461310893621937">"Hora de Kaliningrad"</item>
+    <item msgid="4212642599758736931">"Amazònia - Rondônia"</item>
+    <item msgid="2370319280810537375">"Brasília - Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Sint Maarten"</item>
+    <item msgid="5330962017221568054">"Carib neerlandès"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Sudan del Sud"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d2ed740..6c53f54 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"País"</string>
-    <string name="country" msgid="4435526943498223723">"País"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Diferència amb GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Hora local (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ZONES HORÀRIES A <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ZONES HORÀRIES EN GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ZONES HORÀRIES A LES <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Esborra la consulta"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
new file mode 100644
index 0000000..be0398f
--- /dev/null
+++ b/res/values-cs/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">"Středoaustralský čas – NT"</item>
+    <item msgid="4345275500159159867">"Středoaustralský čas – SA"</item>
+    <item msgid="6771274300523132094">"Východoaustralský čas – QLD"</item>
+    <item msgid="4685547681424666687">"Východoaustralský čas – NSW"</item>
+    <item msgid="5259393186526893961">"Horský standardní – Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Centrální standardní – Saskatch."</item>
+    <item msgid="5340374311583423836">"Východní standardní – Atikokan"</item>
+    <item msgid="8922086438245451625">"Atlantický standardní – Québec"</item>
+    <item msgid="8353677384517034413">"Havajsko-aleutský čas – Havaj"</item>
+    <item msgid="6426791761018806420">"Havajsko-aleutský čas – Aljaška"</item>
+    <item msgid="7076353182411415610">"Pacific. standardní – Metlakatla"</item>
+    <item msgid="373990592918179890">"Horský standardní čas – Arizona"</item>
+    <item msgid="353899326999279114">"Pacifický čas – Baja California"</item>
+    <item msgid="6432134534714673873">"Horský čas – Chihuahua"</item>
+    <item msgid="7629345735485663968">"Centrální čas – Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Horský čas – Sonora"</item>
+    <item msgid="1106209575683600471">"Východoafrický čas"</item>
+    <item msgid="6538017087072480128">"Atlantický standardní čas"</item>
+    <item msgid="6758957851822881177">"Atlantický standardní čas"</item>
+    <item msgid="2477556470536619081">"Východoevropský čas"</item>
+    <item msgid="7328461310893621937">"Kaliningradský čas"</item>
+    <item msgid="4212642599758736931">"Amazonie – Rondônia"</item>
+    <item msgid="2370319280810537375">"Brazílie – Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Sint Maarten"</item>
+    <item msgid="5330962017221568054">"Karibské Nizozemsko"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Jižní Súdán"</item>
+  </string-array>
+</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 22baf75..64858a5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Země"</string>
-    <string name="country" msgid="4435526943498223723">"Země"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Časový posun od pásma GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Místní čas (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ČASOVÁ PÁSMA V ZEMI <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ČASOVÁ PÁSMA S POSUNEM <xliff:g id="OFFSET">%s</xliff:g> OD GMT"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ČASOVÁ PÁSMA V <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Smazat dotaz"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
new file mode 100644
index 0000000..0eafeff
--- /dev/null
+++ b/res/values-da/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">"Australsk centraltid – NT"</item>
+    <item msgid="4345275500159159867">"Australsk centraltid – SA"</item>
+    <item msgid="6771274300523132094">"Australsk tid (øst) – QLD"</item>
+    <item msgid="4685547681424666687">"Australsk tid (øst) – NSW"</item>
+    <item msgid="5259393186526893961">"Mountain-normaltid – Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Normaltid (central) – Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Normaltid (øst) – Atikokan"</item>
+    <item msgid="8922086438245451625">"Atlantic-normaltid – Quebec"</item>
+    <item msgid="8353677384517034413">"Hawaii-Aleutian – Hawaii"</item>
+    <item msgid="6426791761018806420">"Hawaii-Aleutian – Alaska"</item>
+    <item msgid="7076353182411415610">"Pacific-normaltid – Metlakatla"</item>
+    <item msgid="373990592918179890">"Mountain-normaltid –- Arizona"</item>
+    <item msgid="353899326999279114">"Pacific – Baja California"</item>
+    <item msgid="6432134534714673873">"Mountain – Chihuahua"</item>
+    <item msgid="7629345735485663968">"Centraltid – Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Mountain – Sonora"</item>
+    <item msgid="1106209575683600471">"Østafrikansk tid"</item>
+    <item msgid="6538017087072480128">"Atlantic-normaltid"</item>
+    <item msgid="6758957851822881177">"Atlantic-normaltid"</item>
+    <item msgid="2477556470536619081">"Østeuropæisk tid"</item>
+    <item msgid="7328461310893621937">"Kaliningrad-tid"</item>
+    <item msgid="4212642599758736931">"Amazona – 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">"Hollandsk Caribien"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Sydsudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f110cdc..556861f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Land"</string>
-    <string name="country" msgid="4435526943498223723">"Land"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT-forskydning"</string>
-    <string name="local_time" msgid="6767659693881978111">"Lokal tid (timer)"</string>
-    <string name="results_country" msgid="8042876404471058354">"Tidszoner i <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"TIDSZONER I GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"TIDSZONER KL. <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Ryd forespørgslen"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
new file mode 100644
index 0000000..4b1d776
--- /dev/null
+++ b/res/values-de/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">"Zentral-Australien – NT"</item>
+    <item msgid="4345275500159159867">"Zentral-Australien – SA"</item>
+    <item msgid="6771274300523132094">"Ost-Australien – QLD"</item>
+    <item msgid="4685547681424666687">"Ost-Australien – 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">"Ostafrikanische Zeit"</item>
+    <item msgid="6538017087072480128">"Atlantische Standardzeit"</item>
+    <item msgid="6758957851822881177">"Atlantische Standardzeit"</item>
+    <item msgid="2477556470536619081">"Osteuropäische Zeit"</item>
+    <item msgid="7328461310893621937">"Kaliningrad"</item>
+    <item msgid="4212642599758736931">"Amazonas – 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">"Karibische Niederlande"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Südsudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d5aa7c9..a7e2750 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Land"</string>
-    <string name="country" msgid="4435526943498223723">"Land"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT-Zeitverschiebung"</string>
-    <string name="local_time" msgid="6767659693881978111">"Ortszeit (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"Zeitzonen in <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"Zeitzonen in GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"Zeitzonen für <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Suchanfrage löschen"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e2db5b9..be0803d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Χώρα"</string>
-    <string name="country" msgid="4435526943498223723">"Χώρα"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Μετατόπιση GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Τοπική ώρα (hr)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ΖΩΝΕΣ ΩΡΑΣ ΣΕ <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ΖΩΝΕΣ ΩΡΑΣ ΣΕ GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ΖΩΝΕΣ ΩΡΑΣ ΣΕ <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Διαγραφή ερωτήματος"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 9ad1fd6..7b9d784 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Country"</string>
-    <string name="country" msgid="4435526943498223723">"Country"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT offset"</string>
-    <string name="local_time" msgid="6767659693881978111">"Local time (hr)"</string>
-    <string name="results_country" msgid="8042876404471058354">"TIME ZONES IN <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"TIME ZONES IN GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"TIME ZONES AT <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Clear query"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
new file mode 100644
index 0000000..617f63e
--- /dev/null
+++ b/res/values-es-rUS/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">"Australia Central, Territ. Norte"</item>
+    <item msgid="4345275500159159867">"Australia Central, Austr. Merid."</item>
+    <item msgid="6771274300523132094">"Australia Oriental, Queensland"</item>
+    <item msgid="4685547681424666687">"Australia Oriental, N. Gal. Sur"</item>
+    <item msgid="5259393186526893961">"Estándar Montaña, Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Estándar Centro, Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Estándar del Este, Atikokan"</item>
+    <item msgid="8922086438245451625">"Estándar del Atlántico, Quebec"</item>
+    <item msgid="8353677384517034413">"Hawái-Aleutiano, Hawái"</item>
+    <item msgid="6426791761018806420">"Hawái-Aleutiano, Alaska"</item>
+    <item msgid="7076353182411415610">"Estándar de Pacífico, Metlakatla"</item>
+    <item msgid="373990592918179890">"Estándar de la Montaña, Arizona"</item>
+    <item msgid="353899326999279114">"Pacífico, Baja California"</item>
+    <item msgid="6432134534714673873">"Montaña, Chihuahua"</item>
+    <item msgid="7629345735485663968">"Central, Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Montaña, Sonora"</item>
+    <item msgid="1106209575683600471">"Hora de África Oriental"</item>
+    <item msgid="6538017087072480128">"Hora estándar del Atlántico"</item>
+    <item msgid="6758957851822881177">"Hora estándar del Atlántico"</item>
+    <item msgid="2477556470536619081">"Hora de Europa Oriental"</item>
+    <item msgid="7328461310893621937">"Hora de Kaliningrado"</item>
+    <item msgid="4212642599758736931">"Amazonas, Rondonia"</item>
+    <item msgid="2370319280810537375">"Brasilia, Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"San Martín"</item>
+    <item msgid="5330962017221568054">"Caribe Neerlandés"</item>
+    <item msgid="1465164631761814300">"Curazao"</item>
+    <item msgid="8972081011408691260">"Sudán del Sur"</item>
+  </string-array>
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d20b863..7560226 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"País"</string>
-    <string name="country" msgid="4435526943498223723">"País"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Desplazamiento de GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Hora local (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ZONAS HORARIAS EN <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ZONAS HORARIAS EN GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ZONAS HORARIAS A LA/S <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Eliminar la consulta"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
new file mode 100644
index 0000000..118b71a
--- /dev/null
+++ b/res/values-es/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">"Central australiana (TN)"</item>
+    <item msgid="4345275500159159867">"Central australiana (AM)"</item>
+    <item msgid="6771274300523132094">"Oriental australiana (Queensland)"</item>
+    <item msgid="4685547681424666687">"Oriental australiana (NGS)"</item>
+    <item msgid="5259393186526893961">"Estándar Montañas (Dawson Creek)"</item>
+    <item msgid="5984634754870859705">"Estándar centro (Saskatchewan)"</item>
+    <item msgid="5340374311583423836">"Estándar oriental (Atikokan)"</item>
+    <item msgid="8922086438245451625">"Estándar del Atlántico (Quebec)"</item>
+    <item msgid="8353677384517034413">"Hawái-Aleutiano (Hawái)"</item>
+    <item msgid="6426791761018806420">"Hawái-Aleutiano (Alaska)"</item>
+    <item msgid="7076353182411415610">"Estándar Pacífico (Metlakatla)"</item>
+    <item msgid="373990592918179890">"Estándar de las Montañas (Arizona)"</item>
+    <item msgid="353899326999279114">"Pacífico (Baja California)"</item>
+    <item msgid="6432134534714673873">"Montañas (Chihuahua)"</item>
+    <item msgid="7629345735485663968">"Central (Tamaulipas)"</item>
+    <item msgid="3874729044260979505">"Montañas (Sonora)"</item>
+    <item msgid="1106209575683600471">"Hora de África oriental"</item>
+    <item msgid="6538017087072480128">"Hora estándar del Atlántico"</item>
+    <item msgid="6758957851822881177">"Hora estándar del Atlántico"</item>
+    <item msgid="2477556470536619081">"Hora de Europa oriental"</item>
+    <item msgid="7328461310893621937">"Hora de Kaliningrado"</item>
+    <item msgid="4212642599758736931">"Amazonas, Rondonia"</item>
+    <item msgid="2370319280810537375">"Brasil, Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Sint Maarten"</item>
+    <item msgid="5330962017221568054">"Caribe neerlandés"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Sudán del Sur"</item>
+  </string-array>
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2ef9282..2815917 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"País"</string>
-    <string name="country" msgid="4435526943498223723">"País"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Desviación de GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Hora local (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ZONAS HORARIAS EN <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ZONAS HORARIAS EN GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ZONAS HORARIAS EN <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Borrar consulta"</string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
new file mode 100644
index 0000000..d997055
--- /dev/null
+++ b/res/values-et/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">"Kesk-Austraalia – NT"</item>
+    <item msgid="4345275500159159867">"Kesk-Austraalia – SA"</item>
+    <item msgid="6771274300523132094">"Ida-Austraalia aeg – Queensland"</item>
+    <item msgid="4685547681424666687">"Ida-Austraalia aeg – New South Wales"</item>
+    <item msgid="5259393186526893961">"Mäestikuvööndi standardaeg – Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Kesk-Ameerika standardaeg – Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Idaranniku standardaeg – Atikokan"</item>
+    <item msgid="8922086438245451625">"Atlandi ookeani standardaeg – Québec"</item>
+    <item msgid="8353677384517034413">"Hawaii ja Aleuudi saared – Hawaii"</item>
+    <item msgid="6426791761018806420">"Hawaii ja Aleuudi saared – Alaska"</item>
+    <item msgid="7076353182411415610">"Vaikse ookeani standardaeg – Metlakatla"</item>
+    <item msgid="373990592918179890">"Mäestikuvööndi standardaeg – Arizona"</item>
+    <item msgid="353899326999279114">"Vaikse ookeani aeg – Baja, California"</item>
+    <item msgid="6432134534714673873">"Mäestikuvööndi aeg – Chihuahua"</item>
+    <item msgid="7629345735485663968">"Kesk-Ameerika aeg – Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Mäestikuvööndi aeg – Sonora"</item>
+    <item msgid="1106209575683600471">"Ida-Aafrika aeg"</item>
+    <item msgid="6538017087072480128">"Atlandi ookeani standardaeg"</item>
+    <item msgid="6758957851822881177">"Atlandi ookeani standardaeg"</item>
+    <item msgid="2477556470536619081">"Ida-Euroopa aeg"</item>
+    <item msgid="7328461310893621937">"Kaliningradi aeg"</item>
+    <item msgid="4212642599758736931">"Amazon – Rondônia"</item>
+    <item msgid="2370319280810537375">"Brasiilia – Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Saint-Martin"</item>
+    <item msgid="5330962017221568054">"Hollandi Kariibi mere saared"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Lõuna-Sudaan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 67d2007..61001d9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Riik"</string>
-    <string name="country" msgid="4435526943498223723">"Riik"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT nihe"</string>
-    <string name="local_time" msgid="6767659693881978111">"Kohalik aeg (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"AJAVÖÖNDID RIIGIS <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"AJAVÖÖNDID GMT NIHKEGA <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"AJAVÖÖNDID KOHALIKU AJA <xliff:g id="LOCAL_TIME">%s</xliff:g> JÄRGI"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Päringu tühistamine"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
new file mode 100644
index 0000000..a87e90c
--- /dev/null
+++ b/res/values-fa/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-fa/strings.xml b/res/values-fa/strings.xml
index 3a921ee..65b774b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"کشور"</string>
-    <string name="country" msgid="4435526943498223723">"کشور"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"اختلاف با GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"وقت محلی (ساعت)"</string>
-    <string name="results_country" msgid="8042876404471058354">"مناطق زمانی در <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"مناطق زمانی در <xliff:g id="OFFSET">%s</xliff:g>‏ GMT"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"مناطق زمانی در <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"پاک کردن عبارت جستجو"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
new file mode 100644
index 0000000..5f9bb56
--- /dev/null
+++ b/res/values-fi/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">"Keski-Australian aika – NT"</item>
+    <item msgid="4345275500159159867">"Keski-Australian aika – SA"</item>
+    <item msgid="6771274300523132094">"Itä-Australian aika – QLD"</item>
+    <item msgid="4685547681424666687">"Itä-Australian aika – NSW"</item>
+    <item msgid="5259393186526893961">"Kalliovuoret – Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Keskinen norm. – Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Itäinen normaaliaika – Atikokan"</item>
+    <item msgid="8922086438245451625">"Atlantin normaaliaika – Quebec"</item>
+    <item msgid="8353677384517034413">"Hawaiji ja Aleutit – Havaiji"</item>
+    <item msgid="6426791761018806420">"Hawaiji ja Aleutit – Alaska"</item>
+    <item msgid="7076353182411415610">"Tyynenmeren norm. – Metlakatla"</item>
+    <item msgid="373990592918179890">"Kalliovuort. norm.aika – Arizona"</item>
+    <item msgid="353899326999279114">"Tyynimeri – Baja California"</item>
+    <item msgid="6432134534714673873">"Kalliovuoret – Chihuahua"</item>
+    <item msgid="7629345735485663968">"Keskinen – Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Kalliovuoret – Sonora"</item>
+    <item msgid="1106209575683600471">"Itä-Afrikan aika"</item>
+    <item msgid="6538017087072480128">"Kanadan Atlantin normaaliaika"</item>
+    <item msgid="6758957851822881177">"Kanadan Atlantin normaaliaika"</item>
+    <item msgid="2477556470536619081">"Itä-Euroopan aika"</item>
+    <item msgid="7328461310893621937">"Kaliningradin aika"</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">"Alankomaiden Karibian saaret"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Etelä-Sudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ad90f6b..afef31d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Maa"</string>
-    <string name="country" msgid="4435526943498223723">"Maa"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Ero GMT:hen verrattuna"</string>
-    <string name="local_time" msgid="6767659693881978111">"Paikallinen aika (t)"</string>
-    <string name="results_country" msgid="8042876404471058354">"MAAN <xliff:g id="COUNTRY">%s</xliff:g> AIKAVYÖHYKKEET"</string>
-    <string name="results_gmt" msgid="150119647642882676">"AIKAVYÖHYKKEET ALUEELLA GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"AIKAVYÖHYKKEET, JOILLA KELLO ON <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Tyhjennä kysely"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
new file mode 100644
index 0000000..4aa6a8e
--- /dev/null
+++ b/res/values-fr/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">"Heure centr. Austr. (Terr. Nord)"</item>
+    <item msgid="4345275500159159867">"Heure centr. Austr. (Aus. Mérid.)"</item>
+    <item msgid="6771274300523132094">"Heure Est Australie (Queensland)"</item>
+    <item msgid="4685547681424666687">"Heure Est Austr. (N-Galles Sud)"</item>
+    <item msgid="5259393186526893961">"Heure stand. mont. (Dawson Creek)"</item>
+    <item msgid="5984634754870859705">"Heure stand. cent. (Saskatchewan)"</item>
+    <item msgid="5340374311583423836">"Heure standard Est (Atikokan)"</item>
+    <item msgid="8922086438245451625">"Heure stand. Atlantique (Québec)"</item>
+    <item msgid="8353677384517034413">"Heure Hawaï-Aléoutiennes (Hawaï)"</item>
+    <item msgid="6426791761018806420">"Heure Hawaï-Aléoutiennes (Alaska)"</item>
+    <item msgid="7076353182411415610">"Heure stand. Pacif. (Metlakatla)"</item>
+    <item msgid="373990592918179890">"Heure stand. montagnes (Arizona)"</item>
+    <item msgid="353899326999279114">"Heure Pacifique (Baja California)"</item>
+    <item msgid="6432134534714673873">"Heure montagnes (Chihuahua)"</item>
+    <item msgid="7629345735485663968">"Heure centr. Mexique (Tamaulipas)"</item>
+    <item msgid="3874729044260979505">"Heure montagnes (Sonora)"</item>
+    <item msgid="1106209575683600471">"Heure d\'Afrique de l\'Est"</item>
+    <item msgid="6538017087072480128">"Heure standard de l\'Atlantique"</item>
+    <item msgid="6758957851822881177">"Heure standard de l\'Atlantique"</item>
+    <item msgid="2477556470536619081">"Heure d\'Europe de l\'Est"</item>
+    <item msgid="7328461310893621937">"Heure de Kaliningrad"</item>
+    <item msgid="4212642599758736931">"Amazonie – Rondônia"</item>
+    <item msgid="2370319280810537375">"Brasilia – Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Saint-Martin"</item>
+    <item msgid="5330962017221568054">"Antilles hollandaises"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Soudan du Sud"</item>
+  </string-array>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ed34aad..ca1ca8c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Pays"</string>
-    <string name="country" msgid="4435526943498223723">"Pays"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Décalage GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Heure locale (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"FUSEAUX HORAIRES : <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"FUSEAUX HORAIRES POUR GMT<xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"FUSEAUX HORAIRES À <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Effacer la requête"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ae86615..9e06e3b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"देश"</string>
-    <string name="country" msgid="4435526943498223723">"देश"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT ऑफ़सेट"</string>
-    <string name="local_time" msgid="6767659693881978111">"स्थानीय समय (घंटे)"</string>
-    <string name="results_country" msgid="8042876404471058354">"<xliff:g id="COUNTRY">%s</xliff:g> के समय क्षेत्र"</string>
-    <string name="results_gmt" msgid="150119647642882676">"GMT <xliff:g id="OFFSET">%s</xliff:g> के समय क्षेत्र"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"<xliff:g id="LOCAL_TIME">%s</xliff:g> के समय क्षेत्र"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"क्‍वेरी साफ़ करें"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
new file mode 100644
index 0000000..6e1b2a1
--- /dev/null
+++ b/res/values-hr/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">"Australsko središnje – NT"</item>
+    <item msgid="4345275500159159867">"Australsko središnje – SA"</item>
+    <item msgid="6771274300523132094">"Australsko istočno – QLD"</item>
+    <item msgid="4685547681424666687">"Australsko istočno – NSW"</item>
+    <item msgid="5259393186526893961">"Planinsko standardno – Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Središnje standardno – Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Istočno standardno – Atikokan"</item>
+    <item msgid="8922086438245451625">"Atlantsko standardno – Quebec"</item>
+    <item msgid="8353677384517034413">"Havajsko-aleutsko – Havaji"</item>
+    <item msgid="6426791761018806420">"Havajsko-aleutsko – Aljaska"</item>
+    <item msgid="7076353182411415610">"Pacifičko standardno – Metlakatla"</item>
+    <item msgid="373990592918179890">"Planinsko standardno – Arizona"</item>
+    <item msgid="353899326999279114">"Pacifičko – Baja California"</item>
+    <item msgid="6432134534714673873">"Planinsko – Chihuahua"</item>
+    <item msgid="7629345735485663968">"Središnje – Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Planinsko – 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čnoeuropsko vrijeme"</item>
+    <item msgid="7328461310893621937">"Kalinjingradsko vrijeme"</item>
+    <item msgid="4212642599758736931">"Amazona – 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">"Karipski otoci Nizozemske"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Južni Sudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5543ec8..06f4129 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Zemlja"</string>
-    <string name="country" msgid="4435526943498223723">"Zemlja"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Pomak u odnosu na GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Lokalno vrijeme (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"VREMENSKE ZONE – <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"VREMENSKE ZONE ZA GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"VREMENSKE ZONE ZA <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Izbriši upit"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0bbd67d..cb81303 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Ország"</string>
-    <string name="country" msgid="4435526943498223723">"Ország"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT-eltolódás"</string>
-    <string name="local_time" msgid="6767659693881978111">"Helyi idő (óra)"</string>
-    <string name="results_country" msgid="8042876404471058354">"<xliff:g id="COUNTRY">%s</xliff:g> IDŐZÓNÁI"</string>
-    <string name="results_gmt" msgid="150119647642882676">"IDŐZÓNÁK: GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"IDŐZÓNÁK A KÖVETKEZŐ ÉRTÉKKEL: <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Lekérdezés törlése"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
new file mode 100644
index 0000000..b893157
--- /dev/null
+++ b/res/values-in/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">"Australia Tengah - NT"</item>
+    <item msgid="4345275500159159867">"Australia Tengah - SA"</item>
+    <item msgid="6771274300523132094">"Australia Timur - QLD"</item>
+    <item msgid="4685547681424666687">"Australia Timur - NSW"</item>
+    <item msgid="5259393186526893961">"Standar Pegunungan - Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Standar Tengah - Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Standar Timur - Atikokan"</item>
+    <item msgid="8922086438245451625">"Standar Atlantik - Quebec"</item>
+    <item msgid="8353677384517034413">"Hawaii-Aleutian - Hawaii"</item>
+    <item msgid="6426791761018806420">"Hawaii-Aleutian - Alaska"</item>
+    <item msgid="7076353182411415610">"Standar Pasifik - Metlakatla"</item>
+    <item msgid="373990592918179890">"Standar Pegunungan - Arizona"</item>
+    <item msgid="353899326999279114">"Pasifik - Baja California"</item>
+    <item msgid="6432134534714673873">"Pegunungan - Chihuahua"</item>
+    <item msgid="7629345735485663968">"Tengah - Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Pegunungan - Sonora"</item>
+    <item msgid="1106209575683600471">"Waktu Afrika Timur"</item>
+    <item msgid="6538017087072480128">"Waktu Standar Atlantik"</item>
+    <item msgid="6758957851822881177">"Waktu Standar Atlantik"</item>
+    <item msgid="2477556470536619081">"Waktu Eropa Timur"</item>
+    <item msgid="7328461310893621937">"Waktu Kaliningrad"</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">"Sudan Selatan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cbaf624..eb46e63 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Negara"</string>
-    <string name="country" msgid="4435526943498223723">"Negara"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Selisih waktu dengan GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Waktu lokal (jam)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ZONA WAKTU DI <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ZONA WAKTU PADA GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ZONA WAKTU PADA <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Hapus kueri"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3ab6b4a..b87d722 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Paese"</string>
-    <string name="country" msgid="4435526943498223723">"Paese"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Differenza con fuso orario GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Ora locale (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"FUSI ORARI IN <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"FUSI ORARI IN GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"FUSI ORARI CORRISPONDENTI PER LE ORE <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Cancella query"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 34bd5f4..1a17df3 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"מדינה"</string>
-    <string name="country" msgid="4435526943498223723">"מדינה"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"קיזוז GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"זמן מקומי (שעה)"</string>
-    <string name="results_country" msgid="8042876404471058354">"אזורי זמן ב-<xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"אזורי זמן ב-GMT‏ <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"אזורי זמן ב-<xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"מחק שאילתה"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
new file mode 100644
index 0000000..72b703f
--- /dev/null
+++ b/res/values-ja/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-ja/strings.xml b/res/values-ja/strings.xml
index 2666ad6..43acf92 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"国"</string>
-    <string name="country" msgid="4435526943498223723">"国"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMTオフセット"</string>
-    <string name="local_time" msgid="6767659693881978111">"現地時間（時間）"</string>
-    <string name="results_country" msgid="8042876404471058354">"<xliff:g id="COUNTRY">%s</xliff:g>のタイムゾーン"</string>
-    <string name="results_gmt" msgid="150119647642882676">"GMT<xliff:g id="OFFSET">%s</xliff:g>のタイムゾーン"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"<xliff:g id="LOCAL_TIME">%s</xliff:g>のタイムゾーン"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"検索キーワードを削除"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
new file mode 100644
index 0000000..76c1bd1
--- /dev/null
+++ b/res/values-ko/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-ko/strings.xml b/res/values-ko/strings.xml
index bb517fc..d774c0e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"국가"</string>
-    <string name="country" msgid="4435526943498223723">"국가"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT 오프셋"</string>
-    <string name="local_time" msgid="6767659693881978111">"현지 시간(시간)"</string>
-    <string name="results_country" msgid="8042876404471058354">"표준시간대(<xliff:g id="COUNTRY">%s</xliff:g>)"</string>
-    <string name="results_gmt" msgid="150119647642882676">"표준시간대(GMT <xliff:g id="OFFSET">%s</xliff:g>)"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"표준시간대(<xliff:g id="LOCAL_TIME">%s</xliff:g>)"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"검색어 삭제"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
new file mode 100644
index 0000000..3ee3f91
--- /dev/null
+++ b/res/values-lt/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">"Vidurio Australija – Š. Teritor."</item>
+    <item msgid="4345275500159159867">"Vidurio Australija – P. Teritor."</item>
+    <item msgid="6771274300523132094">"Rytų Australija – Kvinslandas"</item>
+    <item msgid="4685547681424666687">"Rytų Australija – N. P. Velsas"</item>
+    <item msgid="5259393186526893961">"ŠA kalnų žiem. l. – Doson Krikas"</item>
+    <item msgid="5984634754870859705">"ŠA cen. žiem. l. – Saskačevanas"</item>
+    <item msgid="5340374311583423836">"ŠA Rytų žiemos l. – Atikokanas"</item>
+    <item msgid="8922086438245451625">"Atlanto žiemos laikas – Kvebekas"</item>
+    <item msgid="8353677384517034413">"Havajų–Aleutų laikas – Havajai"</item>
+    <item msgid="6426791761018806420">"Havajų–Aleutų laikas – Aliaska"</item>
+    <item msgid="7076353182411415610">"Ramiojo v. žiem. l. – Metlakatla"</item>
+    <item msgid="373990592918179890">"ŠA kalnų žiemos laikas – Arizona"</item>
+    <item msgid="353899326999279114">"Ramiojo v. laikas – Kalifornija"</item>
+    <item msgid="6432134534714673873">"Š. Amerikos kalnų l. – Čihuahua"</item>
+    <item msgid="7629345735485663968">"ŠA vidurio laikas – Tamaulipasas"</item>
+    <item msgid="3874729044260979505">"Š. Amerikos kalnų l. – Sonora"</item>
+    <item msgid="1106209575683600471">"Rytų Afrikos laikas"</item>
+    <item msgid="6538017087072480128">"Atlanto žiemos laikas"</item>
+    <item msgid="6758957851822881177">"Atlanto žiemos laikas"</item>
+    <item msgid="2477556470536619081">"Rytų Europos laikas"</item>
+    <item msgid="7328461310893621937">"Kaliningrado laikas"</item>
+    <item msgid="4212642599758736931">"Amazonės žiem. laik. – Rondinija"</item>
+    <item msgid="2370319280810537375">"Brazilijos laikas – Para"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Sint Martenas"</item>
+    <item msgid="5330962017221568054">"Karibų Nyderlandai"</item>
+    <item msgid="1465164631761814300">"Kiurasao"</item>
+    <item msgid="8972081011408691260">"Pietų Sudanas"</item>
+  </string-array>
+</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 976975a..3a2fd01 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Šalis"</string>
-    <string name="country" msgid="4435526943498223723">"Šalis"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT nuokrypis"</string>
-    <string name="local_time" msgid="6767659693881978111">"Vietinis laikas (val.)"</string>
-    <string name="results_country" msgid="8042876404471058354">"<xliff:g id="COUNTRY">%s</xliff:g> LAIKO JUOSTOS"</string>
-    <string name="results_gmt" msgid="150119647642882676">"GMT <xliff:g id="OFFSET">%s</xliff:g> LAIKO JUOSTOS"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"LAIKO JUOSTOS <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Išvalyti užklausą"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
new file mode 100644
index 0000000..06dc17c
--- /dev/null
+++ b/res/values-lv/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">"Austrālijas centr. laiks — NT"</item>
+    <item msgid="4345275500159159867">"Austrālijas centr. laiks — SA"</item>
+    <item msgid="6771274300523132094">"Austrālijas austrumu laiks — QLD"</item>
+    <item msgid="4685547681424666687">"Austrālijas austrumu laiks — NSW"</item>
+    <item msgid="5259393186526893961">"Kalnu r. st. laiks — Dousonkrīka"</item>
+    <item msgid="5984634754870859705">"Centr. st. laiks — Saskačevana"</item>
+    <item msgid="5340374311583423836">"Austrumu standarta laiks — Atikokana"</item>
+    <item msgid="8922086438245451625">"Atlantijas standarta laiks — Kvebeka"</item>
+    <item msgid="8353677384517034413">"Havaju–Aleutu laiks — Havajas"</item>
+    <item msgid="6426791761018806420">"Havaju–Aleutu laiks — Aļaska"</item>
+    <item msgid="7076353182411415610">"Klusā ok. st. laiks — Metlakatla"</item>
+    <item msgid="373990592918179890">"Kalnu rajona st. laiks — Arizona"</item>
+    <item msgid="353899326999279114">"Klusā ok. l. — Lejaskalifornija"</item>
+    <item msgid="6432134534714673873">"Kalnu rajona laiks — Čivava"</item>
+    <item msgid="7629345735485663968">"Centrālais laiks — Tamaulipasa"</item>
+    <item msgid="3874729044260979505">"Kalnu rajona laiks — Sonora"</item>
+    <item msgid="1106209575683600471">"Austrumāfrikas laiks"</item>
+    <item msgid="6538017087072480128">"Atlantijas standarta laiks"</item>
+    <item msgid="6758957851822881177">"Atlantijas standarta laiks"</item>
+    <item msgid="2477556470536619081">"Austrumeiropas laiks"</item>
+    <item msgid="7328461310893621937">"Kaļiņingradas laiks"</item>
+    <item msgid="4212642599758736931">"Amazone — Rondonija"</item>
+    <item msgid="2370319280810537375">"Brazilja — Para"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Sintmārtena"</item>
+    <item msgid="5330962017221568054">"Nīderlandes Karību salas"</item>
+    <item msgid="1465164631761814300">"Kirasao"</item>
+    <item msgid="8972081011408691260">"Dienvidsudāna"</item>
+  </string-array>
+</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2c82278..f05c827 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Valsts"</string>
-    <string name="country" msgid="4435526943498223723">"Valsts"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT novirze"</string>
-    <string name="local_time" msgid="6767659693881978111">"Vietējais laiks (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"LAIKA JOSLAS ŠĀDĀ VALSTĪ: <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"LAIKA JOSLAS AR ŠĀDU NOBĪDI: GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"LAIKA JOSLAS, KURĀS PAŠREIZĒJAIS LAIKS IR ŠĀDS: <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Notīrīt vaicājumu"</string>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
new file mode 100644
index 0000000..a27f9f1
--- /dev/null
+++ b/res/values-ms/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">"Australia Tengah - NT"</item>
+    <item msgid="4345275500159159867">"Australia Tengah - SA"</item>
+    <item msgid="6771274300523132094">"Australia Timur - QLD"</item>
+    <item msgid="4685547681424666687">"Australia Timur - NSW"</item>
+    <item msgid="5259393186526893961">"Piawai Pergunungan - Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Piawai Tengah - Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Piawai Timur - Atikokan"</item>
+    <item msgid="8922086438245451625">"Piawai Atlantik - Quebec"</item>
+    <item msgid="8353677384517034413">"Aleutian Hawaii - Hawaii"</item>
+    <item msgid="6426791761018806420">"Aleutian Hawaii - Alaska"</item>
+    <item msgid="7076353182411415610">"Piawai Pasifik - Metlakatla"</item>
+    <item msgid="373990592918179890">"Piawai Pergunungan - Arizona"</item>
+    <item msgid="353899326999279114">"Pasifik - Baja California"</item>
+    <item msgid="6432134534714673873">"Pergunungan - Chihuahua"</item>
+    <item msgid="7629345735485663968">"Tengah - Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Pergunungan - Sonora"</item>
+    <item msgid="1106209575683600471">"Waktu Afrika Timur"</item>
+    <item msgid="6538017087072480128">"Waktu Piawai Atlantik"</item>
+    <item msgid="6758957851822881177">"Waktu Piawai Atlantik"</item>
+    <item msgid="2477556470536619081">"Waktu Eropah Timur"</item>
+    <item msgid="7328461310893621937">"Waktu Kaliningrad"</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 Belanda"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Sudan Selatan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 95d4724..fca1133 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Negara"</string>
-    <string name="country" msgid="4435526943498223723">"Negara"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Ofset GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Waktu tempatan (jam)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ZON WAKTU DI <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ZON WAKTU DI GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ZON WAKTU PADA <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Kosongkan pertanyaan"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
new file mode 100644
index 0000000..8afcf71
--- /dev/null
+++ b/res/values-nb/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">"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">"Karibisk Nederland"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Sør-Sudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index da4f66d..331003b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Land"</string>
-    <string name="country" msgid="4435526943498223723">"Land"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT-forskyvning"</string>
-    <string name="local_time" msgid="6767659693881978111">"Lokal tid (t)"</string>
-    <string name="results_country" msgid="8042876404471058354">"TIDSSONER I <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"TIDSSONER I GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"TIDSSONER PÅ <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Slett søket"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
new file mode 100644
index 0000000..2bfc997
--- /dev/null
+++ b/res/values-nl/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">"Australian Central - Noordelijk Territorium"</item>
+    <item msgid="4345275500159159867">"Australian Central - Zuid-Australië"</item>
+    <item msgid="6771274300523132094">"Australian Eastern - Queensland"</item>
+    <item msgid="4685547681424666687">"Australian Eastern - Nieuw-Zuid-Wales"</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 - Hawaï"</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">"Oost-Afrikaanse tijd"</item>
+    <item msgid="6538017087072480128">"Atlantic-standaardtijd"</item>
+    <item msgid="6758957851822881177">"Atlantic-standaardtijd"</item>
+    <item msgid="2477556470536619081">"Oost-Europese tijd"</item>
+    <item msgid="7328461310893621937">"Kaliningrad-tijd"</item>
+    <item msgid="4212642599758736931">"Amazone - 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">"Caribisch Nederland"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Zuid-Soedan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7bae94c..f45d7cb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Land"</string>
-    <string name="country" msgid="4435526943498223723">"Land"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Verschil ten opzichte van GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Lokale tijd (uur)"</string>
-    <string name="results_country" msgid="8042876404471058354">"TIJDZONES IN <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"TIJDZONES IN GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"TIJDZONES IN <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Zoekopdracht wissen"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e4d0934..4d49649 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Kraj"</string>
-    <string name="country" msgid="4435526943498223723">"Kraj"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Przesunięcie względem GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Czas lokalny (godz.)"</string>
-    <string name="results_country" msgid="8042876404471058354">"STREFY CZASOWE: <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"STREFY CZASOWE: GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"STREFY CZASOWE: <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Wyczyść zapytanie"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
new file mode 100644
index 0000000..e984cf6
--- /dev/null
+++ b/res/values-pt-rPT/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">"Austrália Central – TN"</item>
+    <item msgid="4345275500159159867">"Austrália Central – AS"</item>
+    <item msgid="6771274300523132094">"Austrália Oriental – QLD"</item>
+    <item msgid="4685547681424666687">"Austrália Oriental – NSW"</item>
+    <item msgid="5259393186526893961">"Padrão Montanhas – Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Padrão Central – Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Padrão Oriental – Atikokan"</item>
+    <item msgid="8922086438245451625">"Padrão do Atlântico – Quebeque"</item>
+    <item msgid="8353677384517034413">"Havai-Aleútes – Havai"</item>
+    <item msgid="6426791761018806420">"Havai-Aleútes – Alasca"</item>
+    <item msgid="7076353182411415610">"Padrão do Pacífico – Metlakatla"</item>
+    <item msgid="373990592918179890">"Padrão das Montanhas – Arizona"</item>
+    <item msgid="353899326999279114">"Pacífico – Baja Califórnia"</item>
+    <item msgid="6432134534714673873">"Montanhas – Chihuahua"</item>
+    <item msgid="7629345735485663968">"Central – Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Montanhas – Sonora"</item>
+    <item msgid="1106209575683600471">"Hora da África Oriental"</item>
+    <item msgid="6538017087072480128">"Hora Padrão do Atlântico"</item>
+    <item msgid="6758957851822881177">"Hora Padrão do Atlântico"</item>
+    <item msgid="2477556470536619081">"Hora da Europa de Leste"</item>
+    <item msgid="7328461310893621937">"Hora de Kaliningrado"</item>
+    <item msgid="4212642599758736931">"Amazónia - Rondónia"</item>
+    <item msgid="2370319280810537375">"Brasília - Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"São Martinho"</item>
+    <item msgid="5330962017221568054">"Países Baixos Caribenhos"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Sudão do Sul"</item>
+  </string-array>
+</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ebcb8cb..7ecc5be 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"País"</string>
-    <string name="country" msgid="4435526943498223723">"País"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Desfasamento face ao TMG"</string>
-    <string name="local_time" msgid="6767659693881978111">"Hora local (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"FUSOS HORÁRIOS EM <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"FUSOS HORÁRIOS EM TMG <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"FUSOS HORÁRIOS EM <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Limpar consulta"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
new file mode 100644
index 0000000..96192e5
--- /dev/null
+++ b/res/values-pt/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">"Central da Austrália - NT"</item>
+    <item msgid="4345275500159159867">"Central da Austrália - SA"</item>
+    <item msgid="6771274300523132094">"Leste da Austrália - QLD"</item>
+    <item msgid="4685547681424666687">"Leste da Austrália- NSW"</item>
+    <item msgid="5259393186526893961">"Padrão Montanhas - Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Padrão Central - Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Padrão leste dos EUA - Atikokan"</item>
+    <item msgid="8922086438245451625">"Padrão leste do Canadá - Québec"</item>
+    <item msgid="8353677384517034413">"Havaí-Aleutas - Havaí"</item>
+    <item msgid="6426791761018806420">"Havaí-Aleutas - Alasca"</item>
+    <item msgid="7076353182411415610">"Padrão do Pacífico - Metlakatla"</item>
+    <item msgid="373990592918179890">"Padrão das Montanhas - Arizona"</item>
+    <item msgid="353899326999279114">"Pacífico - Baja California"</item>
+    <item msgid="6432134534714673873">"Montanhas - Chihuahua"</item>
+    <item msgid="7629345735485663968">"Central - Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Montanhas - Sonora"</item>
+    <item msgid="1106209575683600471">"Horário da África Oriental"</item>
+    <item msgid="6538017087072480128">"Horário Padrão do Atlântico"</item>
+    <item msgid="6758957851822881177">"Horário Padrão do Atlântico"</item>
+    <item msgid="2477556470536619081">"Horário do Leste Europeu"</item>
+    <item msgid="7328461310893621937">"Horário de Caliningrado"</item>
+    <item msgid="4212642599758736931">"Amazonas - Rondônia"</item>
+    <item msgid="2370319280810537375">"Brasília - Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"São Martinho"</item>
+    <item msgid="5330962017221568054">"Países Baixos Caribenhos"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Sudão do Sul"</item>
+  </string-array>
+</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d27ebbe..7ecc5be 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"País"</string>
-    <string name="country" msgid="4435526943498223723">"País"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Equidistância GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Hora local (horas)"</string>
-    <string name="results_country" msgid="8042876404471058354">"FUSOS HORÁRIOS EM <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"FUSOS HORÁRIOS EM GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"FUSOS HORÁRIOS EM <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Limpar consulta"</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
new file mode 100644
index 0000000..e81288a
--- /dev/null
+++ b/res/values-ro/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">"Ora Australiei Centrale – NT"</item>
+    <item msgid="4345275500159159867">"Ora Australiei Centrale – SA"</item>
+    <item msgid="6771274300523132094">"Ora Australiei de Est – QLD"</item>
+    <item msgid="4685547681424666687">"Ora Australiei de Est – NSW"</item>
+    <item msgid="5259393186526893961">"Oră Zonă muntoasă – Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Ora stand. centr. – Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Ora standard de est – Atikokan"</item>
+    <item msgid="8922086438245451625">"Ora standard Atlantic – Quebec"</item>
+    <item msgid="8353677384517034413">"Ora Hawaii-Aleutine – Hawaii"</item>
+    <item msgid="6426791761018806420">"Ora Hawaii-Aleutine – Alaska"</item>
+    <item msgid="7076353182411415610">"Ora stand. Pacific – Metlakatla"</item>
+    <item msgid="373990592918179890">"Ora standard Zona muntoasă – AZ"</item>
+    <item msgid="353899326999279114">"Ora Pacific – Baja California"</item>
+    <item msgid="6432134534714673873">"Ora Zonei muntoase – Chihuahua"</item>
+    <item msgid="7629345735485663968">"Ora centrală – Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Ora Zonei muntoase – Sonora"</item>
+    <item msgid="1106209575683600471">"Ora Africii de Est"</item>
+    <item msgid="6538017087072480128">"Ora standard a Atlanticului"</item>
+    <item msgid="6758957851822881177">"Ora standard a Atlanticului"</item>
+    <item msgid="2477556470536619081">"Ora Europei de Est"</item>
+    <item msgid="7328461310893621937">"Ora Kaliningradului"</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">"Insulele Caraibe Olandeze"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Sudanul de Sud"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2277d42..889cbeb 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Țară"</string>
-    <string name="country" msgid="4435526943498223723">"Țară"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Decalaj GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Ora locală (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"FUSURI ORARE DIN <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"FUSURI ORARE CU <xliff:g id="OFFSET">%s</xliff:g> GMT"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"FUSURI ORARE LA <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Ștergeți interogarea"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
new file mode 100644
index 0000000..4b8dbe2
--- /dev/null
+++ b/res/values-ru/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">"Центр. Австралия – Сев. терр."</item>
+    <item msgid="4345275500159159867">"Центр. Австралия – Юж. Австралия"</item>
+    <item msgid="6771274300523132094">"Восточная Австралия – Квинсленд"</item>
+    <item msgid="4685547681424666687">"Вост. Австралия – Нов. Юж. Уэльс"</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-ru/strings.xml b/res/values-ru/strings.xml
index 5c1c03c..5e5aa34 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Страна"</string>
-    <string name="country" msgid="4435526943498223723">"Страна"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Смещение относительно GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Местное время (ч.)"</string>
-    <string name="results_country" msgid="8042876404471058354">"<xliff:g id="COUNTRY">%s</xliff:g>: ЧАСОВЫЕ ПОЯСА"</string>
-    <string name="results_gmt" msgid="150119647642882676">"GMT <xliff:g id="OFFSET">%s</xliff:g>: ЧАСОВЫЕ ПОЯСА"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"<xliff:g id="LOCAL_TIME">%s</xliff:g>: ЧАСОВЫЕ ПОЯСА"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Удалить запрос"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
new file mode 100644
index 0000000..e1e6144
--- /dev/null
+++ b/res/values-sk/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">"Stredoaustrálsky čas – NT"</item>
+    <item msgid="4345275500159159867">"Stredoaustrálsky čas – SA"</item>
+    <item msgid="6771274300523132094">"Východoaustrálsky čas – QLD"</item>
+    <item msgid="4685547681424666687">"Východoaustrálsky čas – NSW"</item>
+    <item msgid="5259393186526893961">"Horský štandardný – Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Centrálny štandardný – Saskatch."</item>
+    <item msgid="5340374311583423836">"Východný štandardný – Atikokan"</item>
+    <item msgid="8922086438245451625">"Atlantický štandardný – Quebec"</item>
+    <item msgid="8353677384517034413">"Havajsko-aleutský čas – Havaj"</item>
+    <item msgid="6426791761018806420">"Havajsko-aleutský čas – Aljaška"</item>
+    <item msgid="7076353182411415610">"Tichom. štandardný – Metlakatla"</item>
+    <item msgid="373990592918179890">"Horský štandardný čas – Arizona"</item>
+    <item msgid="353899326999279114">"Tichomorský č. – Baja California"</item>
+    <item msgid="6432134534714673873">"Horský čas – Chihuahua"</item>
+    <item msgid="7629345735485663968">"Centrálny čas – Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Horský čas – Sonora"</item>
+    <item msgid="1106209575683600471">"Východoafrický čas"</item>
+    <item msgid="6538017087072480128">"Atlantický štandardný čas"</item>
+    <item msgid="6758957851822881177">"Atlantický štandardný čas"</item>
+    <item msgid="2477556470536619081">"Východoeurópsky čas"</item>
+    <item msgid="7328461310893621937">"Kaliningradský čas"</item>
+    <item msgid="4212642599758736931">"Amazónia – Rondônia"</item>
+    <item msgid="2370319280810537375">"Brazília – Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Sint Maarten"</item>
+    <item msgid="5330962017221568054">"Karibské Holandsko"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Južný Sudán"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 691621c..c52ecc8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Krajina"</string>
-    <string name="country" msgid="4435526943498223723">"Krajina"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Posun od GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Miestny čas (hod.)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ČASOVÉ PÁSMA V KRAJINE <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ČASOVÉ PÁSMA S POSUNOM <xliff:g id="OFFSET">%s</xliff:g> OD GMT"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ČASOVÉ PÁSMA S ČASOM <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Vymazať dopyt"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
new file mode 100644
index 0000000..0d0bba6
--- /dev/null
+++ b/res/values-sl/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">"Srednjeavstralski – NT"</item>
+    <item msgid="4345275500159159867">"Srednjeavstralski – SA"</item>
+    <item msgid="6771274300523132094">"Vzhodnoavstralski – QLD"</item>
+    <item msgid="4685547681424666687">"Vzhodnoavstralski – NSW"</item>
+    <item msgid="5259393186526893961">"Gorski standardni – Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Osrednji standar. – Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Vzhodni standardni – Atikokan"</item>
+    <item msgid="8922086438245451625">"Atlantski standardni – Quebec"</item>
+    <item msgid="8353677384517034413">"Havajsko-aleutski – Havaji"</item>
+    <item msgid="6426791761018806420">"Havajsko-aleutski – Aljaska"</item>
+    <item msgid="7076353182411415610">"Pacifiški standard. – Metlakatla"</item>
+    <item msgid="373990592918179890">"Gorski standardni – Arizona"</item>
+    <item msgid="353899326999279114">"Pacifiški – Baja California"</item>
+    <item msgid="6432134534714673873">"Gorski – Chihuahua"</item>
+    <item msgid="7629345735485663968">"Osrednji – Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Gorski – Sonora"</item>
+    <item msgid="1106209575683600471">"Vzhodnoafriški čas"</item>
+    <item msgid="6538017087072480128">"Atlantski standardni čas"</item>
+    <item msgid="6758957851822881177">"Atlantski standardni čas"</item>
+    <item msgid="2477556470536619081">"Vzhodnoevropski čas"</item>
+    <item msgid="7328461310893621937">"Kaliningrajski čas"</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">"Nizozemski Karibi"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Južni Sudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a609dde..3786b68 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Država"</string>
-    <string name="country" msgid="4435526943498223723">"Država"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Časovni zamik od GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Lokalni čas (h)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ČASOVNI PASOVI V DRŽAVI <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ČASOVNI PASOVI V GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ČASOVNI PASOVI OB <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Izbris poizvedbe"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
new file mode 100644
index 0000000..e8045a0
--- /dev/null
+++ b/res/values-sr/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">"Аустралијско централно – север"</item>
+    <item msgid="4345275500159159867">"Аустралијско централно – југ"</item>
+    <item msgid="6771274300523132094">"Источноаустралијско – Квинсланд"</item>
+    <item msgid="4685547681424666687">"Источноаустр. – Нови Јужни Велс"</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-sr/strings.xml b/res/values-sr/strings.xml
index d530060..3b3c3d7 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Земља"</string>
-    <string name="country" msgid="4435526943498223723">"Земља"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Одступање од средњег времена по Гриничу"</string>
-    <string name="local_time" msgid="6767659693881978111">"Локално време (с)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ВРЕМЕНСКЕ ЗОНЕ У ЗЕМЉИ <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ВРЕМЕНСКЕ ЗОНЕ СА ВРЕМЕНОМ GMT<xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ВРЕМЕНСКЕ ЗОНЕ СА ВРЕМЕНОМ <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Обриши упит"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
new file mode 100644
index 0000000..7d0a464
--- /dev/null
+++ b/res/values-sv/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">"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"</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">"Karibiska Nederländerna"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Sydsudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 498d07b..f482a56 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Land"</string>
-    <string name="country" msgid="4435526943498223723">"Land"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Tidsskillnad mot GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Lokal tid (tim)"</string>
-    <string name="results_country" msgid="8042876404471058354">"TIDSZONER I <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"TIDSZONER I GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"TIDSZONER – <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Ta bort frågan"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
new file mode 100644
index 0000000..1ea49b4
--- /dev/null
+++ b/res/values-sw/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">"Australia ya Kati - NT"</item>
+    <item msgid="4345275500159159867">"Australia ya Kati - SA"</item>
+    <item msgid="6771274300523132094">"Mashariki ya Australia- QLD"</item>
+    <item msgid="4685547681424666687">"Mashariki ya Australia - NSW"</item>
+    <item msgid="5259393186526893961">"Saa Wastani za Mountain - Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Saa Wastani za Kati - Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Saa Wastani za Mashariki - Atikokan"</item>
+    <item msgid="8922086438245451625">"Saa Wastani za Atlantiki - Quebec"</item>
+    <item msgid="8353677384517034413">"Hawaii-Aleutian - Hawaii"</item>
+    <item msgid="6426791761018806420">"Hawaii-Aleutian - Alaska"</item>
+    <item msgid="7076353182411415610">"Saa Wastani za Pasifiki - Metlakatla"</item>
+    <item msgid="373990592918179890">"Saa Wastani za Mountain - Arizona"</item>
+    <item msgid="353899326999279114">"Pasifiki - Baja California"</item>
+    <item msgid="6432134534714673873">"Mountain - Chihuahua"</item>
+    <item msgid="7629345735485663968">"Kati - Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Mountain - Sonora"</item>
+    <item msgid="1106209575683600471">"Saa za Afrika Mashariki"</item>
+    <item msgid="6538017087072480128">"Saa Wastani za Atlantiki"</item>
+    <item msgid="6758957851822881177">"Saa Wastani za Atlantiki"</item>
+    <item msgid="2477556470536619081">"Saa za Mashariki ya Ulaya"</item>
+    <item msgid="7328461310893621937">"Saa za Kaliningrad"</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">"Karibi Uholanzi"</item>
+    <item msgid="1465164631761814300">"Kurakao"</item>
+    <item msgid="8972081011408691260">"Sudan Kusini"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index ae0a134..98c8dc7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Nchi"</string>
-    <string name="country" msgid="4435526943498223723">"Nchi"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Uwekaji kando wa GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Saa ya eneo hili (saa)"</string>
-    <string name="results_country" msgid="8042876404471058354">"SAA ZA MAENEO YA <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"SAA ZA MAENEO KWA GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"SAA ZA MAENEO KWA <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Futa hoja"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index cdf7ff6..55c7886 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"ประเทศ"</string>
-    <string name="country" msgid="4435526943498223723">"ประเทศ"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"การชดเชยเวลา GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"เวลาท้องถิ่น (ชม.)"</string>
-    <string name="results_country" msgid="8042876404471058354">"เขตเวลาใน<xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"เขตเวลาใน <xliff:g id="OFFSET">%s</xliff:g> GMT"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"เขตเวลาที่ <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"ล้างข้อความค้นหา"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
new file mode 100644
index 0000000..d6374d4
--- /dev/null
+++ b/res/values-tl/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">"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>
+  </string-array>
+</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2a71d46..ee51c89 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Bansa"</string>
-    <string name="country" msgid="4435526943498223723">"Bansa"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Offset ng GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Lokal na oras (hr)"</string>
-    <string name="results_country" msgid="8042876404471058354">"MGA TIME ZONE SA <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"MGA TIME ZONE NA GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"MGA TIME ZONE NA <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"I-clear ang query"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
new file mode 100644
index 0000000..c30b76b
--- /dev/null
+++ b/res/values-tr/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">"Avustralya Merkez - NT"</item>
+    <item msgid="4345275500159159867">"Avustralya Merkez - SA"</item>
+    <item msgid="6771274300523132094">"Avustralya Doğu - QLD"</item>
+    <item msgid="4685547681424666687">"Avustralya Batı - NSW"</item>
+    <item msgid="5259393186526893961">"Dağ Standart - Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Merkez Standart - Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Doğu Standart - Atikokan"</item>
+    <item msgid="8922086438245451625">"Atlantik Standart - Quebec"</item>
+    <item msgid="8353677384517034413">"Hawaii-Aleutian - Hawaii"</item>
+    <item msgid="6426791761018806420">"Hawaii-Aleutian - Alaska"</item>
+    <item msgid="7076353182411415610">"Pasifik Standart - Metlakatla"</item>
+    <item msgid="373990592918179890">"Dağ Standart - Arizona"</item>
+    <item msgid="353899326999279114">"Pasifik - Baja California"</item>
+    <item msgid="6432134534714673873">"Dağ - Chihuahua"</item>
+    <item msgid="7629345735485663968">"Merkez - Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Dağ - Sonora"</item>
+    <item msgid="1106209575683600471">"Doğu Afrika Saati"</item>
+    <item msgid="6538017087072480128">"Atlantik Standart Saati"</item>
+    <item msgid="6758957851822881177">"Atlantik Standart Saati"</item>
+    <item msgid="2477556470536619081">"Doğu Avrupa Saati"</item>
+    <item msgid="7328461310893621937">"Kaliningrad Saati"</item>
+    <item msgid="4212642599758736931">"Amazon - Rondônia"</item>
+    <item msgid="2370319280810537375">"Brezilya - Pará"</item>
+  </string-array>
+  <string-array name="backup_country_names">
+    <item msgid="9141777876082196578">"Saint Martin"</item>
+    <item msgid="5330962017221568054">"Karaip Felemenkçe"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Güney Sudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f97ab2c..6be6508 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Ülke"</string>
-    <string name="country" msgid="4435526943498223723">"Ülke"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT farkı"</string>
-    <string name="local_time" msgid="6767659693881978111">"Yerel saat (sa)"</string>
-    <string name="results_country" msgid="8042876404471058354">"<xliff:g id="COUNTRY">%s</xliff:g> İÇİN SAAT DİLİMLERİ"</string>
-    <string name="results_gmt" msgid="150119647642882676">"GMT <xliff:g id="OFFSET">%s</xliff:g> İÇİN SAAT DİLİMLERİ"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"<xliff:g id="LOCAL_TIME">%s</xliff:g> İÇİN SAAT DİLİMLERİ"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Sorguyu temizle"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8b20868..21c93c5 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Країна"</string>
-    <string name="country" msgid="4435526943498223723">"Країна"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Зміщення за GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Місцевий час (год)"</string>
-    <string name="results_country" msgid="8042876404471058354">"ЧАСОВІ ПОЯСИ – <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"ЧАСОВІ ПОЯСИ – GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"ЧАСОВІ ПОЯСИ – <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Очистити запит"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
new file mode 100644
index 0000000..d2e5ed2
--- /dev/null
+++ b/res/values-vi/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">"Trung Úc - Lãnh Thổ Bắc Úc"</item>
+    <item msgid="4345275500159159867">"Trung Úc - Nam Úc"</item>
+    <item msgid="6771274300523132094">"Đông Úc - QLD"</item>
+    <item msgid="4685547681424666687">"Đông Úc - NSW"</item>
+    <item msgid="5259393186526893961">"Giờ chuẩn M.Núi - Dawson Creek"</item>
+    <item msgid="5984634754870859705">"Giờ chuẩn M.Trung - Saskatchewan"</item>
+    <item msgid="5340374311583423836">"Giờ chuẩn Miền Đông - Atikokan"</item>
+    <item msgid="8922086438245451625">"Giờ chuẩn Ðại Tây Dương - Quebec"</item>
+    <item msgid="8353677384517034413">"Hawaii-Aleutian - Hawaii"</item>
+    <item msgid="6426791761018806420">"Hawaii-Aleutian - Alaska"</item>
+    <item msgid="7076353182411415610">"Giờ chuẩn TBD - Metlakatla"</item>
+    <item msgid="373990592918179890">"Giờ chuẩn Miền Núi - Arizona"</item>
+    <item msgid="353899326999279114">"TBD - Baja California"</item>
+    <item msgid="6432134534714673873">"Miền Núi- Chihuahua"</item>
+    <item msgid="7629345735485663968">"Miền Trung - Tamaulipas"</item>
+    <item msgid="3874729044260979505">"Miền Núi - Sonora"</item>
+    <item msgid="1106209575683600471">"Giờ Đông Phi"</item>
+    <item msgid="6538017087072480128">"Giờ chuẩn Đại Tây Dương"</item>
+    <item msgid="6758957851822881177">"Giờ chuẩn Đại Tây Dương"</item>
+    <item msgid="2477556470536619081">"Giờ Đông Âu"</item>
+    <item msgid="7328461310893621937">"Giờ Kaliningrad"</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">"Caribe Hà Lan"</item>
+    <item msgid="1465164631761814300">"Curaçao"</item>
+    <item msgid="8972081011408691260">"Nam Sudan"</item>
+  </string-array>
+</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 78e6ac2..7da17e1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Quốc gia"</string>
-    <string name="country" msgid="4435526943498223723">"Quốc gia"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"Mức chênh lệch GMT"</string>
-    <string name="local_time" msgid="6767659693881978111">"Giờ địa phương (giờ)"</string>
-    <string name="results_country" msgid="8042876404471058354">"MÚI GIỜ Ở <xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"MÚI GIỜ THEO GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"MÚI GIỜ TẠI <xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Xóa truy vấn"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
new file mode 100644
index 0000000..109faa8
--- /dev/null
+++ b/res/values-zh-rCN/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">"澳大利亚中部时间 - 北领地"</item>
+    <item msgid="4345275500159159867">"澳大利亚中部时间 - 南澳洲"</item>
+    <item msgid="6771274300523132094">"澳大利亚东部时间 - 昆士兰"</item>
+    <item msgid="4685547681424666687">"澳大利亚东部时间 - 新南威尔斯"</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-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e5075c9..30dcf05 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"国家/地区"</string>
-    <string name="country" msgid="4435526943498223723">"国家/地区"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT 时差"</string>
-    <string name="local_time" msgid="6767659693881978111">"当地时间（小时）"</string>
-    <string name="results_country" msgid="8042876404471058354">"<xliff:g id="COUNTRY">%s</xliff:g>时区"</string>
-    <string name="results_gmt" msgid="150119647642882676">"GMT <xliff:g id="OFFSET">%s</xliff:g> 时区"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"<xliff:g id="LOCAL_TIME">%s</xliff:g> 时区"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"清除查询"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
new file mode 100644
index 0000000..ae76caf
--- /dev/null
+++ b/res/values-zh-rTW/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">"澳洲中部時間 - 北領地"</item>
+    <item msgid="4345275500159159867">"澳洲中部時間 - 南澳"</item>
+    <item msgid="6771274300523132094">"澳洲東部時間 - 昆士蘭"</item>
+    <item msgid="4685547681424666687">"澳洲東部時間 - 新南威爾斯"</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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6880c45..2414e36 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"國家/地區"</string>
-    <string name="country" msgid="4435526943498223723">"國家/地區"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"GMT 時差"</string>
-    <string name="local_time" msgid="6767659693881978111">"當地時間 (小時)"</string>
-    <string name="results_country" msgid="8042876404471058354">"<xliff:g id="COUNTRY">%s</xliff:g>時區"</string>
-    <string name="results_gmt" msgid="150119647642882676">"GMT <xliff:g id="OFFSET">%s</xliff:g> 時區"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"<xliff:g id="LOCAL_TIME">%s</xliff:g> 時區"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"清除查詢"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 954257a..42c6510 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -18,11 +18,5 @@
 <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="5383328007067667343">"Izwe"</string>
-    <string name="country" msgid="4435526943498223723">"Izwe"</string>
-    <string name="gmt_offset" msgid="1423212735204762062">"I-GMT offset"</string>
-    <string name="local_time" msgid="6767659693881978111">"Isikhathi sendawo (hr)"</string>
-    <string name="results_country" msgid="8042876404471058354">"IMIKHAWULO YESIKHATHI E-<xliff:g id="COUNTRY">%s</xliff:g>"</string>
-    <string name="results_gmt" msgid="150119647642882676">"UMKHAWULO WESIKHATHI KU-GMT <xliff:g id="OFFSET">%s</xliff:g>"</string>
-    <string name="results_local_type" msgid="7740791760342005442">"IMIKHAWULO YESIKHATHI NGO-<xliff:g id="LOCAL_TIME">%s</xliff:g>"</string>
     <string name="searchview_description_clear" msgid="1603860069305867810">"Sula inkinga"</string>
 </resources>