From ddc69f42482cf991562052c24d95a018fbce8c61 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Mon, 30 Nov 2009 11:35:56 -0800
Subject: [PATCH] Import revised translations.  DO NOT MERGE

---
 res/values-es/strings.xml |  6 +++---
 res/values-fr/strings.xml | 14 +++++++-------
 res/values-ru/strings.xml |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 69f6874cd..a0a28b717 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -85,7 +85,7 @@
     <string name="debug_enable_exchange_logging_label" msgid="8054457784052573080">"¿Deseas activar el acceso del analizador de Exchange? (sumamente detallado)"</string>
     <string name="debug_enable_exchange_file_logging_label" msgid="2264994303719050729">"¿Deseas habilitar el intercambio de registros de la tarjeta SD?"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Cuentas"</string>
-    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Combinación de recibidos"</string>
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Bandeja de entrada combinada"</string>
     <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"No leídos"</string>
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Destacados"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Borradores"</string>
@@ -113,7 +113,7 @@
     <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Guardar"</string>
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"El archivo adjunto se ha guardado en una tarjeta SD como <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"No es posible guardar el archivo adjunto en la tarjeta SD."</string>
-    <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Selecciona \"Mostrar imágenes\" para visualizar las imágenes incrustadas."</string>
+    <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Selecciona \"Mostrar imágenes\" para visualizar las imágenes insertadas."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imágenes"</string>
     <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Obteniendo archivo adjunto"</string>
     <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Extrayendo archivo adjunto <xliff:g id="FILENAME">%s</xliff:g>"</string>
@@ -140,7 +140,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando la configuración del servidor de salida..."</string>
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"Cancelando..."</string>
     <string name="account_setup_names_title" msgid="8875040521875381849">"Configurar correo electrónico"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Tu cuenta ya está configurada y el correo electrónico está por llegar."</string>
+    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Tu cuenta ya está configurada y en breve verás tu correo."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asignar un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (aparece en los mensajes salientes)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Añadir una cuenta de correo electrónico nueva"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 598e096ef..90c1ef426 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -123,8 +123,8 @@
     <string name="add_contact_dlg_title" msgid="7424641029188006580">"Ajouter un contact"</string>
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Ajouter \"<xliff:g id="EMAIL">%s</xliff:g>\" aux contacts"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Impossible d\'afficher cette pièce jointe."</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurer la messagerie électronique"</string>
-    <string name="accounts_welcome" msgid="5901437782383439370">"Configurez des e-mails pour la plupart des comptes en à peine quelques minutes."</string>
+    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configuration de votre messagerie"</string>
+    <string name="accounts_welcome" msgid="5901437782383439370">"Configurez votre messagerie en quelques étapes simples. Compatible avec la plupart des comptes."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Configurez un compte Exchange en un clin d\'œil."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
@@ -139,9 +139,9 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Vérification des paramètres de serveur entrant…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Vérification des paramètres de serveur sortant…"</string>
     <string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"Annulation..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Configurer la messagerie électronique"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Votre compte est configuré et votre messagerie est active !"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Donner un nom à ce compte (facultatif)"</string>
+    <string name="account_setup_names_title" msgid="8875040521875381849">"Configuration de votre messagerie"</string>
+    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Votre compte est configuré et votre messagerie a été activée !"</string>
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nom du compte (facultatif)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Votre nom (affiché sur les messages sortants)"</string>
     <string name="account_setup_account_type_title" msgid="6645576356752495504">"Ajouter un compte de messagerie"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quel type de compte s\'agit-il ?"</string>
@@ -214,7 +214,7 @@
     <string name="account_settings_title_fmt" msgid="1702058877284382340">"Paramètres généraux"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Compte par défaut"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Par défaut, envoyer les e-mails avec ce compte"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifications d\'e-mails"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifications"</string>
     <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Fréquence de synchronisation, notifications, etc."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Afficher notification dans barre d\'état lors de la réception d\'un e-mail"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Fréquence de vérification"</string>
@@ -228,7 +228,7 @@
     <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synchroniser également les contacts issus de ce compte"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibreur"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrer à la réception d\'un e-mail"</string>
-    <string name="account_settings_ringtone" msgid="7922187231467500404">"Sélectionner la sonnerie"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Sonnerie"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Paramètres du serveur"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Supprimer le compte"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" va être supprimé de votre messagerie."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 52ace470b..38568aeb5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -52,7 +52,7 @@
     <string name="accounts_action" msgid="901105887272231493">"Аккаунты"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Отметить как прочитанные"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Отметить как непрочитанное"</string>
-    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Добавить копию или скрытую копию"</string>
+    <string name="add_cc_bcc_action" msgid="5569074812077509737">"Добавить копию"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Добавить приложение"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Настройки дампа"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Выбрать приложение"</string>