auto import from //branches/cupcake/...@131421

7 files changed, 1 insertions, 178 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
deleted file mode 100644
index d06c3ac..0000000
--- a/res/values-cs/strings.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sync_settings">"Synchronizace"</string>
-    <!-- no translation found for sync_settings_summary (2170159762576931473) -->
-    <skip />
-    <!-- no translation found for sync_too_many_deletes (787961384364877792) -->
-    <skip />
-    <!-- no translation found for background_data (3831063123648199584) -->
-    <skip />
-    <!-- no translation found for background_data_enabled (1011246115211054736) -->
-    <skip />
-    <!-- no translation found for background_data_disabled (741132043571520046) -->
-    <skip />
-    <!-- no translation found for sync_automatically (5023399315924864518) -->
-    <skip />
-    <string name="sync_menu_sync_now">"Synchronizovat"</string>
-    <string name="sync_menu_sync_cancel">"Zrušit synchronizaci"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Kalendář"</string>
-    <string name="sync_contacts">"Kontakty"</string>
-    <!-- no translation found for sync_too_many_deletes_desc (3427885178408263966) -->
-    <skip />
-    <!-- no translation found for sync_really_delete (368496178797559653) -->
-    <skip />
-    <!-- no translation found for sync_undo_deletes (3656008804935475283) -->
-    <skip />
-    <!-- no translation found for sync_do_nothing (5244653227891679592) -->
-    <skip />
-    <!-- no translation found for sync_is_failing (27177391415779409) -->
-    <skip />
-    <!-- no translation found for sync_plug (5260877151006680681) -->
-    <skip />
-</resources>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
deleted file mode 100644
index 5675908..0000000
--- a/res/values-de-rDE/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sync_settings">"Datensynchronisierung"</string>
-    <string name="sync_too_many_deletes">"Limit für Löschung überschritten"</string>
-    <!-- no translation found for background_data (3831063123648199584) -->
-    <skip />
-    <!-- no translation found for background_data_enabled (1011246115211054736) -->
-    <skip />
-    <!-- no translation found for background_data_disabled (741132043571520046) -->
-    <skip />
-    <string name="sync_automatically">"Automatische Synchronisierung"</string>
-    <string name="sync_menu_sync_now">"Jetzt synchronisieren"</string>
-    <string name="sync_menu_sync_cancel">"Synchr. abbrechen"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Kalender"</string>
-    <string name="sync_contacts">"Kontakte"</string>
-    <string name="sync_too_many_deletes_desc">"Es gibt %d gelöschte Elemente für %s, Konto %s. Was möchten Sie tun?"</string>
-    <string name="sync_really_delete">"Diese Elemente löschen."</string>
-    <string name="sync_undo_deletes">"Löschungen rückgängig machen."</string>
-    <string name="sync_do_nothing">"Diesmal nichts tun."</string>
-    <string name="sync_is_failing">"Bei der Synchronisierung gibt es derzeit Probleme. Wird in Kürze fortgesetzt."</string>
-    <!-- no translation found for sync_plug (5260877151006680681) -->
-    <skip />
-</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
deleted file mode 100644
index 8d9bc8d..0000000
--- a/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for sync_settings (8235378331392488746) -->
-    <skip />
-    <!-- no translation found for sync_settings_summary (2170159762576931473) -->
-    <skip />
-    <!-- no translation found for sync_too_many_deletes (787961384364877792) -->
-    <skip />
-    <!-- no translation found for background_data (3831063123648199584) -->
-    <skip />
-    <!-- no translation found for background_data_enabled (1011246115211054736) -->
-    <skip />
-    <!-- no translation found for background_data_disabled (741132043571520046) -->
-    <skip />
-    <!-- no translation found for sync_automatically (5023399315924864518) -->
-    <skip />
-    <!-- no translation found for sync_enabled (3118936391474000701) -->
-    <skip />
-    <!-- no translation found for sync_disabled (2710405826315197809) -->
-    <skip />
-    <!-- no translation found for sync_menu_sync_now (2018559214346014182) -->
-    <skip />
-    <!-- no translation found for sync_menu_sync_cancel (5663042105176122635) -->
-    <skip />
-    <string name="sync_gmail">"Gmail"</string>
-    <!-- no translation found for sync_calendar (3676266228164122419) -->
-    <skip />
-    <!-- no translation found for sync_contacts (4366616523889586528) -->
-    <skip />
-    <!-- no translation found for sync_too_many_deletes_desc (3427885178408263966) -->
-    <skip />
-    <!-- no translation found for sync_really_delete (368496178797559653) -->
-    <skip />
-    <!-- no translation found for sync_undo_deletes (3656008804935475283) -->
-    <skip />
-    <!-- no translation found for sync_do_nothing (5244653227891679592) -->
-    <skip />
-    <!-- no translation found for sync_is_failing (27177391415779409) -->
-    <skip />
-    <!-- no translation found for sync_plug (5260877151006680681) -->
-    <skip />
-</resources>
diff --git a/res/values-fr-rFR/strings.xml b/res/values-fr-rFR/strings.xml
deleted file mode 100644
index 67bff67..0000000
--- a/res/values-fr-rFR/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sync_settings">"Synchronisation données"</string>
-    <string name="sync_too_many_deletes">"Limite de suppression dépassée"</string>
-    <!-- no translation found for background_data (3831063123648199584) -->
-    <skip />
-    <!-- no translation found for background_data_enabled (1011246115211054736) -->
-    <skip />
-    <!-- no translation found for background_data_disabled (741132043571520046) -->
-    <skip />
-    <string name="sync_automatically">"Auto-synchroniser"</string>
-    <string name="sync_menu_sync_now">"Synchroniser maintenant"</string>
-    <string name="sync_menu_sync_cancel">"Annuler la synchronisation"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Agenda"</string>
-    <string name="sync_contacts">"Contacts"</string>
-    <string name="sync_too_many_deletes_desc">"Il y a %d éléments supprimés pour %s, compte %s. Que souhaitez-vous faire ?"</string>
-    <string name="sync_really_delete">"Supprimez les éléments."</string>
-    <string name="sync_undo_deletes">"Annulez les suppressions."</string>
-    <string name="sync_do_nothing">"Ne rien faire maintenant."</string>
-    <string name="sync_is_failing">"Il y a actuellement des problèmes de synchronisation. Elle sera de retour rapidement."</string>
-    <!-- no translation found for sync_plug (5260877151006680681) -->
-    <skip />
-</resources>
diff --git a/res/values-it-rIT/strings.xml b/res/values-it-rIT/strings.xml
deleted file mode 100644
index 414c483..0000000
--- a/res/values-it-rIT/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sync_settings">"Sincronizzazione dati"</string>
-    <string name="sync_too_many_deletes">"Limite di eliminazioni superato"</string>
-    <!-- no translation found for background_data (3831063123648199584) -->
-    <skip />
-    <!-- no translation found for background_data_enabled (1011246115211054736) -->
-    <skip />
-    <!-- no translation found for background_data_disabled (741132043571520046) -->
-    <skip />
-    <string name="sync_automatically">"Sincronizzazione automatica"</string>
-    <string name="sync_menu_sync_now">"Sincronizza ora"</string>
-    <string name="sync_menu_sync_cancel">"Annulla sincronizzazione"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"Calendario"</string>
-    <string name="sync_contacts">"Contatti"</string>
-    <string name="sync_too_many_deletes_desc">"Esistono %d elementi eliminati per %s, account %s. Specificare loperazione da eseguire."</string>
-    <string name="sync_really_delete">"Eliminare gli elementi."</string>
-    <string name="sync_undo_deletes">"Annullare le eliminazioni."</string>
-    <string name="sync_do_nothing">"Non eseguire alcuna operazione per ora."</string>
-    <string name="sync_is_failing">"La sincronizzazione presenta dei problemi. Loperazione verrà presto ripristinata."</string>
-    <!-- no translation found for sync_plug (5260877151006680681) -->
-    <skip />
-</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 4088145..0000000
--- a/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sync_settings">"資料同步"</string>
-    <string name="sync_too_many_deletes">"已經超過刪除上限"</string>
-    <!-- no translation found for background_data (3831063123648199584) -->
-    <skip />
-    <!-- no translation found for background_data_enabled (1011246115211054736) -->
-    <skip />
-    <!-- no translation found for background_data_disabled (741132043571520046) -->
-    <skip />
-    <string name="sync_automatically">"自動同步"</string>
-    <string name="sync_menu_sync_now">"立即同步"</string>
-    <string name="sync_menu_sync_cancel">"取消同步"</string>
-    <string name="sync_gmail">"Gmail"</string>
-    <string name="sync_calendar">"行事曆"</string>
-    <string name="sync_contacts">"連絡人"</string>
-    <string name="sync_too_many_deletes_desc">"%d 個 %s 刪除的項目，來自 %s 帳號。處理的方式為？"</string>
-    <string name="sync_really_delete">"刪除項目。"</string>
-    <string name="sync_undo_deletes">"復原刪除的項目。"</string>
-    <string name="sync_do_nothing">"目前不執行任何動作。"</string>
-    <string name="sync_is_failing">"同步目前發生問題。將會立即恢復正常。"</string>
-    <!-- no translation found for sync_plug (5260877151006680681) -->
-    <skip />
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1506603..76ef06e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -41,7 +41,7 @@
     <string name="sync_menu_sync_cancel">Cancel sync</string>
     <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
     <string name="sync_one_time_sync">Select to sync now<xliff:g id="last_sync_time">\n%1$s</xliff:g></string>
-    <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced. -->
+    <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
     <string name="sync_gmail">Gmail</string>
     <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
     <string name="sync_calendar">Calendar</string>