diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:18:33 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:18:33 -0800 |
commit | 5bff6769e52dfc57528a6f30101461d80fb5a1e9 (patch) | |
tree | d14ba40cf46738e40d7947a078dd587dfb440fba | |
parent | 4e32b238f531d57379a11caa86ec91bb8c283b2a (diff) | |
parent | b67bf196fef5832f45a08e249c7cc99845da41ec (diff) | |
download | android_frameworks_opt_timezonepicker-staging/cm-13.0+r22.tar.gz android_frameworks_opt_timezonepicker-staging/cm-13.0+r22.tar.bz2 android_frameworks_opt_timezonepicker-staging/cm-13.0+r22.zip |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/opt/timezonepicker into cm-13.0staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2K
Android 6.0.1 release 22
-rw-r--r-- | res/values-az-rAZ/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-az-rAZ/strings.xml | 24 | ||||
-rw-r--r-- | res/values-fa/arrays.xml | 10 | ||||
-rw-r--r-- | res/values-iw/arrays.xml | 8 | ||||
-rw-r--r-- | res/values-ur-rPK/arrays.xml | 8 | ||||
-rw-r--r-- | res/values-uz-rUZ/arrays.xml | 2 |
6 files changed, 14 insertions, 89 deletions
diff --git a/res/values-az-rAZ/arrays.xml b/res/values-az-rAZ/arrays.xml deleted file mode 100644 index 05c035f..0000000 --- a/res/values-az-rAZ/arrays.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?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">"Avstraliya Mərkəzi - NT"</item> - <item msgid="4345275500159159867">"Avstraliya Mərkəzi - SA"</item> - <item msgid="6771274300523132094">"Avstraliya Şərqi - QLD"</item> - <item msgid="4685547681424666687">"Avstraliya Şərqi - NSW"</item> - <item msgid="5259393186526893961">"Mountain Standard - Dawson Creek"</item> - <item msgid="5984634754870859705">"Mərkəzi Standard - Saskatçevan"</item> - <item msgid="5340374311583423836">"Şərq Standard - Atikokan"</item> - <item msgid="8922086438245451625">"Atlantik Standard - Kvebek"</item> - <item msgid="8353677384517034413">"Havay-Aleut adaları - Havay"</item> - <item msgid="6426791761018806420">"Havay-Aleut adaları - Alyaska"</item> - <item msgid="7076353182411415610">"Sakit okean Standard - Metlakatla"</item> - <item msgid="373990592918179890">"Dağlıq Standard - Arizona"</item> - <item msgid="353899326999279114">"Sakit okean - Baja Kalifornia"</item> - <item msgid="6432134534714673873">"Dağlıq - Chihuahua"</item> - <item msgid="7629345735485663968">"Mərkəzi - Tamaulipas"</item> - <item msgid="3874729044260979505">"Dağlıq - Sonora"</item> - <item msgid="1106209575683600471">"Şərqi Afrika saatı"</item> - <item msgid="6538017087072480128">"Atlantik Standard saatı"</item> - <item msgid="6758957851822881177">"Atlantik Standard saatı"</item> - <item msgid="2477556470536619081">"Şərqi Avropa saatı"</item> - <item msgid="7328461310893621937">"Kalininqrad saatı"</item> - <item msgid="4212642599758736931">"Amazon - Rondônia"</item> - <item msgid="2370319280810537375">"Braziliya - Pará"</item> - </string-array> - <string-array name="backup_country_names"> - <item msgid="9141777876082196578">"Sint Martin"</item> - <item msgid="5330962017221568054">"Karib Hollandiyası"</item> - <item msgid="1465164631761814300">"Kuraçao"</item> - <item msgid="8972081011408691260">"Cənubi Sudan"</item> - </string-array> -</resources> diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml deleted file mode 100644 index 1fd9e14..0000000 --- a/res/values-az-rAZ/strings.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="hint_time_zone_search" msgid="804776560897143016">"Ölkə adı daxil et"</string> - <string name="searchview_description_clear" msgid="1603860069305867810">"Sorğunu təmizlə"</string> - <string name="no_results_found" msgid="5475293015394772651">"Nəticələr tapılmadı"</string> - <string name="palestine_display_name" msgid="3485026339977302148">"Fələstin"</string> -</resources> diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml index 6551014..02b0179 100644 --- a/res/values-fa/arrays.xml +++ b/res/values-fa/arrays.xml @@ -18,10 +18,10 @@ <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="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> @@ -31,7 +31,7 @@ <item msgid="7076353182411415610">"استاندارد اقیانوس آرام-متلاکاتلا"</item> <item msgid="373990592918179890">"استاندارد کوهستان - آریزونا"</item> <item msgid="353899326999279114">"اقیانوس آرام - باجا کالیفرنیا"</item> - <item msgid="6432134534714673873">"کوهستان - چیواوا"</item> + <item msgid="6432134534714673873">"کوهستان - شی هوا هوا"</item> <item msgid="7629345735485663968">"مرکزی - تامائولیپاس"</item> <item msgid="3874729044260979505">"کوهستان - سونورا"</item> <item msgid="1106209575683600471">"زمان آفریقای شرقی"</item> diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml index 4321cf8..6f2950b 100644 --- a/res/values-iw/arrays.xml +++ b/res/values-iw/arrays.xml @@ -18,10 +18,10 @@ <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="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> diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml index 56dcd9a..dfd7323 100644 --- a/res/values-ur-rPK/arrays.xml +++ b/res/values-ur-rPK/arrays.xml @@ -18,10 +18,10 @@ <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="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> diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml index 4c420e0..60ec46f 100644 --- a/res/values-uz-rUZ/arrays.xml +++ b/res/values-uz-rUZ/arrays.xml @@ -22,7 +22,7 @@ <item msgid="4345275500159159867">"Mark. Avstraliya – Jan. Avstra."</item> <item msgid="6771274300523132094">"Sharqiy Avstraliya – Kvinslend"</item> <item msgid="4685547681424666687">"Sharq. Avstra. – Yangi Jan. Uels"</item> - <item msgid="5259393186526893961">"Tog‘ mintaqasi – Doson ko‘rfazi"</item> + <item msgid="5259393186526893961">"Tog‘ mintaqasi – Douson ko‘rfazi"</item> <item msgid="5984634754870859705">"Markaziy mintaqa – Saskachevan"</item> <item msgid="5340374311583423836">"Sharqiy mintaqa – Atikokan"</item> <item msgid="8922086438245451625">"Atlantika mintaqasi – Kvebek"</item> |