merge cupcake into donut
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d21c292..a952b11 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,7 +21,7 @@
<string name="background_data_summary">"Verwendung von Hintergrunddaten aktivieren"</string>
<string name="background_data_dialog_title">"Achtung"</string>
<string name="background_data_dialog_message">"Durch die Deaktivierung von Hintergrunddaten kann Strom gespart und die Verwendung von Daten verringert werden. Einige Anwendungen nutzen die Hintergrunddatenverbindung möglicherweise weiterhin."</string>
- <string name="sync_automatically">"Autom. synchronisieren"</string>
+ <string name="sync_automatically">"Autom. Synchronisierung"</string>
<string name="sync_automatically_summary">"Daten automatisch synchronisieren"</string>
<string name="sync_menu_sync_now">"Jetzt synchronisieren"</string>
<string name="sync_menu_sync_cancel">"Synchronisierung abbrechen"</string>
@@ -36,6 +36,6 @@
<string name="sync_do_nothing">"Im Moment nichts unternehmen"</string>
<string name="sync_is_failing">"Bei der Synchronisierung treten derzeit Probleme auf. Sie wird in Kürze fortgesetzt."</string>
<string name="sync_plug"><font fgcolor="#ffffffff">"Willkommen bei Google Sync!"</font>\n"Mit dieser Funktion von Google können Sie Ihre Daten synchronisieren, um auf Ihre Kontakte, Termine und vieles mehr zuzugreifen - wo immer Sie auch sind!"</string>
- <string name="header_application_sync_settings">"Anwendungssynchronisierung"</string>
+ <string name="header_application_sync_settings">"Einstellungen für die Anwendungssynchronisierung"</string>
<string name="header_general_sync_settings">"Allgemeine Synchronisierungseinstellungen"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..9513c59
--- /dev/null
+++ b/res/values-es-rUS/strings.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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="sync_settings">"Sincronización de datos"</string>
+ <string name="sync_too_many_deletes">"Eliminar el límite excedido"</string>
+ <string name="background_data">"Datos de fondo"</string>
+ <string name="background_data_summary">"Activar el uso de datos de fondo"</string>
+ <string name="background_data_dialog_title">"Atención"</string>
+ <string name="background_data_dialog_message">"Al desactivar los datos de fondo, se ahorra 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">"Sincronización automática"</string>
+ <string name="sync_automatically_summary">"Datos sincronizados automáticamente"</string>
+ <string name="sync_menu_sync_now">"Sincronizar ahora"</string>
+ <string name="sync_menu_sync_cancel">"Cancelar sincronización"</string>
+ <string name="sync_one_time_sync">"Selecciona sincronización ahora<xliff:g id="LAST_SYNC_TIME">
+%1$s</xliff:g>"</string>
+ <string name="sync_gmail">"Gmail"</string>
+ <string name="sync_calendar">"Calendario"</string>
+ <string name="sync_contacts">"Contactos"</string>
+ <string name="sync_too_many_deletes_desc">"Existen <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> artículos eliminados para <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, cuenta <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. ¿Qué te gustaría hacer?"</string>
+ <string name="sync_really_delete">"Eliminar artículos."</string>
+ <string name="sync_undo_deletes">"Deshacer eliminaciones."</string>
+ <string name="sync_do_nothing">"No hagas nada por el momento."</string>
+ <string name="sync_is_failing">"En este momento la sincronización experimenta problemas. Volverá en breve."</string>
+ <string name="sync_plug"><font fgcolor="#ffffffff">"¡Bienvenido a\nGoogle Sync!"</font>" "\n"Un método de Google que sincroniza datos para permitir el acceso a tus contactos, citas y mucho más desde cualquier lugar en donde estés."</string>
+ <string name="header_application_sync_settings">"Configuración de sincronización de la aplicación"</string>
+ <string name="header_general_sync_settings">"Configuración de sincronización general"</string>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 99bbe4e..cad4250 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -28,7 +28,7 @@
<string name="sync_one_time_sync">"Synchroniser maintenant <xliff:g id="LAST_SYNC_TIME">
%1$s</xliff:g>"</string>
<string name="sync_gmail">"Gmail"</string>
- <string name="sync_calendar">"Agenda"</string>
+ <string name="sync_calendar">"Google Agenda"</string>
<string name="sync_contacts">"Contacts"</string>
<string name="sync_too_many_deletes_desc">"Il y a <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> éléments supprimés pour <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, pour le compte <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Que souhaitez-vous faire ?"</string>
<string name="sync_really_delete">"Supprimer les éléments"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8140e7f..8e21338 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -21,7 +21,7 @@
<string name="background_data_summary">"Attiva utilizzo dei dati in background"</string>
<string name="background_data_dialog_title">"Attenzione"</string>
<string name="background_data_dialog_message">"La disattivazione dei dati in background consente di ridurre il consumo delle batterie e l\'utilizzo dei dati. Alcune applicazioni potrebbero utilizzare comunque la connessione dati in background."</string>
- <string name="sync_automatically">"Sincronizz. automatica"</string>
+ <string name="sync_automatically">"Sincronizzazione automatica"</string>
<string name="sync_automatically_summary">"Sincronizza i dati automaticamente"</string>
<string name="sync_menu_sync_now">"Sincronizza ora"</string>
<string name="sync_menu_sync_cancel">"Annulla sincronizzazione"</string>
diff --git a/res/values-mcc234-es-rUS/strings.xml b/res/values-mcc234-es-rUS/strings.xml
new file mode 100644
index 0000000..9d2de72
--- /dev/null
+++ b/res/values-mcc234-es-rUS/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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="sync_gmail">"Google Mail"</string>
+</resources>
diff --git a/res/values-mcc262-es-rUS/strings.xml b/res/values-mcc262-es-rUS/strings.xml
new file mode 100644
index 0000000..9d2de72
--- /dev/null
+++ b/res/values-mcc262-es-rUS/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2009 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="sync_gmail">"Google Mail"</string>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1df2939..3fae7f0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -36,6 +36,6 @@
<string name="sync_do_nothing">"Nu niets doen."</string>
<string name="sync_is_failing">"Er zijn momenteel problemen met de synchronisatie. Synchronisatie wordt snel opnieuw uitgevoerd."</string>
<string name="sync_plug"><font fgcolor="#ffffffff">"Welkom bij Google Sync!"</font>" "\n"Een benadering van Google voor de synchronisatie van gegevens, zodat u altijd en overal toegang heeft tot uw contacten, afspraken en nog veel meer."</string>
- <string name="header_application_sync_settings">"Synchronisatie-instellingen van de toepassing"</string>
+ <string name="header_application_sync_settings">"Synchronatie-instellingen van de toepassing"</string>
<string name="header_general_sync_settings">"Algemene instellingen voor synchronisatie"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 872f301..b930aef 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -21,11 +21,11 @@
<string name="background_data_summary">"Włącz używanie danych w tle"</string>
<string name="background_data_dialog_title">"Uwaga"</string>
<string name="background_data_dialog_message">"Wyłączenie danych w tle umożliwia oszczędzanie baterii i zmniejsza wykorzystanie danych. Mimo to niektóre aplikacje mogą nadal korzystać z połączenia transmisji danych w tle."</string>
- <string name="sync_automatically">"Autosynchronizacja"</string>
+ <string name="sync_automatically">"Automatyczna synchronizacja"</string>
<string name="sync_automatically_summary">"Automatycznie synchronizuj dane"</string>
<string name="sync_menu_sync_now">"Synchronizuj teraz"</string>
<string name="sync_menu_sync_cancel">"Anuluj synchronizację"</string>
- <string name="sync_one_time_sync">"Wybierz, aby zsynchronizować teraz<xliff:g id="LAST_SYNC_TIME">
+ <string name="sync_one_time_sync">"Wybierz elementy do zsynchronizowania teraz<xliff:g id="LAST_SYNC_TIME">
%1$s</xliff:g>"</string>
<string name="sync_gmail">"Gmail"</string>
<string name="sync_calendar">"Kalendarz"</string>
