android-2.1_r1 snapshot

23 files changed, 66 insertions, 69 deletions

diff --git a/res/layout/provider_preference.xml b/res/layout/provider_preference.xml
index 3daaf30..6bb7dfb 100644
--- a/res/layout/provider_preference.xml
+++ b/res/layout/provider_preference.xml
@@ -40,7 +40,7 @@
         <TextView android:id="@+android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:singleLine="true"
+            android:maxLines="2"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView android:id="@+android:id/summary"
@@ -49,7 +49,8 @@
             android:layout_below="@android:id/title"
             android:layout_alignLeft="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
+            android:maxLines="2"
+            android:visibility="gone" />
 
     </RelativeLayout>
 
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 318f699..754fc46 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Synchronizace zdrojů"</string>
+    <string name="app_label" msgid="3706018265751197270">"Nastavení účtu a synchronizace"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Nastavení účtů a synchronizace"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Byl překročen limit mazání."</string>
     <string name="background_data" msgid="1103557117473896066">"Data na pozadí"</string>
@@ -54,7 +54,7 @@
     <string name="finish_button_label" msgid="6121560986057356757">"Dokončit"</string>
     <string name="really_remove_account_title" msgid="8808121039511188784">"Odebrat účet"</string>
     <string name="really_remove_account_message" msgid="3293445755620109578">"Opravdu chcete tento účet odebrat? Z telefonu budou smazány také všechny zprávy, kontakty a další data tohoto účtu. "\n"Pokračovat?"</string>
-    <string name="remove_account_failed" msgid="8178924513521241001">"Tento účet je požadován některými aplikacemi. Můžete jej odebrat pouze obnovením výchozího nastavení telefonu z výroby (které smaže všechna osobní data). Můžete to provést v aplikaci Nastavení v části Ochrana osobních údajů."</string>
+    <string name="remove_account_failed" msgid="8178924513521241001">"Tento účet je požadován některými aplikacemi. Můžete jej odebrat pouze obnovením výchozího nastavení telefonu z výroby (které smaže všechna osobní data). Můžete to provést v Nastavení v části Ochrana osobních údajů."</string>
     <string name="provider_label" msgid="6191617139291321517">"Zobrazit odběry"</string>
     <string name="sync_item_title" msgid="7984962124867021854">"Synchronizace služby <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="3016197392261471761">"Nelze ručně synchronizovat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 733929c..d169062 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Synkroniser feeds"</string>
+    <string name="app_label" msgid="3706018265751197270">"Indstillinger for konto og synkronisering"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Indstillinger for konti og synkronisering"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Grænsen for sletning er overskredet"</string>
     <string name="background_data" msgid="1103557117473896066">"Baggrundsdata"</string>
@@ -37,26 +37,26 @@
     <string name="sync_really_delete" msgid="5456355204562588976">"Slet elementerne."</string>
     <string name="sync_undo_deletes" msgid="8695514459839593307">"Fortryd sletningerne."</string>
     <string name="sync_do_nothing" msgid="5798755982392201673">"Gør ikke noget lige nu."</string>
-    <string name="sync_is_failing" msgid="5230237058552433773">"Der er problemer med synkronisering i øjeblikket. Det vender snart tilbage."</string>
-    <string name="sync_plug" msgid="7020432439004167162"><font fgcolor="#ffffffff">"Velkommen til Google\nSync!"</font>" "\n"En tilgang til synkronisering af data fra Google, som giver dig adgang til dine kontaktpersoner, aftaler og mere, uanset hvor du er."</string>
+    <string name="sync_is_failing" msgid="5230237058552433773">"Der er problemer med synkroniseringen i øjeblikket. Den er snart tilbage."</string>
+    <string name="sync_plug" msgid="7020432439004167162"><font fgcolor="#ffffffff">"Velkommen til Google Sync!"</font>" "\n"En Google-synkronisering af data giver dig adgang til dine kontakter, aftaler og meget mere, uanset hvor du er."</string>
     <string name="header_application_sync_settings" msgid="5263025067167527890">"Indstillinger for programsynkronisering"</string>
-    <string name="header_manage_accounts" msgid="381956296995298770">"Administrer konti"</string>
-    <string name="header_general_sync_settings" msgid="1598537524696692308">"Generelle synkroniseringsindstillinger"</string>
+    <string name="header_manage_accounts" msgid="381956296995298770">"Administration af konti"</string>
+    <string name="header_general_sync_settings" msgid="1598537524696692308">"Generelle indstillinger for synkronisering"</string>
     <string name="sync_enabled" msgid="913018877443997502">"Synkronisering er aktiveret"</string>
     <string name="sync_disabled" msgid="185731301298967302">"Synkronisering slået fra"</string>
     <string name="sync_error" msgid="681431702824599812">"Synkroniseringsfejl"</string>
     <string name="add_account_label" msgid="2035321485672826779">"Tilføj konto"</string>
     <string name="header_data_and_synchronization" msgid="6286257845276834071">"Data og synkronisering"</string>
     <string name="preference_change_password_title" msgid="6468827554159468315">"Skift adgangskode"</string>
-    <string name="header_account_settings" msgid="4950809499418403792">"Kontoindstillinger"</string>
+    <string name="header_account_settings" msgid="4950809499418403792">"Indstillinger for konto"</string>
     <string name="remove_account_label" msgid="5624712684599197863">"Fjern konto"</string>
     <string name="header_add_an_account" msgid="2198078922829535425">"Tilføj en konto"</string>
     <string name="finish_button_label" msgid="6121560986057356757">"Afslut"</string>
     <string name="really_remove_account_title" msgid="8808121039511188784">"Fjern konto"</string>
-    <string name="really_remove_account_message" msgid="3293445755620109578">"Ønsker du virkelig at fjerne denne konto? Hvis du fjerner den, slettes også alle dens beskeder, kontaktpersoner og andre data fra telefonen. "\n"Fortsæt?"</string>
-    <string name="remove_account_failed" msgid="8178924513521241001">"Denne konto er påkrævet af nogle programmer. Du kan kun fjerne den ved at nulstille telefonen til fabriksstandard (hvilket sletter alle dine personlige data). Du kan gøre dette i Indstillingsprogrammet under Beskyttelse af personlige oplysninger."</string>
+    <string name="really_remove_account_message" msgid="3293445755620109578">"Ønsker du virkelig at fjerne denne konto? Hvis du fjerner den, slettes også alle dens beskeder, kontakter og andre data fra telefonen. "\n"Fortsæt?"</string>
+    <string name="remove_account_failed" msgid="8178924513521241001">"Denne konto kræves af nogle programmer. Du kan kun fjerne den ved at nulstille telefonen til fabriksstandard (hvilket sletter alle dine personlige oplysninger). Du kan gøre dette i Indstillinger under Fortrolighed."</string>
     <string name="provider_label" msgid="6191617139291321517">"Push-abonnementer"</string>
-    <string name="sync_item_title" msgid="7984962124867021854">"Synkroniser<xliff:g id="AUTHORITY">%s</xliff:g>"</string>
+    <string name="sync_item_title" msgid="7984962124867021854">"Synkroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="3016197392261471761">"Kan ikke synkronisere manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="7200115394296632300">"Synkronisering af dette element er slået fra i øjeblikket. Hvis du vil ændre indstillingen, skal du midlertidigt slå baggrundsdata til og synkronisere automatisk."</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 706488b..713b14a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -15,11 +15,11 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Feedsynchronisierung"</string>
+    <string name="app_label" msgid="3706018265751197270">"Konto- und Synchronisierungseinstellungen"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Einstellungen für Konten &amp; Synchronisierung"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Löschbegrenzung überschritten"</string>
     <string name="background_data" msgid="1103557117473896066">"Hintergrunddaten"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"Die Anwendungen können jederzeit Daten synchronisieren, senden und empfangen"</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"Anwendungen können Daten synchronisieren, senden und empfangen."</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Achtung"</string>
     <string name="background_data_dialog_message" msgid="8417297954700022363">"Durch die Deaktivierung von Hintergrunddaten kann die Akkulaufzeit verlängert und die Verwendung von Daten verringert werden. Einige Anwendungen nutzen die Hintergrunddatenverbindung möglicherweise weiterhin."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"Autom. synchronisieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b1d1bb6..9b7600c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Συγχρονισμός ροών δεδομένων"</string>
+    <string name="app_label" msgid="3706018265751197270">"Ρυθμίσεις λογαριασμού και συγχρονισμού"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Ρυθμίσεις λογαριασμών &amp; συγχρονισμού"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Έγινε υπέρβαση του ορίου διαγραφής."</string>
     <string name="background_data" msgid="1103557117473896066">"Δεδομένα φόντου"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e75acc7..8a35350 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -15,11 +15,11 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Canales de sincronización"</string>
+    <string name="app_label" msgid="3706018265751197270">"Parámetros de configuración de cuenta y sincronización"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Configuración de cuentas y sincronización"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Eliminar el límite excedido"</string>
     <string name="background_data" msgid="1103557117473896066">"Datos de fondo"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"Las aplicaciones se pueden sincronizar, enviar y pueden recibir datos en cualquier momento"</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"Las aplic.  pueden sincronizar, enviar y  recibir datos en cualq. mom."</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Atención"</string>
     <string name="background_data_dialog_message" msgid="8417297954700022363">"Al desactivar los datos de fondo, se prolonga la vida útil de la batería y se reduce el uso de los datos. Algunas aplicaciones incluso pueden utilizar una conexión de datos de fondo."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"Sincroniz. automática"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a6faab6..3ebc2d4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Sincronización de feeds"</string>
+    <string name="app_label" msgid="3706018265751197270">"Configuración de sincronización y de cuenta"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Configuración de sincronización y de cuentas"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Límite de eliminaciones superado"</string>
     <string name="background_data" msgid="1103557117473896066">"Datos de referencia"</string>
@@ -54,7 +54,7 @@
     <string name="finish_button_label" msgid="6121560986057356757">"Finalizar"</string>
     <string name="really_remove_account_title" msgid="8808121039511188784">"Eliminar cuenta"</string>
     <string name="really_remove_account_message" msgid="3293445755620109578">"¿Deseas eliminar realmente esta cuenta? Si la eliminas, se eliminarán también todos los mensajes, los contactos y otros datos del teléfono. "\n"¿Quieres continuar?"</string>
-    <string name="remove_account_failed" msgid="8178924513521241001">"Algunas aplicaciones necesitan esta cuenta. Solo puedes eliminarla restableciendo los valores predeterminados de fábrica del teléfono(esta acción elimina todos tus datos personales). Para ello, accede a \"Configuración\", \"Privacidad\"."</string>
+    <string name="remove_account_failed" msgid="8178924513521241001">"Algunas aplicaciones necesitan esta cuenta. Solo puedes eliminarla restableciendo los valores predeterminados de fábrica del teléfono(esta acción elimina todos tus datos personales). Para ello, accede a \"Ajustes\", \"Privacidad\"."</string>
     <string name="provider_label" msgid="6191617139291321517">"Enviar suscripciones"</string>
     <string name="sync_item_title" msgid="7984962124867021854">"Sincronizar <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="3016197392261471761">"No se puede realizar la sincronización de forma manual."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2384847..9addd4a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -15,11 +15,11 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Synchronisation des flux"</string>
+    <string name="app_label" msgid="3706018265751197270">"Paramètres de compte et de synchronisation"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Paramètres de compte et de synchronisation"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Le nombre maximum de suppressions a été atteint."</string>
     <string name="background_data" msgid="1103557117473896066">"Données en arrière-plan"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"Les applications peuvent synchroniser, envoyer et recevoir des données à tout moment."</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"Synchronisation, envoi et réception des données à tout moment"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Attention"</string>
     <string name="background_data_dialog_message" msgid="8417297954700022363">"La désactivation des données en arrière-plan permet d\'économiser la batterie et de réduire l\'utilisation des données. Certaines applications peuvent utiliser la connexion des données en arrière-plan."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"Synchronisation auto"</string>
@@ -40,9 +40,9 @@
     <string name="sync_is_failing" msgid="5230237058552433773">"La synchronisation rencontre actuellement des problèmes. Elle sera rétablie sous peu."</string>
     <string name="sync_plug" msgid="7020432439004167162"><font fgcolor="#ffffffff">"Bienvenue sur Google Sync !"</font>" "\n"Une solution Google pour synchroniser vos données et vous permettre d\'accéder à vos contacts, rendez-vous, etc. où que vous soyez."</string>
     <string name="header_application_sync_settings" msgid="5263025067167527890">"Paramètres des applications"</string>
-    <string name="header_manage_accounts" msgid="381956296995298770">"Gérer les comptes"</string>
+    <string name="header_manage_accounts" msgid="381956296995298770">"Gestion des comptes"</string>
     <string name="header_general_sync_settings" msgid="1598537524696692308">"Paramètres généraux"</string>
-    <string name="sync_enabled" msgid="913018877443997502">"La synchronisation est activée."</string>
+    <string name="sync_enabled" msgid="913018877443997502">"Synchronisation activée"</string>
     <string name="sync_disabled" msgid="185731301298967302">"La synchronisation est désactivée."</string>
     <string name="sync_error" msgid="681431702824599812">"Erreur de synchronisation"</string>
     <string name="add_account_label" msgid="2035321485672826779">"Ajouter un compte"</string>
@@ -57,6 +57,6 @@
     <string name="remove_account_failed" msgid="8178924513521241001">"Ce compte est utilisé par des applications. Pour le supprimer, vous devez rétablir les paramètres par défaut du téléphone (ce qui supprimera toutes vos données personnelles). Pour cela, allez dans l\'application Paramètres, sous Confidentialité."</string>
     <string name="provider_label" msgid="6191617139291321517">"Abonnements Push"</string>
     <string name="sync_item_title" msgid="7984962124867021854">"Synchroniser <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
-    <string name="cant_sync_dialog_title" msgid="3016197392261471761">"Impossible de procéder à la synchronisation manuelle."</string>
+    <string name="cant_sync_dialog_title" msgid="3016197392261471761">"Synchronisation manuelle impossible"</string>
     <string name="cant_sync_dialog_message" msgid="7200115394296632300">"La synchronisation de cet élément est actuellement désactivée. Pour modifier vos préférences, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 98485d2..d4416ec 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -15,17 +15,17 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Sincronizzazione feed"</string>
+    <string name="app_label" msgid="3706018265751197270">"Impostazioni account e di sincronizzazione"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Impostazioni account e sincronizzazione"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Limite di eliminazioni superato"</string>
     <string name="background_data" msgid="1103557117473896066">"Dati in background"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"Le applicazioni possono sincronizzare, inviare e ricevere dati in qualsiasi momento"</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"Le applicaz. possono sincronizzare, inviare e ricevere dati in ogni momento"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Attenzione"</string>
     <string name="background_data_dialog_message" msgid="8417297954700022363">"La disattivazione dei dati in background consente di estendere la durata delle batterie e di ridurre l\'utilizzo dei dati. Alcune applicazioni potrebbero utilizzare comunque la connessione dati in background."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"Sincronizz. automatica"</string>
     <string name="sync_automatically_summary" msgid="4598895616781542745">"Le applicazioni sincronizzano i dati automaticamente"</string>
     <string name="settings_backup" msgid="6114299464740014762">"Backup impostazioni"</string>
-    <string name="settings_backup_summary" msgid="1787552172618610178">"Backup delle mie impostazioni"</string>
+    <string name="settings_backup_summary" msgid="1787552172618610178">"Backup delle mie impost."</string>
     <string name="sync_menu_sync_now" msgid="5796024841315572404">"Sincronizza ora"</string>
     <string name="sync_menu_sync_cancel" msgid="1005480041232010062">"Annulla sincronizzazione"</string>
     <string name="sync_one_time_sync" msgid="3274364877518422827">"Tocca per sincronizzare ora <xliff:g id="LAST_SYNC_TIME">
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 364e07b..10ffabf 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -15,13 +15,13 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"フィードの同期"</string>
+    <string name="app_label" msgid="3706018265751197270">"アカウントと同期の設定"</string>
     <string name="sync_settings" msgid="8707056705985552604">"アカウントと同期の設定"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"削除の制限を超えました"</string>
     <string name="background_data" msgid="1103557117473896066">"バックグラウンドデータ"</string>
     <string name="background_data_summary" msgid="9048259510387973822">"アプリケーションがデータをいつでも同期、送信、受信できるようにする"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"注意"</string>
-    <string name="background_data_dialog_message" msgid="8417297954700022363">"バックグラウンドデータを無効にすると、データの使用が減るため電池を節約できます。一部のアプリケーションでは引き続きバックグラウンドデータの接続を使用します。"</string>
+    <string name="background_data_dialog_message" msgid="8417297954700022363">"バックグラウンドデータを無効にすると、データの使用量が減るため電池を節約できます。一部のアプリケーションでは引き続きバックグラウンドデータの接続を使用します。"</string>
     <string name="sync_automatically" msgid="4694735102757960100">"自動同期"</string>
     <string name="sync_automatically_summary" msgid="4598895616781542745">"アプリケーションが自動的にデータを同期する"</string>
     <string name="settings_backup" msgid="6114299464740014762">"設定をバックアップ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 55af90c..5105d62 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -15,15 +15,15 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"피드 동기화"</string>
+    <string name="app_label" msgid="3706018265751197270">"계정 및 동기화 설정"</string>
     <string name="sync_settings" msgid="8707056705985552604">"계정 및 동기화 설정"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"삭제 한도를 초과했습니다."</string>
     <string name="background_data" msgid="1103557117473896066">"배경 데이터"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"응용프로그램이 언제든지 데이터를 동기화하고 보내고 받을 수 있습니다."</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"응용프로그램에서 언제든지 데이터를 동기화하고 보내고 받음"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"주의"</string>
     <string name="background_data_dialog_message" msgid="8417297954700022363">"백그라운드 데이터를 사용하지 않도록 설정하면 배터리 수명이 늘어나고 데이터 사용률이 낮아집니다. 일부 응용프로그램은 여전히 백그라운드 데이터 연결을 사용할 수 있습니다."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"자동 동기화"</string>
-    <string name="sync_automatically_summary" msgid="4598895616781542745">"응용프로그램이 데이터를 자동으로 동기화합니다."</string>
+    <string name="sync_automatically_summary" msgid="4598895616781542745">"응용프로그램에서 데이터를 자동으로 동기화함"</string>
     <string name="settings_backup" msgid="6114299464740014762">"설정 백업"</string>
     <string name="settings_backup_summary" msgid="1787552172618610178">"내 설정 백업"</string>
     <string name="sync_menu_sync_now" msgid="5796024841315572404">"지금 동기화"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1c36793..a8e5e3d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Strømsynkronisering"</string>
+    <string name="app_label" msgid="3706018265751197270">"Konto- og synkroniseringsinnstillinger"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Innstillinger for kontoer og synkronisering"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Grensen for sletting nådd"</string>
     <string name="background_data" msgid="1103557117473896066">"Bakgrunnsdata"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4914f9c..daf9ce3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -15,22 +15,21 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Feeds synchroniseren"</string>
+    <string name="app_label" msgid="3706018265751197270">"Account- en synchronisatie-instellingen"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Account- en synchronisatie-instellingen"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Verwijderingslimiet overschreden"</string>
     <string name="background_data" msgid="1103557117473896066">"Achtergrondgegevens"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"Toepassingen kunnen gegevens op elk gewenst moment synchroniseren, verzenden en ontvangen"</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"Toepassingen kunnen gegevens synchroniseren, verzenden en ontvangen"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Let op"</string>
     <string name="background_data_dialog_message" msgid="8417297954700022363">"Als u achtergrondgegevens uitschakelt, bespaart u acculading en wordt het gegevensverbruik verlaagd. Sommige toepassingen maken mogelijk nog steeds gebruik van de achtergrondgegevensverbinding."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"Automatische synchronisatie"</string>
-    <!-- no translation found for sync_automatically_summary (4598895616781542745) -->
-    <skip />
+    <string name="sync_automatically_summary" msgid="4598895616781542745">"Toepassingen kunnen gegevens automatisch synchroniseren"</string>
     <string name="settings_backup" msgid="6114299464740014762">"Back-up van instellingen maken"</string>
     <string name="settings_backup_summary" msgid="1787552172618610178">"Back-up maken van mijn instellingen"</string>
     <string name="sync_menu_sync_now" msgid="5796024841315572404">"Nu synchroniseren"</string>
     <string name="sync_menu_sync_cancel" msgid="1005480041232010062">"Synchronisatie annuleren"</string>
-    <!-- no translation found for sync_one_time_sync (3274364877518422827) -->
-    <skip />
+    <string name="sync_one_time_sync" msgid="3274364877518422827">"Aanraken om nu te synchroniseren<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="5806053858668452000">"Gmail"</string>
     <string name="sync_calendar" msgid="1796292773734071897">"Agenda"</string>
     <string name="sync_contacts" msgid="2035690905925565660">"Contacten"</string>
@@ -47,18 +46,15 @@
     <string name="sync_disabled" msgid="185731301298967302">"Synchroniseren uitgeschakeld"</string>
     <string name="sync_error" msgid="681431702824599812">"Fout bij synchroniseren"</string>
     <string name="add_account_label" msgid="2035321485672826779">"Account toevoegen"</string>
-    <!-- no translation found for header_data_and_synchronization (6286257845276834071) -->
-    <skip />
+    <string name="header_data_and_synchronization" msgid="6286257845276834071">"Gegevens en synchronisatie"</string>
     <string name="preference_change_password_title" msgid="6468827554159468315">"Wachtwoord wijzigen"</string>
     <string name="header_account_settings" msgid="4950809499418403792">"Accountinstellingen"</string>
     <string name="remove_account_label" msgid="5624712684599197863">"Account verwijderen"</string>
     <string name="header_add_an_account" msgid="2198078922829535425">"Een account toevoegen"</string>
     <string name="finish_button_label" msgid="6121560986057356757">"Voltooien"</string>
     <string name="really_remove_account_title" msgid="8808121039511188784">"Account verwijderen"</string>
-    <!-- no translation found for really_remove_account_message (3293445755620109578) -->
-    <skip />
-    <!-- no translation found for remove_account_failed (8178924513521241001) -->
-    <skip />
+    <string name="really_remove_account_message" msgid="3293445755620109578">"Wilt u dit account echt verwijderen? Als u het account verwijdert, worden ook alle accountberichten, contacten en andere gegevens van de telefoon verwijderd. "\n"Doorgaan?"</string>
+    <string name="remove_account_failed" msgid="8178924513521241001">"Dit account is vereist voor sommige toepassingen. U kunt het account alleen verwijderen door de telefoon te herstellen naar de fabrieksinstellingen (al uw persoonlijke gegevens worden gewist). U kunt dit doen via de toepassing Instellingen, bij \'Privacy\'."</string>
     <string name="provider_label" msgid="6191617139291321517">"Abonnementen doorvoeren"</string>
     <string name="sync_item_title" msgid="7984962124867021854">"<xliff:g id="AUTHORITY">%s</xliff:g> synchroniseren"</string>
     <string name="cant_sync_dialog_title" msgid="3016197392261471761">"Kan niet handmatig synchroniseren"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 57e4902..ff24d87 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Synchronizuj kanały"</string>
+    <string name="app_label" msgid="3706018265751197270">"Ustawienia konta i synchronizacji"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Ustawienia kont i synchronizacji"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Przekroczono limit usuwania"</string>
     <string name="background_data" msgid="1103557117473896066">"Dane w tle"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 97992b3..daa2245 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -15,11 +15,11 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Sincronizar feeds"</string>
+    <string name="app_label" msgid="3706018265751197270">"Definições de conta e de sincronização"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Definições de contas e sincronização"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Limite de eliminações excedido"</string>
     <string name="background_data" msgid="1103557117473896066">"Dados em segundo plano"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"As aplicações podem sincronizar, enviar e receber dados em qualquer momento"</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"Aplicações podem sincronizar, enviar/receber dados a qualq. momento"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Atenção"</string>
     <string name="background_data_dialog_message" msgid="8417297954700022363">"A desactivação de dados em segundo plano economiza a bateria e reduz a utilização de dados. Algumas aplicações podem continuar a utilizar a ligação de dados em segundo plano."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"Sincronização automática"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2d51e42..5439e6e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -15,17 +15,17 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Sincronizar feeds"</string>
-    <string name="sync_settings" msgid="8707056705985552604">"Configurações de Contas e sincronização"</string>
+    <string name="app_label" msgid="3706018265751197270">"Configurações de conta e sincronização"</string>
+    <string name="sync_settings" msgid="8707056705985552604">"Configurações de contas e sincronização"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Limite de exclusão excedido"</string>
     <string name="background_data" msgid="1103557117473896066">"Dados de segundo plano"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"Os aplicativos podem sincronizar, enviar e receber dados a qualquer momento"</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"Aplicativos sincronizam, enviam e recebem dados a qualquer momento"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Atenção"</string>
     <string name="background_data_dialog_message" msgid="8417297954700022363">"A desativação dos dados de segundo plano estende a vida útil da bateria e diminui o uso dos dados. Alguns aplicativos ainda podem usar a conexão de dados de segundo plano."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"Sinc. automática"</string>
     <string name="sync_automatically_summary" msgid="4598895616781542745">"Aplicativos sincronizam dados automaticamente"</string>
     <string name="settings_backup" msgid="6114299464740014762">"Fazer backup das configurações"</string>
-    <string name="settings_backup_summary" msgid="1787552172618610178">"Fazer backup de minhas configurações"</string>
+    <string name="settings_backup_summary" msgid="1787552172618610178">"Fazer backup das conf."</string>
     <string name="sync_menu_sync_now" msgid="5796024841315572404">"Sincronizar agora"</string>
     <string name="sync_menu_sync_cancel" msgid="1005480041232010062">"Cancelar a sincronização"</string>
     <string name="sync_one_time_sync" msgid="3274364877518422827">"Toque para sincronizar agora<xliff:g id="LAST_SYNC_TIME">
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 61f2653..bf8d06d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,13 +15,13 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Фиды синхронизации"</string>
+    <string name="app_label" msgid="3706018265751197270">"Настройки аккаунта и синхронизации"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Настройки аккаунтов и синхронизации"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Превышен предел удаления"</string>
-    <string name="background_data" msgid="1103557117473896066">"Использовать фоновые данные"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"Программы могут синхронизироваться, отправлять и принимать данные в любое время."</string>
+    <string name="background_data" msgid="1103557117473896066">"Фоновый режим"</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"Синхронизация, отправка и прием данных возможны в любое время"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"Внимание"</string>
-    <string name="background_data_dialog_message" msgid="8417297954700022363">"Отключение фоновых данных экономит энергию батареи и уменьшает использование данных. Некоторые приложения могут, тем не менее, использовать фоновую передачу данных."</string>
+    <string name="background_data_dialog_message" msgid="8417297954700022363">"Отключение фонового режима обмена данными экономит энергию батареи и уменьшает объем трафика. Однако некоторые приложения смогут, тем не менее, продолжить использование фоновой передачи даже после ее отключения."</string>
     <string name="sync_automatically" msgid="4694735102757960100">"Автосинхронизация"</string>
     <string name="sync_automatically_summary" msgid="4598895616781542745">"Приложения синхронизируют данные автоматически"</string>
     <string name="settings_backup" msgid="6114299464740014762">"Создать резервную копию настроек"</string>
@@ -58,5 +58,5 @@
     <string name="provider_label" msgid="6191617139291321517">"Подписки Push"</string>
     <string name="sync_item_title" msgid="7984962124867021854">"Синхр. <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="3016197392261471761">"Не удается синхронизировать вручную"</string>
-    <string name="cant_sync_dialog_message" msgid="7200115394296632300">"Синхронизация для этого элемента отключена. Чтобы изменить настройку, временно разрешите использование фоновых данных и автоматическую синхронизацию."</string>
+    <string name="cant_sync_dialog_message" msgid="7200115394296632300">"Синхронизация для этого элемента отключена. Чтобы изменить настройку, временно разрешите использование фонового режима передачи данных и автоматическую синхронизацию."</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f6ead7d..5a357f7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Synkroniseringsflöden"</string>
+    <string name="app_label" msgid="3706018265751197270">"Konto- och synkroniseringsinställningar"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Inställningar för konton och synkronisering"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Gränsen för borttagning har överskridits"</string>
     <string name="background_data" msgid="1103557117473896066">"Bakgrundsdata"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 74d08f9..e082f31 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"Senkronizasyon yayınları"</string>
+    <string name="app_label" msgid="3706018265751197270">"Hesap ve Senkronizasyon Ayarları"</string>
     <string name="sync_settings" msgid="8707056705985552604">"Hesaplar ve senkronizasyon ayarları"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"Silme sınırı aşıldı"</string>
     <string name="background_data" msgid="1103557117473896066">"Arka plan veri"</string>
@@ -53,10 +53,10 @@
     <string name="header_add_an_account" msgid="2198078922829535425">"Bir hesap ekleyin"</string>
     <string name="finish_button_label" msgid="6121560986057356757">"Son"</string>
     <string name="really_remove_account_title" msgid="8808121039511188784">"Hesabı kaldır"</string>
-    <string name="really_remove_account_message" msgid="3293445755620109578">"Bu hesabı gerçekten kaldırmak istiyor musunuz? Bunu kaldırmak, bu hesaba ait tüm mesajları, kişileri ve telefondaki diğer verileri de silecektir. "\n"Devam etmek istiyor musunuz?"</string>
+    <string name="really_remove_account_message" msgid="3293445755620109578">"Bu hesabı gerçekten kaldırmak istiyor musunuz? Bunu kaldırmak, bu hesaba ait tüm mesajları, kişileri ve telefondaki diğer verilerini de silecektir. "\n"Devam etmek istiyor musunuz?"</string>
     <string name="remove_account_failed" msgid="8178924513521241001">"Bu hesap, bazı uygulamalar için gereklidir. Hesabı ancak telefonu varsayılan fabrika ayarlarına geri döndürerek kaldırabilirsiniz (tüm kişisel verileriniz silinir). Bu işlemi Ayarlar uygulamasında, Gizlilik altında gerçekleştirebilirsiniz."</string>
     <string name="provider_label" msgid="6191617139291321517">"Abonelik şart koş"</string>
-    <string name="sync_item_title" msgid="7984962124867021854">"<xliff:g id="AUTHORITY">%s</xliff:g> senkronize et"</string>
+    <string name="sync_item_title" msgid="7984962124867021854">"Senkronize et: <xliff:g id="AUTHORITY">%s</xliff:g>"</string>
     <string name="cant_sync_dialog_title" msgid="3016197392261471761">"Manuel olarak senkronize edilemiyor"</string>
     <string name="cant_sync_dialog_message" msgid="7200115394296632300">"Bu öğe için senkronizasyon şu anda devre dışı bırakılmış durumdadır. Tercihinizi değiştirmek için geçici olarak arka plan verilerini ve otomatik senkronizasyonu açın."</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ec8cb31..1f9e979 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -15,13 +15,13 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"同步供稿"</string>
+    <string name="app_label" msgid="3706018265751197270">"帐户与同步设置"</string>
     <string name="sync_settings" msgid="8707056705985552604">"帐户与同步设置"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"超出删除限制"</string>
     <string name="background_data" msgid="1103557117473896066">"背景数据"</string>
-    <string name="background_data_summary" msgid="9048259510387973822">"应用程序能够随时同步、发送和接收数据"</string>
+    <string name="background_data_summary" msgid="9048259510387973822">"应用程序随时可以同步、发送和接收数据"</string>
     <string name="background_data_dialog_title" msgid="6303755495467986079">"注意事项"</string>
-    <string name="background_data_dialog_message" msgid="8417297954700022363">"禁用背景数据可延长电池寿命并可降低数据使用量。有些应用程序可能仍会使用背景数据连接。"</string>
+    <string name="background_data_dialog_message" msgid="8417297954700022363">"停用背景数据可延长电池使用时间并减少数据使用量。但某些应用程序可能仍会使用背景数据连接。"</string>
     <string name="sync_automatically" msgid="4694735102757960100">"自动同步"</string>
     <string name="sync_automatically_summary" msgid="4598895616781542745">"应用程序自动同步数据"</string>
     <string name="settings_backup" msgid="6114299464740014762">"备份设置"</string>
@@ -37,7 +37,7 @@
     <string name="sync_really_delete" msgid="5456355204562588976">"删除这些项。"</string>
     <string name="sync_undo_deletes" msgid="8695514459839593307">"撤消删除。"</string>
     <string name="sync_do_nothing" msgid="5798755982392201673">"目前不进行任何操作。"</string>
-    <string name="sync_is_failing" msgid="5230237058552433773">"同步现在遇到问题。很快将返回此操作。"</string>
+    <string name="sync_is_failing" msgid="5230237058552433773">"同步目前发生问题。将在短时间内恢复。"</string>
     <string name="sync_plug" msgid="7020432439004167162"><font fgcolor="#ffffffff">"欢迎使用 Google sync！"</font>" "\n"Google 的这款同步数据工具可以让您从任何地方访问您的联系人、约会以及更多信息。"</string>
     <string name="header_application_sync_settings" msgid="5263025067167527890">"应用程序同步设置"</string>
     <string name="header_manage_accounts" msgid="381956296995298770">"管理帐户"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5b50283..903d0c9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="569000083919693222">"同步處理資訊提供"</string>
+    <string name="app_label" msgid="3706018265751197270">"帳戶與同步處理設定"</string>
     <string name="sync_settings" msgid="8707056705985552604">"帳戶與同步處理設定"</string>
     <string name="sync_too_many_deletes" msgid="1621369057980827097">"達到刪除上限"</string>
     <string name="background_data" msgid="1103557117473896066">"背景資料"</string>
diff --git a/src/com/android/settings/AddAccountSettings.java b/src/com/android/settings/AddAccountSettings.java
index 564f4c7..f87ef7c 100644
--- a/src/com/android/settings/AddAccountSettings.java
+++ b/src/com/android/settings/AddAccountSettings.java
@@ -70,7 +70,7 @@ public class AddAccountSettings extends AccountPreferenceBase {
             // then include them all.
             ArrayList<String> accountAuths = getAuthoritiesForAccountType(accountType);
             boolean addAccountPref = true;
-            if (mAuthorities != null && mAuthorities.length > 0) {
+            if (mAuthorities != null && mAuthorities.length > 0 && accountAuths != null) {
                 addAccountPref = false;
                 for (int k = 0; k < mAuthorities.length; k++) {
                     if (accountAuths.contains(mAuthorities[k])) {
diff --git a/src/com/android/settings/ManageAccountsSettings.java b/src/com/android/settings/ManageAccountsSettings.java
index 7b672f1..b1f1077 100644
--- a/src/com/android/settings/ManageAccountsSettings.java
+++ b/src/com/android/settings/ManageAccountsSettings.java
@@ -225,7 +225,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase implements Vie
             final ArrayList<String> auths = getAuthoritiesForAccountType(account.type);
 
             boolean showAccount = true;
-            if (mAuthorities != null) {
+            if (mAuthorities != null && auths != null) {
                 showAccount = false;
                 for (String requestedAuthority : mAuthorities) {
                     if (auths.contains(requestedAuthority)) {