Import revised translations. DO NOT MERGE
Change-Id: I36b6e4c093a082a08f506da2c1cb7dcee0f4c66c
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index cd2a9c5..d77eba6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -17,7 +17,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="read_attachment_label" msgid="1300286008047638726">"ανάγνωση επισυνάψεων μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
<string name="read_attachment_desc" msgid="7594746717616308643">"Επιτρέπει σε αυτήν την εφαρμογή την ανάγνωση των επισυνάψεων των μηνυμάτων ηλεκτρονικού ταχυδρομείου."</string>
- <string name="app_name" msgid="5815426892327290362">"Ηλεκτρονικό ταχυδρομείο"</string>
+ <string name="app_name" msgid="5815426892327290362">"Email"</string>
<string name="accounts_title" msgid="7249537449234892146">"Οι λογαριασμοί σας"</string>
<string name="compose_title" msgid="427986915662706899">"Σύνθεση"</string>
<string name="debug_title" msgid="5175710493691536719">"Εντοπισμός σφαλμάτων"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index abfddcc..177a93d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -144,7 +144,7 @@
<string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-tjener"</string>
<string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
<string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhetstype"</string>
- <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Krev pålogging."</string>
+ <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Krev pålogging"</string>
<string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brukernavn"</string>
<string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passord"</string>
<string name="account_setup_exchange_title" msgid="247933841122558059">"Innstillinger for Exchange Server"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4b63df1..16b5308 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -21,7 +21,7 @@
<string name="accounts_title" msgid="7249537449234892146">"Suas contas"</string>
<string name="compose_title" msgid="427986915662706899">"Escrever"</string>
<string name="debug_title" msgid="5175710493691536719">"Depurar"</string>
- <string name="next_action" msgid="3931301986364184415">"Próximo"</string>
+ <string name="next_action" msgid="3931301986364184415">"Avançar"</string>
<string name="okay_action" msgid="8365197396795675617">"OK"</string>
<string name="cancel_action" msgid="6967435583794021865">"Cancelar"</string>
<string name="send_action" msgid="1729766205562446418">"Enviar"</string>
@@ -67,7 +67,7 @@
<string name="special_mailbox_display_name_drafts" msgid="5919687165402808119">"Rascunhos"</string>
<string name="special_mailbox_display_name_trash" msgid="7042673673630272056">"Lixeira"</string>
<string name="special_mailbox_display_name_sent" msgid="3952772015118466625">"E-mails enviados"</string>
- <string name="accounts_welcome" msgid="7365378109109495588">"Bem-vindo à configuração do Email! "\n\n"Use qualquer conta de e-mail com o Email. "\n\n"As contas de e-mail mais populares podem ser configuradas em duas etapas!"</string>
+ <string name="accounts_welcome" msgid="7365378109109495588">"Bem-vindo à configuração do E-mail! "\n\n"Use qualquer conta de e-mail com o E-mail. "\n\n"As contas de e-mail mais populares podem ser configuradas em duas etapas!"</string>
<string name="debug_version_fmt" msgid="6160213145745376955">"Versão: <xliff:g id="VERSION">%s</xliff:g>"</string>
<string name="debug_enable_debug_logging_label" msgid="2715742416050944774">"Permitir registro de depuração extra?"</string>
<string name="debug_enable_sensitive_logging_label" msgid="9010809457943556126">"Permitir registro de depuração de informações pessoais? (Pode mostrar as senhas registradas.)"</string>
@@ -114,7 +114,7 @@
<string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verificando as configurações de saída do servidor..."</string>
<string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"Cancelando..."</string>
<string name="account_setup_names_title" msgid="8875040521875381849">"Configurar e-mail"</string>
- <string name="account_setup_names_instructions" msgid="2880279273965835007">"Sua conta está configurada e o e-mail está a caminho!"</string>
+ <string name="account_setup_names_instructions" msgid="2880279273965835007">"Sua conta está configurada e os e-mails começarão a chegar!"</string>
<string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar nome a esta conta (opcional)"</string>
<string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Seu nome (exibido nas mensagens enviadas)"</string>
<string name="account_setup_account_type_title" msgid="6645576356752495504">"Adicionar nova conta de e-mail"</string>
@@ -137,7 +137,7 @@
<string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Excluir e-mail do servidor"</string>
<string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
<string name="account_setup_incoming_delete_policy_7days_label" msgid="5091246829453195520">"Após 7 dias"</string>
- <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando eu excluir da Caixa de entrada"</string>
+ <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando excluir da Caixa de entrada"</string>
<string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixo do caminho IMAP"</string>
<string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
<string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configurações de saída do servidor"</string>
@@ -153,7 +153,7 @@
<string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Insira o domínio aqui"</string>
<string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Usar conexão segura (SSL)"</string>
<string name="account_setup_options_title" msgid="8995162193118880993">"Opções da conta"</string>
- <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frequência de verificação de e-mail"</string>
+ <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Frequência de verificação"</string>
<string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
<string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automático (envio)"</string>
<string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"A cada 5 minutos"</string>
@@ -188,8 +188,8 @@
<string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
<string name="account_settings_notify_summary" msgid="6609224590300639887">"Notificar na barra de status quando chegar um e-mail"</string>
<string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Frequência de verificação de e-mail"</string>
- <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configurações de entrada"</string>
- <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configurações de saída"</string>
+ <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configurações entrada"</string>
+ <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configurações saída"</string>
<string name="account_settings_add_account_label" msgid="63971622405360050">"Adicionar outra conta"</string>
<string name="account_settings_description_label" msgid="8894815221204511715">"Nome da conta"</string>
<string name="account_settings_name_label" msgid="8186406122590008449">"Seu nome"</string>
@@ -200,8 +200,8 @@
<string name="account_settings_servers" msgid="4925493817981624242">"Configurações do servidor"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
<string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" será removida deste e-mail."</string>
- <string name="provider_note_yahoo" msgid="8762024183024261236">"Alguns tipos de contas de email do Yahoo! não suportam o acesso à caixa de email. Se você tiver problemas ao conectar, visite yahoo.com para obter mais informações."</string>
- <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Antes de configurar esta conta de e-mail, visite o site do Yahoo! e habilite o acesso de email POP3 para esta conta."</string>
- <string name="provider_note_live" msgid="3584841823811425060">"Somente algumas contas \"Plus\" incluem o acesso POP permitindo que este programa seja conectado. Se não for possível fazer login com seu endereço de e-mail e senha corretos, você talvez não tenha uma conta \"Plus\" paga. Inicie o navegador da web para acessar estas contas de email."</string>
- <string name="provider_note_t_online" msgid="1973701903400232774">"Antes de configurar essa conta de e-mail, visite o site T-Online e crie uma senha para acessar email POP3."</string>
+ <string name="provider_note_yahoo" msgid="8762024183024261236">"Alguns tipos de contas de e-mail do Yahoo! não suportam o acesso à caixa de e-mail. Se você tiver problemas ao conectar, visite yahoo.com para obter mais informações."</string>
+ <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Antes de configurar esta conta de e-mail, visite o site do Yahoo! e habilite o acesso de e-mail POP3 para esta conta."</string>
+ <string name="provider_note_live" msgid="3584841823811425060">"Somente algumas contas \"Plus\" incluem o acesso POP permitindo que este programa seja conectado. Se não for possível fazer login com seu endereço de e-mail e senha corretos, você talvez não tenha uma conta \"Plus\" paga. Inicie o navegador da web para acessar estas contas de e-mail."</string>
+ <string name="provider_note_t_online" msgid="1973701903400232774">"Antes de configurar essa conta de e-mail, visite o site T-Online e crie uma senha para acessar e-mail POP3."</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 0fae5da..4b7592c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -42,7 +42,7 @@
<string name="accounts_action" msgid="901105887272231493">"Konton"</string>
<string name="mark_as_read_action" msgid="5031651846998842419">"Markera som läst"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Markera som oläst"</string>
- <string name="add_cc_bcc_action" msgid="5569074812077509737">"Lägg till kopia/heml. kop."</string>
+ <string name="add_cc_bcc_action" msgid="5569074812077509737">"Kopia/hemlig kopia"</string>
<string name="add_attachment_action" msgid="2696013743130573897">"Lägg till bilaga"</string>
<string name="dump_settings_action" msgid="4478192525236169829">"Inställningar för dumpar"</string>
<string name="choose_attachment_dialog_title" msgid="81937507117528954">"Välj bilaga"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d6a1086..1108787 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -66,7 +66,7 @@
<string name="special_mailbox_display_name_outbox" msgid="1884580655148530989">"Giden Kutusu"</string>
<string name="special_mailbox_display_name_drafts" msgid="5919687165402808119">"Taslaklar"</string>
<string name="special_mailbox_display_name_trash" msgid="7042673673630272056">"Çöp Kutusu"</string>
- <string name="special_mailbox_display_name_sent" msgid="3952772015118466625">"Gönderildi"</string>
+ <string name="special_mailbox_display_name_sent" msgid="3952772015118466625">"Gönderilenler"</string>
<string name="accounts_welcome" msgid="7365378109109495588">"E-posta kurulumuna hoş geldiniz!"\n\n"E-posta ile herhangi bir e-posta hesabını kullanın."\n\n"Birçok popüler e-posta hesabı 2 adımda ayarlanabilir!"</string>
<string name="debug_version_fmt" msgid="6160213145745376955">"Sürüm: <xliff:g id="VERSION">%s</xliff:g>"</string>
<string name="debug_enable_debug_logging_label" msgid="2715742416050944774">"Ekstra hata ayıklama kaydı etkinleştirilsin mi?"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4f16718..fae19bb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -103,7 +103,7 @@
<string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"将“<xliff:g id="EMAIL">%s</xliff:g>”添加到联系人"</string>
<string name="message_view_display_attachment_toast" msgid="6096315816776330821">"该附件无法显示。"</string>
<string name="account_setup_basics_title" msgid="3969856368228940980">"设置电子邮件"</string>
- <string name="account_setup_basics_instructions" msgid="3580847367201161979">"输入您的帐户电子邮件地址："</string>
+ <string name="account_setup_basics_instructions" msgid="3580847367201161979">"输入您的帐户的电子邮件地址："</string>
<string name="account_setup_basics_email_hint" msgid="7414269319207261120">"电子邮件地址"</string>
<string name="account_setup_basics_password_hint" msgid="410210049040536870">"密码"</string>
<string name="account_setup_basics_default_label" msgid="5924790142029806711">"默认情况下从此帐户发送电子邮件。"</string>
@@ -114,8 +114,8 @@
<string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在检查外发服务器设置..."</string>
<string name="account_setup_check_settings_canceling_msg" msgid="5077315503721883906">"正在取消..."</string>
<string name="account_setup_names_title" msgid="8875040521875381849">"设置电子邮件"</string>
- <string name="account_setup_names_instructions" msgid="2880279273965835007">"您的帐户已设置，可以使用电子邮件了！"</string>
- <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"为此帐户创建名称（可选）"</string>
+ <string name="account_setup_names_instructions" msgid="2880279273965835007">"您已设置帐户，可以使用电子邮件程序了！"</string>
+ <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"指定该帐户的名称（可选）"</string>
<string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名（显示在外发邮件上）"</string>
<string name="account_setup_account_type_title" msgid="6645576356752495504">"添加新电子邮件帐户"</string>
<string name="account_setup_account_type_instructions" msgid="114515540798408760">"这是什么类型的帐户？"</string>
@@ -163,7 +163,7 @@
<string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"每小时"</string>
<string name="account_setup_options_default_label" msgid="8869166381331276697">"默认情况下从此帐户发送电子邮件。"</string>
<string name="account_setup_options_notify_label" msgid="1247525794828820038">"收到电子邮件时通知我。"</string>
- <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"设置无法完成"</string>
+ <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"无法完成设置"</string>
<string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"要同步的数量"</string>
<string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"一天"</string>
<string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"三天"</string>
@@ -184,13 +184,13 @@
<string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"编辑详情"</string>
<string name="account_settings_title_fmt" msgid="1702058877284382340">"常规设置"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"默认帐户"</string>
- <string name="account_settings_default_summary" msgid="1531901438624688482">"默认情况下从此帐户发送电子邮件"</string>
+ <string name="account_settings_default_summary" msgid="1531901438624688482">"默认情况下用此帐户发送电子邮件"</string>
<string name="account_settings_notify_label" msgid="1630001017303007974">"电子邮件通知"</string>
<string name="account_settings_notify_summary" msgid="6609224590300639887">"收到电子邮件时在状态栏中显示通知"</string>
<string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"电子邮件检查频率"</string>
<string name="account_settings_incoming_label" msgid="7858928031806297542">"接收设置"</string>
<string name="account_settings_outgoing_label" msgid="4464829249980026745">"外发设置"</string>
- <string name="account_settings_add_account_label" msgid="63971622405360050">"添加另一个帐户"</string>
+ <string name="account_settings_add_account_label" msgid="63971622405360050">"添加其他帐户"</string>
<string name="account_settings_description_label" msgid="8894815221204511715">"帐户名称"</string>
<string name="account_settings_name_label" msgid="8186406122590008449">"您的姓名"</string>
<string name="account_settings_notifications" msgid="1042620094281375043">"通知设置"</string>
