am 8aedf941: (-s ours) Import translations. DO NOT MERGE
* commit '8aedf9412532499dddcd965050bb5ac654d83834':
Import translations. DO NOT MERGE
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 7f06901..be0398f 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -32,7 +32,7 @@
<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">"Severoamerický centrální čas – Tamaulipas"</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>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
deleted file mode 100644
index b00bd3a..0000000
--- a/res/values-fr-rCA/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">"Heure centr. Australie (T. 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 norm. Roch. (Dawson Creek)"</item>
- <item msgid="5984634754870859705">"Heure normale du Centre (Sask.)"</item>
- <item msgid="5340374311583423836">"Heure normale de l\'Est (Atikokan)"</item>
- <item msgid="8922086438245451625">"Heure normale 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 norm. Pacif. (Metlakatla)"</item>
- <item msgid="373990592918179890">"Heure norm. Rocheuses (Arizona)"</item>
- <item msgid="353899326999279114">"Heure Pacifique (Baja California)"</item>
- <item msgid="6432134534714673873">"Heure des Rocheuses (Chihuahua)"</item>
- <item msgid="7629345735485663968">"Heure centr. Mexique (Tamaulipas)"</item>
- <item msgid="3874729044260979505">"Heure des Rocheuses (Sonora)"</item>
- <item msgid="1106209575683600471">"Heure d\'Afrique de l\'Est"</item>
- <item msgid="6538017087072480128">"Heure normale de l\'Atlantique"</item>
- <item msgid="6758957851822881177">"Heure normale 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 (Pays-Bas)"</item>
- <item msgid="1465164631761814300">"Curaçao"</item>
- <item msgid="8972081011408691260">"Soudan du Sud"</item>
- </string-array>
-</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
deleted file mode 100644
index f93baec..0000000
--- a/res/values-fr-rCA/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">"Entrez un nom de pays"</string>
- <string name="searchview_description_clear" msgid="1603860069305867810">"Effacer la requête"</string>
- <string name="no_results_found" msgid="5475293015394772651">"Aucun résultat trouvé"</string>
- <string name="palestine_display_name" msgid="3485026339977302148">"Palestine"</string>
-</resources>
diff --git a/src/com/android/timezonepicker/TimeZoneData.java b/src/com/android/timezonepicker/TimeZoneData.java
index 1e7b001..9302a3c 100644
--- a/src/com/android/timezonepicker/TimeZoneData.java
+++ b/src/com/android/timezonepicker/TimeZoneData.java
@@ -475,7 +475,6 @@
return processedTimeZones;
}
- @SuppressWarnings("unused")
private static Locale mBackupCountryLocale;
private static String[] mBackupCountryCodes;
private static String[] mBackupCountryNames;
