From 273c32b363dafdf8f1054a6d264af094ee4024b3 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Thu, 27 Oct 2011 09:52:15 -0700
Subject: [PATCH] Import revised translations.  DO NOT MERGE

Change-Id: I86833a451b695da00f03444a56b203fb9a1486ad
---
 res/values-da/uploader.xml    | 10 +++++-----
 res/values-de/strings.xml     |  4 ++--
 res/values-es/strings.xml     |  4 ++--
 res/values-pt/strings.xml     |  2 +-
 res/values-zh-rTW/strings.xml |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/values-da/uploader.xml b/res/values-da/uploader.xml
index cc8f0e854..c34847dcd 100644
--- a/res/values-da/uploader.xml
+++ b/res/values-da/uploader.xml
@@ -3,8 +3,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Øjeblikkelig upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album for Øjeblikkelig upload"</string>
+    <string name="application_name" msgid="7812006268714926951">"Øjeblikkelig Upload"</string>
+    <string name="picasa_default_destination" msgid="2052406684123992574">"Album for Øjeblikkelig Upload"</string>
     <string name="summary_title_uploading" msgid="3357617474017589370">"uploader"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Afsluttet"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Midlertidigt standset"</string>
@@ -76,10 +76,10 @@
     <string name="manager_sync_all" msgid="5207146576940014345">"Synkroniser alle"</string>
     <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Sidste synkronisering:"\n"%1$s"\n"%2$s"</string>
     <string name="finished_empty" msgid="689924777356099393">"Listen over afsluttede punkter er tom."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Øjeblikkelig upload"</string>
+    <string name="notify_uploads" msgid="8593982942665493037">"Øjeblikkelig Upload"</string>
     <string name="notify_resolved" msgid="8111194870485485674">"Uploads er afsluttet"</string>
     <string name="notify_paused" msgid="3999817913227671338">"Uploads er midlertidigt standset"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Øjeblikkelig upload er ikke aktiveret endnu"</string>
+    <string name="notify_activation_reminder" msgid="1639234651193843030">"Øjeblikkelig Upload er ikke aktiveret endnu"</string>
     <string name="dialog_first_wifi" msgid="4318047428346248089">"Store filer vil kun uploades via en Wi-Fi-forbindelse."</string>
     <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Søger efter filer..."</string>
     <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Forbereder <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> billeder og <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videoer til upload..."</string>
@@ -114,7 +114,7 @@
     <string name="pause_state_need_media" msgid="3849758767808306320">"midlertidigt standset – SD-kort ikke tilgængeligt"</string>
     <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-kortet er ikke tilgængeligt"</string>
     <string name="preference_plus_title" msgid="8505499389432915393">"Indst. for Øjeb. upload"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Øjeblikkelig upload"</string>
+    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Øjeblikkelig Upload"</string>
     <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Upload automatisk nye billeder og videoer til et privat album på nettet"</string>
     <string name="preference_plus_upload_status" msgid="7925576302519589779">"Uploadstatus"</string>
     <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avanceret"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e908ca7bb..535cab68e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -381,7 +381,7 @@
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Datenverbrauch"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Kurzantwort bearbeiten"</string>
     <string name="save_action" msgid="1988862706623227093">"Speichern"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kontakte synchr"</string>
+    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kontakte synchr."</string>
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Kontakte dieses Kontos synchronisieren"</string>
     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Kalender synchronisieren"</string>
     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Kalender dieses Kontos synchronisieren"</string>
@@ -390,7 +390,7 @@
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Bei E-Mail-Eingang zusätzlich vibrieren"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Immer"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Nur im Lautlosmodus"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Nur im Lautlos-Modus"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nie"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Klingelton auswählen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b3b505656..08e775bc6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -337,7 +337,7 @@
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Has introducido una dirección de servidor incorrecta o el servidor requiere una versión de protocolo no compatible con la aplicación Correo."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"No tienes permiso para hacer la sincronización con este servidor. Para obtener más información, ponte en contacto con el administrador del servidor."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administración de seguridad remota"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Es necesario que permitas que el servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota algunas funciones de seguridad de tu dispositivo Android. ¿Deseas terminar de configurar esta cuenta?"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Es necesario que permitas que el servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota algunas funciones de seguridad de tu dispositivo Android. ¿Quieres terminar de configurar esta cuenta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Este servidor requiere funciones de seguridad que no son compatibles con tu dispositivo Android (por ejemplo: <xliff:g id="ERROR">%s</xliff:g>)."</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"No puedes modificar el nombre de usuario de una cuenta. Para añadir una cuenta con otro nombre de usuario, toca Añadir cuenta."</string>
     <string name="disable_admin_warning" msgid="6196985268695592382">"ADVERTENCIA: si desactivas el permiso de la aplicación Correo para administrar tu dispositivo, se eliminarán todas las cuentas de esta aplicación que requieran su uso, así como las direcciones de correo electrónico, los contactos, los eventos de calendario y otro tipo de datos."</string>
@@ -376,7 +376,7 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Firma"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Respuestas rápidas"</string>
     <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Edita texto que suelas usar en mensajes de correo electrónico."</string>
-    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Añadir texto a los mensajes que envíes"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Añadir texto al final de los mensajes enviados"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Ajustes de notificaciones"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Uso de datos"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editar respuesta rápida"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 304421e07..d65a955aa 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -31,7 +31,7 @@
     <string name="reply_action" msgid="4262472229221507619">"Responder"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Resp p/ todos"</string>
     <string name="delete_action" msgid="8421026208288857155">"Excluir"</string>
-    <string name="forward_action" msgid="669174181042344116">"Avançar"</string>
+    <string name="forward_action" msgid="669174181042344116">"Encaminhar"</string>
     <string name="favorite_action" msgid="4664259801498253756">"Marcar com uma estrela"</string>
     <string name="done_action" msgid="7497990549515580249">"Concluído"</string>
     <string name="create_action" msgid="3062715563215392251">"Criar nova"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ebdba44ad..f6f79d906 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -29,7 +29,7 @@
     <string name="previous_action" msgid="5181616311579820981">"上一步"</string>
     <string name="send_action" msgid="1729766205562446418">"傳送"</string>
     <string name="reply_action" msgid="4262472229221507619">"回覆"</string>
-    <string name="reply_all_action" msgid="6192179825726332152">"全部回覆"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"回覆所有人"</string>
     <string name="delete_action" msgid="8421026208288857155">"刪除"</string>
     <string name="forward_action" msgid="669174181042344116">"轉寄"</string>
     <string name="favorite_action" msgid="4664259801498253756">"加上星號"</string>
@@ -445,7 +445,7 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"最大"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"回覆所有人"</string>
-    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"將「回覆所有人」設為預設的回信方式"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"將「回覆所有人」做為預設的回信方式"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"還原「顯示圖片」的預設值"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"還原所有寄件者的預設值 (不要自動顯示圖片)"</string>
     <string name="trusted_senders_cleared" msgid="8079053907862270420">"「顯示圖片」已清除。"</string>