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

8 files changed, 1 insertions, 20 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ff4766d..d06c3ac 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -14,8 +14,6 @@
     <skip />
     <!-- no translation found for sync_automatically (5023399315924864518) -->
     <skip />
-    <string name="sync_enabled">"Synchronizace se serverem Google povolena"</string>
-    <string name="sync_disabled">"Vypnuto"</string>
     <string name="sync_menu_sync_now">"Synchronizovat"</string>
     <string name="sync_menu_sync_cancel">"Zrušit synchronizaci"</string>
     <string name="sync_gmail">"Gmail"</string>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index c05adb5..5675908 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -2,7 +2,6 @@
 <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_settings_summary">"Auswählen, welche Anwendungen synchronisiert werden"</string>
     <string name="sync_too_many_deletes">"Limit für Löschung überschritten"</string>
     <!-- no translation found for background_data (3831063123648199584) -->
     <skip />
@@ -11,8 +10,6 @@
     <!-- no translation found for background_data_disabled (741132043571520046) -->
     <skip />
     <string name="sync_automatically">"Automatische Synchronisierung"</string>
-    <string name="sync_enabled">"Daten automatisch synchronisieren"</string>
-    <string name="sync_disabled">"Auswählen, um Daten automatisch zu synchronisieren"</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>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b3a5891..3cad1f3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="sync_settings">"Sincronización de datos"</string>
-    <string name="sync_settings_summary">"Seleccionar qué aplicaciones están sincronizadas"</string>
     <string name="sync_too_many_deletes">"Eliminar límite excedido"</string>
     <!-- no translation found for background_data (3831063123648199584) -->
     <skip />
@@ -11,8 +10,6 @@
     <!-- no translation found for background_data_disabled (741132043571520046) -->
     <skip />
     <string name="sync_automatically">"Sincronización automática"</string>
-    <string name="sync_enabled">"Sincronización automática de datos"</string>
-    <string name="sync_disabled">"Seleccione la sincronización automática de datos"</string>
     <string name="sync_menu_sync_now">"Sincronizar ahora"</string>
     <string name="sync_menu_sync_cancel">"Cancelar sincronización"</string>
     <string name="sync_gmail">"Gmail"</string>
diff --git a/res/values-fr-rFR/strings.xml b/res/values-fr-rFR/strings.xml
index e57e18a..67bff67 100644
--- a/res/values-fr-rFR/strings.xml
+++ b/res/values-fr-rFR/strings.xml
@@ -2,7 +2,6 @@
 <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_settings_summary">"Sélectionnez les applications à synchroniser"</string>
     <string name="sync_too_many_deletes">"Limite de suppression dépassée"</string>
     <!-- no translation found for background_data (3831063123648199584) -->
     <skip />
@@ -11,8 +10,6 @@
     <!-- no translation found for background_data_disabled (741132043571520046) -->
     <skip />
     <string name="sync_automatically">"Auto-synchroniser"</string>
-    <string name="sync_enabled">"Synchroniser automatiquement les données"</string>
-    <string name="sync_disabled">"Sélectionner pour synchroniser automatiquement les données"</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>
diff --git a/res/values-it-rIT/strings.xml b/res/values-it-rIT/strings.xml
index 1a65f06..414c483 100644
--- a/res/values-it-rIT/strings.xml
+++ b/res/values-it-rIT/strings.xml
@@ -2,7 +2,6 @@
 <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_settings_summary">"Scegliere le applicazioni sincronizzate"</string>
     <string name="sync_too_many_deletes">"Limite di eliminazioni superato"</string>
     <!-- no translation found for background_data (3831063123648199584) -->
     <skip />
@@ -11,8 +10,6 @@
     <!-- no translation found for background_data_disabled (741132043571520046) -->
     <skip />
     <string name="sync_automatically">"Sincronizzazione automatica"</string>
-    <string name="sync_enabled">"Sincronizza dati automaticamente"</string>
-    <string name="sync_disabled">"Selezionare per sincronizzare i dati automaticamente"</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>
diff --git a/res/values-nl-rNL/strings.xml b/res/values-nl-rNL/strings.xml
index cb86db9..32eb082 100644
--- a/res/values-nl-rNL/strings.xml
+++ b/res/values-nl-rNL/strings.xml
@@ -14,8 +14,6 @@
     <skip />
     <!-- no translation found for sync_automatically (5023399315924864518) -->
     <skip />
-    <string name="sync_enabled">"Synchroniseren met Google-server ingeschakeld"</string>
-    <string name="sync_disabled">"Uit"</string>
     <string name="sync_menu_sync_now">"Nu synchroniseren"</string>
     <string name="sync_menu_sync_cancel">"Synchroniseren annuleren"</string>
     <string name="sync_gmail">"Gmail"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 9e53619..4088145 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2,7 +2,6 @@
 <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_settings_summary">"選取要同步的應用程式"</string>
     <string name="sync_too_many_deletes">"已經超過刪除上限"</string>
     <!-- no translation found for background_data (3831063123648199584) -->
     <skip />
@@ -11,8 +10,6 @@
     <!-- no translation found for background_data_disabled (741132043571520046) -->
     <skip />
     <string name="sync_automatically">"自動同步"</string>
-    <string name="sync_enabled">"自動同步資料"</string>
-    <string name="sync_disabled">"選取自動同步資料"</string>
     <string name="sync_menu_sync_now">"立即同步"</string>
     <string name="sync_menu_sync_cancel">"取消同步"</string>
     <string name="sync_gmail">"Gmail"</string>
diff --git a/src/com/android/settings/SyncSettings.java b/src/com/android/settings/SyncSettings.java
index b7af99e..cf8e928 100644
--- a/src/com/android/settings/SyncSettings.java
+++ b/src/com/android/settings/SyncSettings.java
@@ -152,7 +152,7 @@ public class SyncSettings
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         menu.add(0, MENU_SYNC_NOW_ID, 0, getString(R.string.sync_menu_sync_now))
-                .setIcon(android.R.drawable.ic_menu_refresh);
+                .setIcon(com.android.internal.R.drawable.ic_menu_refresh);
         menu.add(0, MENU_SYNC_CANCEL_ID, 0, getString(R.string.sync_menu_sync_cancel))
                 .setIcon(android.R.drawable.ic_menu_close_clear_cancel);
         return true;