am d5fdf404: Merge "Fix STARTTLS handshake error in Email\'s SmtpSender class"
* commit 'd5fdf40490033bbafbd946e92094b18e931c1a76':
Fix STARTTLS handshake error in Email's SmtpSender class
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a6407a6..8a449c3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -486,6 +486,9 @@
<action
android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
+ <intent-filter>
+ <action android:name="com.android.email.MESSAGE_LIST_DATASET_CHANGED" />
+ </intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/widget_info" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 32d1ee6..18e47e5 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -451,7 +451,7 @@
<string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Wys prente\" uitgevee."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Wag vir sinkronisasie"</string>
- <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Jou e-pos sal binnekort verskyn."</string>
+ <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Jou e-posadres sal binnekort verskyn."</string>
<string name="widget_other_views" msgid="4988574907386539499">"Raak ikoon om te verander."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Gekombineerde inkassie"</string>
<string name="widget_unread" msgid="4404711399009077833">"Ongelees"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 07c399f..1627d80 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -119,7 +119,7 @@
<item quantity="other" msgid="7901361399231876038">"Počet vybraných položek: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
</plurals>
<string name="message_list_no_messages" msgid="7846910091922523867">"Žádné zprávy"</string>
- <string name="message_compose_to_hint" msgid="2891895306418177013">"Do"</string>
+ <string name="message_compose_to_hint" msgid="2891895306418177013">"Komu"</string>
<string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopie"</string>
<string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skrytá kopie"</string>
<string name="message_compose_subject_hint" msgid="6993487234024160782">"Předmět"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f74748a..2856a6f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -40,8 +40,8 @@
<string name="discard_action" msgid="6532206074859505968">"Kassér"</string>
<string name="save_draft_action" msgid="6413714270991417223">"Gem kladde"</string>
<string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Indsæt hurtigt svar"</string>
- <string name="read_action" msgid="4701484794504781686">"Marker som læst"</string>
- <string name="unread_action" msgid="6280399049357552826">"Marker som ulæst"</string>
+ <string name="read_action" msgid="4701484794504781686">"Markér som læst"</string>
+ <string name="unread_action" msgid="6280399049357552826">"Markér som ulæst"</string>
<string name="set_star_action" msgid="4660317166196258160">"Tilføj stjerne"</string>
<string name="remove_star_action" msgid="6689770999647007163">"Fjern stjerne"</string>
<string name="refresh_action" msgid="5951383001436708175">"Opdater"</string>
@@ -51,7 +51,7 @@
<string name="account_settings_action" msgid="4494079183315085171">"Indstillinger for konto"</string>
<string name="settings_action" msgid="6334807007967459412">"Indstillinger"</string>
<string name="mailbox_settings_action" msgid="8008375875310554776">"Indstillinger for synkronisering"</string>
- <string name="mark_as_unread_action" msgid="3766298115778767554">"Marker som ulæst"</string>
+ <string name="mark_as_unread_action" msgid="3766298115778767554">"Markér som ulæst"</string>
<string name="move_action" msgid="3059189775933985898">"Flyt"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Tilføj Cc/Bcc"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 531a409..96b6a5d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -460,7 +460,7 @@
<string name="widget_touch_to_configure" msgid="7062039013915225323">"Zum Einrichten berühren."</string>
<string name="widget_no_accounts" msgid="2412482205591224408">"Sie haben noch kein E-Mail-Konto eingerichtet."</string>
<string name="more_than_999" msgid="8704425397397918798">"999+"</string>
- <string name="search_hint" msgid="2200412192574686497">"E-Mail durchsuchen"</string>
+ <string name="search_hint" msgid="2200412192574686497">"In E-Mails suchen"</string>
<string name="search_mailbox_hint" msgid="7854987729678942790">"<xliff:g id="ID_1">%1$s</xliff:g> durchsuchen"</string>
<string name="search_header_text_fmt" msgid="3857004638127418247">"Suchergebnisse für \"<xliff:g id="ID_1">%1$s</xliff:g>\""</string>
<string name="search_slow_warning_title" msgid="2826118321880530239">"Warten auf Ergebnisse"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 20ab33d..69b35ad 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -16,11 +16,11 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="permission_read_attachment_label" msgid="9208086010625033590">"Leer archivos adjuntos de correo electrónico"</string>
+ <string name="permission_read_attachment_label" msgid="9208086010625033590">"Leer archivos adjuntos de correo"</string>
<string name="permission_read_attachment_desc" msgid="6592948507403743153">"Permite a esta aplicación leer los archivos adjuntos de tus correos electrónicos."</string>
- <string name="permission_access_provider_label" msgid="378256653525377586">"Acceder a los datos del proveedor de correo electrónico"</string>
- <string name="permission_access_provider_desc" msgid="2221907862438022705">"Permite que la aplicación acceda a la base de datos de tu correo electrónico, como mensajes recibidos, mensajes enviados, nombres de usuario y contraseñas."</string>
- <string name="app_name" msgid="5815426892327290362">"Correo electrónico"</string>
+ <string name="permission_access_provider_label" msgid="378256653525377586">"Acceder a los datos del proveedor de correo"</string>
+ <string name="permission_access_provider_desc" msgid="2221907862438022705">"Permite que la aplicación acceda a la base de datos de tu correo, como mensajes recibidos, mensajes enviados, nombres de usuario y contraseñas."</string>
+ <string name="app_name" msgid="5815426892327290362">"Correo"</string>
<string name="compose_title" msgid="427986915662706899">"Redactar"</string>
<string name="debug_title" msgid="5175710493691536719">"Depurar"</string>
<string name="next_action" msgid="3931301986364184415">"Siguiente"</string>
@@ -128,13 +128,13 @@
<string name="cc" msgid="7017720927911078193">"CC"</string>
<string name="bcc" msgid="3098643138241111579">"CCO"</string>
<string name="subject_hint" msgid="7253964583324677128">"Asunto"</string>
- <string name="body_hint" msgid="4279864165439577668">"Redactar un correo electrónico"</string>
+ <string name="body_hint" msgid="4279864165439577668">"Redactar un correo"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensaje original --------"\n"Asunto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escribió:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Incluir el texto citado"</string>
<string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
<string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Debes agregar al menos un destinatario."</string>
- <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Algunas direcciones de correo electrónico no son válidas."</string>
+ <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Algunas direcciones de correo no son válidas."</string>
<string name="message_compose_attachment_size" msgid="4401081828287333647">"El archivo es demasiado grande para adjuntarlo."</string>
<string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Insertar respuesta rápida"</string>
<string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> y <xliff:g id="NUMBER">%2$d</xliff:g> otros"</string>
@@ -186,7 +186,7 @@
<string name="attachment_info_wifi_only" msgid="1481120960014563617">"Este archivo adjunto es demasiado grande para descargar en la red para celulares. Puedes descargarlo la próxima vez que te conectes a la red Wi-Fi."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Ninguna de las aplicaciones instaladas puede abrir este archivo adjunto. Prueba descargar una aplicación adecuada de Android Market."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Este archivo adjunto es una aplicación. Para instalarla, debes activar la opción Orígenes desconocidos en Ajustes > Aplicaciones."</string>
- <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Las aplicaciones no se pueden instalar directamente desde el correo electrónico. Primero debes guardar esta aplicación y luego instalarla con la aplicación Descargas."</string>
+ <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Las aplicaciones no se pueden instalar directamente desde el correo. Primero debes guardar esta aplicación y luego instalarla con la aplicación Descargas."</string>
<string name="attachment_not_found" msgid="7155322700141145123">"No se pudo descargar el archivo adjunto."</string>
<string name="message_decode_error" msgid="5016042255170947834">"Se produjo un error al decodificar el mensaje."</string>
<string name="eml_view_title" msgid="8827210108543430336">"Consultando <xliff:g id="FILENAME">%s</xliff:g>"</string>
@@ -205,7 +205,7 @@
<string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"No se ha podido cargar el archivo adjunto \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Abriendo el mensaje…"</string>
<plurals name="message_moved_toast">
- <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensaje trasladado a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
+ <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensaje movido a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
<item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensajes trasladados a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
</plurals>
<string name="forward_download_failed_ticker" msgid="6176608320359303255">"No se pudieron enviar uno o más adjuntos."</string>
@@ -234,23 +234,23 @@
<string name="account_setup_basics_title" msgid="3578333196594678422">"Configuración de la cuenta"</string>
<string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agregar una cuenta de Exchange"</string>
<string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agregar una cuenta de Exchange ActiveSync"</string>
- <string name="account_setup_basics_headline" msgid="6726590205905464015">"Cuenta de correo electrónico"</string>
- <string name="accounts_welcome" msgid="1491126253077950685">"Puedes configurar el correo electrónico de la mayoría de las cuentas en pocos pasos."</string>
+ <string name="account_setup_basics_headline" msgid="6726590205905464015">"Cuenta de correo"</string>
+ <string name="accounts_welcome" msgid="1491126253077950685">"Puedes configurar el correo de la mayoría de las cuentas en pocos pasos."</string>
<string name="accounts_welcome_exchange" msgid="4432917203403596617">"Puedes configurar una cuenta de Exchange en solo unos pasos."</string>
<string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Puedes configurar una cuenta de Exchange ActiveSync en pocos pasos."</string>
- <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Dirección de correo electrónico"</string>
+ <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Dirección de correo"</string>
<string name="account_setup_basics_password_label" msgid="9133549799291519298">"Contraseña"</string>
- <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar mensaje de correo electrónico desde esta cuenta de forma predeterminada."</string>
+ <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar mensaje de correo desde esta cuenta de forma predeterminada."</string>
<string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuración manual"</string>
<string name="account_setup_username_password_toast" msgid="3968270274727947460">"Escribe una dirección de correo y contraseña válidas."</string>
<string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Cuenta duplicada"</string>
<string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Ya estás usando este nombre de usuario para la cuenta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
<string name="account_password_spaces_error" msgid="8928309156658903257">"Esta contraseña comienza o finaliza con uno o más caracteres con espacios. Muchos servidores no son compatibles con caracteres con espacios."</string>
<string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando información de la cuenta..."</string>
- <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando configuración entrante de servidor…"</string>
- <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando configuración saliente de servidor…"</string>
+ <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando configuración del servidor entrante…"</string>
+ <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando configuración del servidor saliente…"</string>
<string name="account_setup_names_title" msgid="8483517350241119291">"Configuración de la cuenta"</string>
- <string name="account_setup_names_headline" msgid="2413440250372658881">"Se ha configurado tu cuenta, ¡y el correo electrónico está en camino!"</string>
+ <string name="account_setup_names_headline" msgid="2413440250372658881">"Se ha configurado tu cuenta, ¡y el correo está en camino!"</string>
<string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asigna un nombre a esta cuenta (opcional)"</string>
<string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (mostrado en mensajes salientes)"</string>
<string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Este campo no puede estar vacío."</string>
@@ -270,10 +270,10 @@
<string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
<string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (aceptar todos los certificados)"</string>
<string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
- <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar correo electrónico del servidor"</string>
+ <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar correo del servidor"</string>
<string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
- <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuando suprimo desde la bandeja de entrada"</string>
- <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"prefijo de ruta IMAP"</string>
+ <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Al eliminarlo desde la bandeja de entrada"</string>
+ <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefijo de ruta IMAP"</string>
<string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
<string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuración de la cuenta"</string>
<string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Configuración del servidor de salida"</string>
@@ -305,14 +305,14 @@
<string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Cada 15 minutos"</string>
<string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Cada 30 minutos"</string>
<string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Cada hora"</string>
- <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar mensaje de correo electrónico desde esta cuenta de forma predeterminada."</string>
- <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notificarme cuando llegue un mensaje de correo electrónico."</string>
+ <string name="account_setup_options_default_label" msgid="8869166381331276697">"Enviar mensaje de correo desde esta cuenta de forma predeterminada."</string>
+ <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notificarme cuando llegue un mensaje de correo."</string>
<string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronizar contactos desde esta cuenta"</string>
<string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincroniza el calendario desde esta cuenta"</string>
- <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar el correo electrónico desde esta cuenta"</string>
+ <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronizar el correo desde esta cuenta"</string>
<string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Descargar los archivos adjuntos automáticamente al conectarte a Wi-Fi"</string>
<string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"No se pudo terminar"</string>
- <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Días para la sincronización"</string>
+ <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Período de sincronización"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automático"</string>
<string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un día"</string>
<string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tres días"</string>
@@ -334,13 +334,13 @@
<string name="account_setup_failed_auth_required" msgid="6799839150250217566">"El servidor no admite los métodos de autenticación."</string>
<string name="account_setup_failed_security" msgid="925820957665764964">"No se pudo establecer conexión con el servidor debido a un error de seguridad."</string>
<string name="account_setup_failed_ioerror" msgid="7802604687451830378">"No se pudo establecer conexión con el servidor."</string>
- <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Ingresaste una dirección de servidor incorrecta o el servidor requiere una versión de protocolo que el correo electrónico no admite."</string>
+ <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Ingresaste una dirección de servidor incorrecta o el servidor requiere una versión de protocolo que el correo no admite."</string>
<string name="account_setup_failed_access_denied" msgid="6835358740050287051">"No tienes permiso para sincronizar con este servidor. Comunícate con el administrador de tu servidor para obtener más información."</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">"El servidor <xliff:g id="SERVER">%s</xliff:g> requiere tu permiso para controlar de forma remota algunas funciones de seguridad en tu dispositivo Android. ¿Deseas finalizar la configuración de esta cuenta?"</string>
+ <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"El servidor <xliff:g id="SERVER">%s</xliff:g> debe controlar de forma remota algunas aplicaciones de seguridad del dispositivo. ¿Deseas finalizar la configuración de esta cuenta?"</string>
<string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Este servidor requiere funciones de seguridad que tu dispositivo Android no admite, incluidas: <xliff:g id="ERROR">%s</xliff:g>"</string>
<string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"No puedes cambiar el nombre de usuario de una cuenta. Para agregar una cuenta con un nombre de usuario distinto, toca Agregar cuenta."</string>
- <string name="disable_admin_warning" msgid="6196985268695592382">"ADVERTENCIA: si desactivas la autoridad de la aplicación de correo electrónico para administrar tu dispositivo, se eliminarán todas las cuentas de correo que la requieran, así como sus mensajes, contactos, eventos de calendario y otros datos."</string>
+ <string name="disable_admin_warning" msgid="6196985268695592382">"ADVERTENCIA: si desactivas la autoridad de la aplicación de correo para administrar tu dispositivo, se eliminarán todas las cuentas de correo que la requieran, así como sus mensajes, contactos, eventos de calendario y otros datos."</string>
<string name="account_security_dialog_title" msgid="430041952584831904">"Actualización de seguridad"</string>
<string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> requiere que actualices tu configuración de seguridad."</string>
<string name="security_notification_ticker_fmt" msgid="1108023476125276507">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requiere que se actualice la configuración de seguridad."</string>
@@ -360,16 +360,16 @@
<string name="account_settings_login_dialog_title" msgid="4024422579146302775">"No se pudo acceder"</string>
<string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g>no es correcta. ¿Deseas actualizarlos ahora?"</string>
<string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
- <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar mensaje de correo electrónico desde esta cuenta de forma predeterminada"</string>
+ <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar mensaje de correo desde esta cuenta de forma predeterminada"</string>
<string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar archivos adjuntos"</string>
<string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descarga automática por Wi-Fi de los adjuntos de msjs. recientes"</string>
- <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo electrónico"</string>
+ <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"Frecuencia de sincronización, notificaciones, etc."</string>
- <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar en la barra de estado cuando llegue un correo electrónico"</string>
+ <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar en la barra de estado cuando llegue un correo"</string>
<string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frecuencia de verificación de bandeja de entrada"</string>
- <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuración entrante"</string>
+ <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuración del servidor entrante"</string>
<string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nombre de usuario, contraseña y otras configuraciones de servidor de entrada"</string>
- <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuración saliente"</string>
+ <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuración del servidor saliente"</string>
<string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nombre de usuario, contraseña y otras configuraciones de servidor de salida"</string>
<string name="account_settings_description_label" msgid="8894815221204511715">"Nombre de la cuenta"</string>
<string name="account_settings_name_label" msgid="8186406122590008449">"Tu nombre"</string>
@@ -386,9 +386,9 @@
<string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronizar calendario"</string>
<string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronizar el calendario de esta cuenta"</string>
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
- <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar el correo electrónico de esta cuenta"</string>
+ <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar el correo de esta cuenta"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un correo electrónico"</string>
+ <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un correo"</string>
<string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
<string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencioso"</string>
<string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
@@ -396,25 +396,25 @@
<string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar tono"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Configuración del servidor"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
- <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" se eliminará de correo electrónico."</string>
+ <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" se eliminará de correo."</string>
<string name="account_settings_category_delete_account" msgid="5128545184407925226">"Eliminar cuenta"</string>
<string name="account_settings_delete_account_label" msgid="4889158717472601718">"Eliminar cuenta"</string>
<string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Opciones de sincronización"</string>
<string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Opciones de sincronización (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
<string name="mailbox_preferences_header" msgid="9077316556563252246">"Configuración de la sincronización"</string>
<string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Verifica la frecuencia"</string>
- <string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"Días para la sincronización"</string>
- <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Cuenta de correo electrónico"</string>
+ <string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"Período de sincronización"</string>
+ <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Cuenta de correo"</string>
<string name="account_shortcut_picker_title" msgid="1039929224016048015">"Seleccionar cuenta"</string>
<string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Selecc. una carpeta"</string>
<string name="toast_account_not_found" msgid="8144242451730692816">"No se encontró la cuenta. Es posible que se haya eliminado."</string>
<string name="toast_mailbox_not_found" msgid="4960014581292378895">"No se encontró la carpeta. Es posible que se haya eliminado."</string>
- <string name="provider_note_live" msgid="2995297671709325333">"Solo algunas cuentas \"Plus\" incluyen el acceso POP, que permite que este programa se conecte. Si no puedes acceder con tu dirección de correo electrónico y contraseña correctas, tal vez no tengas una cuenta \"Plus\" paga. Inicia el navegador web para acceder a estas cuentas de correo."</string>
- <string name="provider_note_t_online" msgid="1630642061431427894">"Para configurar esta cuenta de correo electrónico, accede al sitio web de T-Online y crea una contraseña para acceder al correo electrónico POP3."</string>
+ <string name="provider_note_live" msgid="2995297671709325333">"Solo algunas cuentas \"Plus\" incluyen el acceso POP, que permite que este programa se conecte. Si no puedes acceder con tu dirección de correo y contraseña correctas, tal vez no tengas una cuenta \"Plus\" paga. Inicia el navegador web para acceder a estas cuentas de correo."</string>
+ <string name="provider_note_t_online" msgid="1630642061431427894">"Para configurar esta cuenta de correo, accede al sitio web de T-Online y crea una contraseña para acceder al correo POP3."</string>
<string name="exchange_name" msgid="1190783774800310346">"Corporativo"</string>
<string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
<string name="system_account_create_failed" msgid="3673792980526246177">"No se pudo crear la cuenta. Inténtalo de nuevo."</string>
- <string name="device_admin_label" msgid="8680224994637869414">"Correo electrónico"</string>
+ <string name="device_admin_label" msgid="8680224994637869414">"Correo"</string>
<string name="device_admin_description" msgid="426727923791430306">"Habilita las políticas de seguridad específicas según el servidor."</string>
<string name="gal_searching_fmt" msgid="6140450617663543464">"Buscando <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
<plurals name="gal_completed_fmt">
@@ -448,19 +448,19 @@
<string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Predetermina \"Responder a todos\" para las respuestas de mensajes."</string>
<string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Preguntar antes de mostrar imágenes"</string>
<string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Las imágenes de los mensajes no se mostrarán automáticamente."</string>
- <string name="trusted_senders_cleared" msgid="4762002183756251723">"Se borró \"Mostrar imágenes\"."</string>
+ <string name="trusted_senders_cleared" msgid="4762002183756251723">"Se eliminó \"Mostrar imágenes\"."</string>
<string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Esperando para sincronizar"</string>
- <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Tu correo electrónico aparecerá en breve."</string>
+ <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Tu correo aparecerá en breve."</string>
<string name="widget_other_views" msgid="4988574907386539499">"Toca el ícono para cambiar."</string>
<string name="widget_all_mail" msgid="4352573990283094963">"Combinación de Recibidos"</string>
<string name="widget_unread" msgid="4404711399009077833">"No leídos"</string>
<string name="widget_starred" msgid="8290352707134011791">"Destacados"</string>
<string name="widget_loading" msgid="2340962056927255554">"Cargando…"</string>
<string name="widget_touch_to_configure" msgid="7062039013915225323">"Toca para configurar."</string>
- <string name="widget_no_accounts" msgid="2412482205591224408">"Todavía no has configurado una cuenta de correo electrónico."</string>
+ <string name="widget_no_accounts" msgid="2412482205591224408">"Todavía no has configurado una cuenta de correo."</string>
<string name="more_than_999" msgid="8704425397397918798">"999+"</string>
- <string name="search_hint" msgid="2200412192574686497">"Buscar correo electrónico"</string>
+ <string name="search_hint" msgid="2200412192574686497">"Buscar correo"</string>
<string name="search_mailbox_hint" msgid="7854987729678942790">"Buscar <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="search_header_text_fmt" msgid="3857004638127418247">"Resultados de la búsqueda de \"<xliff:g id="ID_1">%1$s</xliff:g>\""</string>
<string name="search_slow_warning_title" msgid="2826118321880530239">"Esperando los resultados..."</string>
diff --git a/res/values-hu/uploader.xml b/res/values-hu/uploader.xml
index 6044d68..2560959 100644
--- a/res/values-hu/uploader.xml
+++ b/res/values-hu/uploader.xml
@@ -121,7 +121,7 @@
<string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobil feltöltések"</string>
<string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Feltöltés barangoláskor"</string>
<string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Fotók és videók feltöltése adathálózaton történő barangolás során"</string>
- <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Akkufeltöltések"</string>
+ <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Feltöltés akkumulátornál"</string>
<string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Fotók és videók feltöltése csak töltés közben"</string>
<string name="preference_plus_sync_all" msgid="2563137874388611459">"Már meglévő fotók feltöltése"</string>
<string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Bármely meglévő fotó és videó azonnali feltöltése telefonjáról"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e816200..5df6f33 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -86,14 +86,14 @@
<item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> conta"</item>
<item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> contas"</item>
</plurals>
- <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Caixa de entrada"</string>
+ <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Caixa de Entrada"</string>
<string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Caixa de saída"</string>
<string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Rascunhos"</string>
<string name="mailbox_name_display_trash" msgid="9139069064580630647">"Lixo"</string>
<string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviada"</string>
<string name="mailbox_name_display_junk" msgid="9046762505977999288">"Correio electrónico não solicitado"</string>
<string name="mailbox_name_display_unread" msgid="1015674989793998695">"Não lidas"</string>
- <string name="picker_mailbox_name_all_unread" msgid="6392491216581687644">"Caixa de entrada (não lida(s))"</string>
+ <string name="picker_mailbox_name_all_unread" msgid="6392491216581687644">"Caixa de Entrada (não lida(s))"</string>
<string name="picker_mailbox_name_all_inbox" msgid="2277030979530376085">"Caixa de Entrada (todas)"</string>
<string name="picker_combined_view_fmt" msgid="6276294768978512737">"Vista combinada (<xliff:g id="COUNT">%s</xliff:g>)"</string>
<plurals name="picker_combined_view_account_count">
@@ -101,7 +101,7 @@
<item quantity="other" msgid="4145163147488719025">"<xliff:g id="ACCOUNT_COUNT">%d</xliff:g> contas"</item>
</plurals>
<string name="debug_version_fmt" msgid="6160213145745376955">"Versão: <xliff:g id="VERSION">%s</xliff:g>"</string>
- <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Caixa de entrada"</string>
+ <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Caixa de Entrada"</string>
<string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Marcado com estrela"</string>
<string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Rascunhos"</string>
<string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Caixa de saída"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index a814fc4..6327cd1 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -20,8 +20,10 @@
<skip />
<!-- no translation found for permission_read_attachment_desc (6592948507403743153) -->
<skip />
- <!-- outdated translation 4274353114641168675 --> <string name="permission_access_provider_label" msgid="378256653525377586">"Acceder a las datas dal provider dad e-mail"</string>
- <!-- outdated translation 1513898266889541617 --> <string name="permission_access_provider_desc" msgid="2221907862438022705">"\"Permetta a questa applicaziun dad acceder a Vossa banca da datas dad e-mails, inclus messadis retschavids e tramess, nums d\'utilisader e pleds-clav.\""</string>
+ <!-- no translation found for permission_access_provider_label (378256653525377586) -->
+ <skip />
+ <!-- no translation found for permission_access_provider_desc (2221907862438022705) -->
+ <skip />
<string name="app_name" msgid="5815426892327290362">"E-mail"</string>
<string name="compose_title" msgid="427986915662706899">"Nov messadi"</string>
<string name="debug_title" msgid="5175710493691536719">"Debug"</string>
@@ -35,7 +37,8 @@
<string name="reply_all_action" msgid="6192179825726332152">"Respunder a tuts"</string>
<string name="delete_action" msgid="8421026208288857155">"Stizzar"</string>
<string name="forward_action" msgid="669174181042344116">"Transferir"</string>
- <!-- outdated translation 2911296685862420689 --> <string name="favorite_action" msgid="4664259801498253756">"Favurit"</string>
+ <!-- no translation found for favorite_action (4664259801498253756) -->
+ <skip />
<string name="done_action" msgid="7497990549515580249">"Terminà"</string>
<!-- no translation found for create_action (3062715563215392251) -->
<skip />
@@ -44,7 +47,8 @@
<!-- no translation found for quick_responses_empty_view (1693308598242828422) -->
<skip />
<string name="discard_action" msgid="6532206074859505968">"Sbittar"</string>
- <!-- outdated translation 812855865552028622 --> <string name="save_draft_action" msgid="6413714270991417223">"Memorisar sco sboz"</string>
+ <!-- no translation found for save_draft_action (6413714270991417223) -->
+ <skip />
<!-- no translation found for show_quick_text_list_dialog_action (4136018559611145202) -->
<skip />
<string name="read_action" msgid="4701484794504781686">"Marcar sco legì"</string>
@@ -71,13 +75,16 @@
<skip />
<!-- no translation found for close_action (533058985745238100) -->
<skip />
- <!-- outdated translation 9100624762133992435 --> <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Trametter ils messadis sortints"</string>
+ <!-- no translation found for message_list_send_pending_messages_action (8502942186631824114) -->
+ <skip />
<string name="choose_attachment_dialog_title" msgid="81937507117528954">"Tscherner ina agiunta"</string>
<!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
<skip />
<string name="status_loading_messages" msgid="6552307237621292344">"Ils messadis vegnan chargiads…"</string>
- <!-- outdated translation 6045933332005067021 --> <string name="status_network_error" msgid="2611654064403817391">"Errur da connexiun"</string>
- <!-- outdated translation 2265140604109272914 --> <string name="error_loading_message_body" msgid="6775234299515596760">"Ina errur nunspetgada è cumparida cun chargiar il text dal messadi. Eventualmain è il text memia lung per vegnir mussà."</string>
+ <!-- no translation found for status_network_error (2611654064403817391) -->
+ <skip />
+ <!-- no translation found for error_loading_message_body (6775234299515596760) -->
+ <skip />
<!-- no translation found for move_messages:one (320885379869442589) -->
<!-- no translation found for move_messages:other (371256717624461324) -->
<!-- no translation found for cannot_move_protocol_not_supported_toast (6558083148128616292) -->
@@ -120,7 +127,8 @@
<!-- no translation found for picker_combined_view_account_count:one (380235084337895804) -->
<!-- no translation found for picker_combined_view_account_count:other (4145163147488719025) -->
<string name="debug_version_fmt" msgid="6160213145745376955">"Versiun: <xliff:g id="VERSION">%s</xliff:g>"</string>
- <!-- outdated translation 5790553737870057607 --> <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Chascha da brevs cumbinada"</string>
+ <!-- no translation found for account_folder_list_summary_inbox (7518263761297423255) -->
+ <skip />
<string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Cun staila"</string>
<string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Sbozs"</string>
<string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Posta sortida"</string>
@@ -165,7 +173,8 @@
<skip />
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Messadi original --------"\n"Object: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Da: <xliff:g id="SENDER">%2$s</xliff:g>"\n"A: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha scrit:"\n\n</string>
- <!-- outdated translation 5722467956990009520 --> <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Text cità"</string>
+ <!-- no translation found for message_compose_quoted_text_label (6950097435198536165) -->
+ <skip />
<!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
<skip />
<string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Vus stuais agiuntar almain in destinatur."</string>
@@ -197,7 +206,8 @@
<string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Fermar"</string>
<!-- no translation found for message_view_status_attachment_saved (8878790392556284868) -->
<skip />
- <!-- outdated translation 5039599647697750874 --> <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Impussibel da memorisar l\'agiunta sin la carta SD."</string>
+ <!-- no translation found for message_view_status_attachment_not_saved (2433097334272991035) -->
+ <skip />
<string name="message_view_attachment_background_load" msgid="756797444835526487">"Remartga: Ina u pliras agiuntas en Voss messadi renvià vegn(an) telechargiada(s) avant la spediziun."</string>
<!-- no translation found for message_view_show_message_action (5134222901019191436) -->
<skip />
@@ -213,14 +223,18 @@
<!-- no translation found for message_view_always_show_pictures_confirmation (6838463134312859448) -->
<skip />
<string name="message_view_invite_view" msgid="5521032519960111675">"Mussar en il chalender"</string>
- <!-- outdated translation 5024473745902772299 --> <string name="message_view_invite_title" msgid="3418949733434713805">"Invitaziun da chalender"</string>
+ <!-- no translation found for message_view_invite_title (3418949733434713805) -->
+ <skip />
<string name="message_view_invite_text" msgid="1212799906603873708">"Participar?"</string>
<string name="message_view_invite_accept" msgid="744546668021679819">" Gea"</string>
<string name="message_view_invite_maybe" msgid="7555189462441562318">" Forsa"</string>
<string name="message_view_invite_decline" msgid="6119797303297149463">" Na"</string>
- <!-- outdated translation 1900593767157209498 --> <string name="message_view_invite_toast_yes" msgid="6802274503171644414">"Vus avais acceptà questa invitaziun."</string>
- <!-- outdated translation 8324044318669610540 --> <string name="message_view_invite_toast_maybe" msgid="8547454326090527202">"Vus avais respundì «Forsa» a questa invitaziun."</string>
- <!-- outdated translation 7511491076936887064 --> <string name="message_view_invite_toast_no" msgid="1842341256942784143">"Vus avais refusà questa invitaziun."</string>
+ <!-- no translation found for message_view_invite_toast_yes (6802274503171644414) -->
+ <skip />
+ <!-- no translation found for message_view_invite_toast_maybe (8547454326090527202) -->
+ <skip />
+ <!-- no translation found for message_view_invite_toast_no (1842341256942784143) -->
+ <skip />
<!-- no translation found for message_view_show_details (6287415596441037095) -->
<skip />
<!-- no translation found for message_view_message_details_dialog_title (9042008615386883449) -->
@@ -262,13 +276,15 @@
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"Stizzà il messadi"</string>
<string name="message_saved_toast" msgid="8443125659172627665">"Memorisà il messadi sco sboz."</string>
- <!-- outdated translation 6096315816776330821 --> <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Impussibel da mussar questa agiunta."</string>
+ <!-- no translation found for message_view_display_attachment_toast (7714482237896346836) -->
+ <skip />
<!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
<skip />
<string name="message_view_parse_message_toast" msgid="8830378966553031281">"Avrir il messadi..."</string>
<!-- no translation found for message_moved_toast:one (3098493230185412871) -->
<!-- no translation found for message_moved_toast:other (2286739630865943494) -->
- <!-- outdated translation 6654377128589312623 --> <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ina agiunta n\'ha betg pudì vegnir renviada"</string>
+ <!-- no translation found for forward_download_failed_ticker (6176608320359303255) -->
+ <skip />
<!-- no translation found for forward_download_failed_title (6139701848515572511) -->
<skip />
<!-- no translation found for login_failed_ticker (5749227022559285302) -->
@@ -297,22 +313,28 @@
<skip />
<!-- no translation found for message_list_subject_snippet_divider (1783589062530679520) -->
<skip />
- <!-- outdated translation 3969856368228940980 --> <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar l\'e-mail"</string>
+ <!-- no translation found for account_setup_basics_title (3578333196594678422) -->
+ <skip />
<string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agiuntar in conto Exchange"</string>
<string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agiuntar in conto Exchange ActiveSync"</string>
<!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
<skip />
- <!-- outdated translation 5901437782383439370 --> <string name="accounts_welcome" msgid="1491126253077950685">"Vus pudais configurar il sistem dad e-mail da la gronda part dals contos cun paucs pass."</string>
- <!-- outdated translation 4414121583987233733 --> <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Vus pudais configurar in conto Exchange cun be paucs pass."</string>
- <!-- outdated translation 1324339567986452000 --> <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Vus pudais configurar in conto Exchange ActiveSync cun be paucs pass."</string>
+ <!-- no translation found for accounts_welcome (1491126253077950685) -->
+ <skip />
+ <!-- no translation found for accounts_welcome_exchange (4432917203403596617) -->
+ <skip />
+ <!-- no translation found for accounts_welcome_exchange_alternate (1319376442032224845) -->
+ <skip />
<!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
<skip />
<!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
<skip />
<string name="account_setup_basics_default_label" msgid="5924790142029806711">"Trametter ils e-mails tenor standard cun quest conto"</string>
<string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuraziun manuala"</string>
- <!-- outdated translation 4441448542557889481 --> <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Endatai ina adressa dad e-mail valida ed il pled-clav correct."</string>
- <!-- outdated translation 3176749833792312641 --> <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplitgar il conto"</string>
+ <!-- no translation found for account_setup_username_password_toast (3968270274727947460) -->
+ <skip />
+ <!-- no translation found for account_duplicate_dlg_title (8089732986912704425) -->
+ <skip />
<!-- no translation found for account_duplicate_dlg_message_fmt (6447629283679935840) -->
<skip />
<!-- no translation found for account_password_spaces_error (8928309156658903257) -->
@@ -320,18 +342,21 @@
<string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperar las infurmaziuns davart il conto…"</string>
<string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verificaziun dals parameters dal server d\'entrada…"</string>
<string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Ils parameters dil server da sortida vegnan controllads…"</string>
- <!-- outdated translation 8875040521875381849 --> <string name="account_setup_names_title" msgid="8483517350241119291">"Configuraziun da Voss e-mail"</string>
+ <!-- no translation found for account_setup_names_title (8483517350241119291) -->
+ <skip />
<!-- no translation found for account_setup_names_headline (2413440250372658881) -->
<skip />
<string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar in num al conto (facultativ)"</string>
<string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Voss num (vegn mussà en messadis che sortan)"</string>
<!-- no translation found for account_setup_names_user_name_empty_error (6791427018325367364) -->
<skip />
- <!-- outdated translation 6645576356752495504 --> <string name="account_setup_account_type_title" msgid="7156551693961182124">"Agiuntar in nov conto dad e-mail"</string>
+ <!-- no translation found for account_setup_account_type_title (7156551693961182124) -->
+ <skip />
<!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
<skip />
<string name="account_setup_account_type_instructions" msgid="114515540798408760">"Da tge tip da conto sa tracti?"</string>
- <!-- outdated translation 6862032674547580337 --> <string name="account_setup_incoming_title" msgid="6796626791039136005">"Parameters dal server d\'entrada"</string>
+ <!-- no translation found for account_setup_incoming_title (6796626791039136005) -->
+ <skip />
<!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
<skip />
<string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Num d\'utilisader"</string>
@@ -341,16 +366,21 @@
<string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
<string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tip da segirezza"</string>
<string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nagin"</string>
- <!-- outdated translation 3581382268191377346 --> <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL (acceptar tut ils certificats)"</string>
- <!-- outdated translation 8886698397743061682 --> <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL"</string>
- <!-- outdated translation 1089227022489257055 --> <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"TLS (acceptar tut ils certificats)"</string>
- <!-- outdated translation 8638006172590036487 --> <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"TLS"</string>
+ <!-- no translation found for account_setup_incoming_security_ssl_trust_certificates_label (6151855090123117538) -->
+ <skip />
+ <!-- no translation found for account_setup_incoming_security_ssl_label (2798501138420163861) -->
+ <skip />
+ <!-- no translation found for account_setup_incoming_security_tls_trust_certificates_label (6149084428423662620) -->
+ <skip />
+ <!-- no translation found for account_setup_incoming_security_tls_label (6573498431821879660) -->
+ <skip />
<string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Stizzar ils e-mails dal server"</string>
<string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Mai"</string>
<string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Sche jau stiz els da la posta entrada"</string>
<string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefix da la via d\'access IMAP"</string>
<string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facultativ"</string>
- <!-- outdated translation 7437215562885986394 --> <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Parameters dal server da sortida"</string>
+ <!-- no translation found for account_setup_outgoing_title (7208495965665711539) -->
+ <skip />
<!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
<skip />
<string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
@@ -359,7 +389,8 @@
<string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Annunzia obligatorica"</string>
<string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Num d\'utilisader"</string>
<string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Pled-clav"</string>
- <!-- outdated translation 2492853474738063453 --> <string name="account_setup_exchange_title" msgid="396004732514751781">"Parameters dal server"</string>
+ <!-- no translation found for account_setup_exchange_title (396004732514751781) -->
+ <skip />
<!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
<skip />
<string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
@@ -377,10 +408,12 @@
<!-- no translation found for account_setup_exchange_no_certificate (1119542961954780872) -->
<skip />
<string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dad apparats mobils"</string>
- <!-- outdated translation 8995162193118880993 --> <string name="account_setup_options_title" msgid="9016600767888846051">"Opziuns da conto"</string>
+ <!-- no translation found for account_setup_options_title (9016600767888846051) -->
+ <skip />
<!-- no translation found for account_setup_options_headline (4181274232835368085) -->
<skip />
- <!-- outdated translation 4598023962234986194 --> <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequenza da controlla dals e-mails"</string>
+ <!-- no translation found for account_setup_options_mail_check_frequency_label (4824859792882810053) -->
+ <skip />
<string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Mai"</string>
<string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaticamain (push)"</string>
<string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Mintga 5 minutas"</string>
@@ -395,8 +428,10 @@
<string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronisar ils e-mails da quest conto."</string>
<!-- no translation found for account_setup_options_background_attachments_label (5247749298276451846) -->
<skip />
- <!-- outdated translation 7827583313117521383 --> <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Impussibel da terminar l\'installaziun"</string>
- <!-- outdated translation 8764417340954006086 --> <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Quantitad da sincronisar"</string>
+ <!-- no translation found for account_setup_failed_dlg_title (9083263347962940552) -->
+ <skip />
+ <!-- no translation found for account_setup_options_mail_window_label (7582247646138987328) -->
+ <skip />
<!-- no translation found for account_setup_options_mail_window_auto (4188895354366183790) -->
<skip />
<string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"In di"</string>
@@ -404,12 +439,14 @@
<string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Ina emna"</string>
<string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Duas emnas"</string>
<string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"In mais"</string>
- <!-- outdated translation 5383858972681926166 --> <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Tut ils e-mails"</string>
+ <!-- no translation found for account_setup_options_mail_window_all (5372861827683632364) -->
+ <skip />
<!-- no translation found for account_setup_options_mail_window_default (8321351926520165832) -->
<skip />
<string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Num d\'utilisader u pled-clav nuncorrect."</string>
<string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Num d\'utilisader u pled-clav nuncorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
- <!-- outdated translation 961843413600482906 --> <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Impussibel da stabilir ina connexiun segirada cun il server."</string>
+ <!-- no translation found for account_setup_failed_dlg_certificate_message (3836152264696108805) -->
+ <skip />
<!-- no translation found for account_setup_failed_dlg_certificate_message_fmt (2121921642915593041) -->
<skip />
<!-- no translation found for account_setup_failed_certificate_required (1280569002588325367) -->
@@ -418,13 +455,17 @@
<skip />
<!-- no translation found for account_setup_failed_check_credentials_message (222908719765968691) -->
<skip />
- <!-- outdated translation 1828270369532779265 --> <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Impussibel da stabilir ina connexiun cun il server."</string>
+ <!-- no translation found for account_setup_failed_dlg_server_message (4942810054116129684) -->
+ <skip />
<!-- no translation found for account_setup_failed_dlg_server_message_fmt (2525425638303883232) -->
<skip />
<string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS è obligatoric ma na vegn betg sustegnì dal server."</string>
- <!-- outdated translation 1676242821459638150 --> <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Las metodas d\'autentificaziun na vegnan betg sustegnidas dal server."</string>
- <!-- outdated translation 6142264248671379943 --> <string name="account_setup_failed_security" msgid="925820957665764964">"Impussibel da stabilir ina connexiun cun il server per motiv dad ina errur da segirezza."</string>
- <!-- outdated translation 7391458717708933095 --> <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Impussibel da stabilir ina connexiun cun il server."</string>
+ <!-- no translation found for account_setup_failed_auth_required (6799839150250217566) -->
+ <skip />
+ <!-- no translation found for account_setup_failed_security (925820957665764964) -->
+ <skip />
+ <!-- no translation found for account_setup_failed_ioerror (7802604687451830378) -->
+ <skip />
<!-- no translation found for account_setup_failed_protocol_unsupported (4607759927226943569) -->
<skip />
<!-- no translation found for account_setup_failed_access_denied (6835358740050287051) -->
@@ -443,8 +484,10 @@
<!-- no translation found for account_security_dialog_content_fmt (8843806143923278214) -->
<skip />
<string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Il conto «<xliff:g id="ACCOUNT">%s</xliff:g>» basegna ina actualisaziun dals parameters da segirezza."</string>
- <!-- outdated translation 8096231937552848281 --> <string name="security_notification_content_title" msgid="3352841884304076235">"Actualisar ils parameters da segirezza"</string>
- <!-- outdated translation 4441470647344315196 --> <string name="account_security_title" msgid="3511543138560418587">"Protecziun da l\'apparat"</string>
+ <!-- no translation found for security_notification_content_title (3352841884304076235) -->
+ <skip />
+ <!-- no translation found for account_security_title (3511543138560418587) -->
+ <skip />
<!-- no translation found for account_security_policy_explanation_fmt (6932627044314460766) -->
<skip />
<string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modifitgar ils detagls"</string>
@@ -478,8 +521,10 @@
<skip />
<string name="account_settings_notify_label" msgid="1630001017303007974">"Avis ad e-mails"</string>
<string name="account_settings_summary" msgid="8403582255413830007">"\"Frequenza da sincronisaziun, avis, etc.\""</string>
- <!-- outdated translation 6609224590300639887 --> <string name="account_settings_notify_summary" msgid="6301122709602752038">"Avisar l\'arriv dad in e-mail en la trav da status"</string>
- <!-- outdated translation 2067835530563849675 --> <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frequenza da controlla"</string>
+ <!-- no translation found for account_settings_notify_summary (6301122709602752038) -->
+ <skip />
+ <!-- no translation found for account_settings_mail_check_frequency_label (8271462919214560616) -->
+ <skip />
<string name="account_settings_incoming_label" msgid="7858928031806297542">"Messadis che entran"</string>
<!-- no translation found for account_settings_incoming_summary (2923044634831881068) -->
<skip />
@@ -505,7 +550,8 @@
<string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronisar ils contacts per quest conto"</string>
<string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronisar il chalender"</string>
<string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronisar il chalender per quest conto"</string>
- <!-- outdated translation 4305222662654506074 --> <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronisaziun dad e-mail"</string>
+ <!-- no translation found for account_settings_sync_email_enable (3754115565685222477) -->
+ <skip />
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronisar ils e-mails per quest conto"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
<string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Era vibrar sch\'in e-mail arriva"</string>
@@ -513,7 +559,8 @@
<string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Mo sche silenzius"</string>
<string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
<string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
- <!-- outdated translation 7922187231467500404 --> <string name="account_settings_ringtone" msgid="8229878374785575207">"Tscherner in tun da scalin"</string>
+ <!-- no translation found for account_settings_ringtone (8229878374785575207) -->
+ <skip />
<string name="account_settings_servers" msgid="4925493817981624242">"Parameters dal server"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Stizzar il conto"</string>
<string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Il conto «<xliff:g id="ACCOUNT">%s</xliff:g>» vegn stizzà da Voss e-mail."</string>
@@ -539,11 +586,14 @@
<skip />
<!-- no translation found for toast_mailbox_not_found (4960014581292378895) -->
<skip />
- <!-- outdated translation 3584841823811425060 --> <string name="provider_note_live" msgid="2995297671709325333">"Mo tscherts contos «plus» includan l\'access POP e permettan uschia a quest program da stabilir ina connexiun. Sche Vus na pudais betg s\'annunziar cun Vossa adressa d\'e-mail ed il pled-clav correct n\'avais Vus eventualmain betg in conto «plus» (che custa). Aviai Voss navigatur da web per acceder quests contos dad e-mail."</string>
- <!-- outdated translation 1973701903400232774 --> <string name="provider_note_t_online" msgid="1630642061431427894">"Visitai per plaschair la pagina d\'internet da T-Online e creai in pled-clav per l\'access dad e-mail POP avant che configurar quest conto dad e-mail."</string>
+ <!-- no translation found for provider_note_live (2995297671709325333) -->
+ <skip />
+ <!-- no translation found for provider_note_t_online (1630642061431427894) -->
+ <skip />
<string name="exchange_name" msgid="1190783774800310346">"Da fatschenta"</string>
<string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
- <!-- outdated translation 4917162302393971752 --> <string name="system_account_create_failed" msgid="3673792980526246177">"Impussibel da crear il conto cun l\'administratur da contos. Empruvai anc ina giada."</string>
+ <!-- no translation found for system_account_create_failed (3673792980526246177) -->
+ <skip />
<string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
<string name="device_admin_description" msgid="426727923791430306">"Activescha las directivas da segirezza specificas per il server"</string>
<string name="gal_searching_fmt" msgid="6140450617663543464">"Tschertgar <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
@@ -553,8 +603,10 @@
</plurals>
<!-- no translation found for settings_activity_title (5185915603716333904) -->
<skip />
- <!-- outdated translation 7548527595339881066 --> <string name="header_label_general_preferences" msgid="9204600297009680176">"Preferenzas dad e-mail"</string>
- <!-- outdated translation 6810399722493971651 --> <string name="category_general_preferences" msgid="2742423840964045801">"Preferenzas dad applicaziun"</string>
+ <!-- no translation found for header_label_general_preferences (9204600297009680176) -->
+ <skip />
+ <!-- no translation found for category_general_preferences (2742423840964045801) -->
+ <skip />
<!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
<skip />
<!-- no translation found for general_preference_auto_advance_summary (6483439980032715119) -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 41d6ee7..3fb8387 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -42,7 +42,7 @@
<string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Вставить быстрый ответ"</string>
<string name="read_action" msgid="4701484794504781686">"Отметить как прочитанное"</string>
<string name="unread_action" msgid="6280399049357552826">"Отметить как непрочитанное"</string>
- <string name="set_star_action" msgid="4660317166196258160">"Пометить"</string>
+ <string name="set_star_action" msgid="4660317166196258160">"Добавить пометку"</string>
<string name="remove_star_action" msgid="6689770999647007163">"Снять пометку"</string>
<string name="refresh_action" msgid="5951383001436708175">"Обновление"</string>
<string name="add_account_action" msgid="8835736309476033727">"Добавить аккаунт"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 92e134f..0d62114 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,7 +20,7 @@
<string name="permission_read_attachment_desc" msgid="6592948507403743153">"Umožňuje tejto aplikácii čítať prílohy vašich e-mailov."</string>
<string name="permission_access_provider_label" msgid="378256653525377586">"Prístup k údajom poskytovateľa e-mailu"</string>
<string name="permission_access_provider_desc" msgid="2221907862438022705">"Povoľuje tejto aplikácii prístup do databázy e-mailu, vrátane prijatých a odoslaných správ, používateľských mien a hesiel."</string>
- <string name="app_name" msgid="5815426892327290362">"Poslať e-mail"</string>
+ <string name="app_name" msgid="5815426892327290362">"Email"</string>
<string name="compose_title" msgid="427986915662706899">"Napísať správu"</string>
<string name="debug_title" msgid="5175710493691536719">"Ladiť"</string>
<string name="next_action" msgid="3931301986364184415">"Ďalej"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 550cb0b..d222eac 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -179,13 +179,13 @@
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Maelezo ya kiambatisho"</string>
<string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Inahitaji muunganisho wa Wi-Fi"</string>
<string name="attachment_info_wifi_settings" msgid="96432970927503597">"Mipangilio ya mtandao-hewa"</string>
- <string name="attachment_info_application_settings" msgid="4124655487276125596">"Mipangilio ya programu"</string>
+ <string name="attachment_info_application_settings" msgid="4124655487276125596">"Mipangilio ya prog"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Haiwezi kufungua kiambatisho."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Hauwezi kuhifadhi au kufungua faili hii kwa sababu ya aina hii ya kiambatisho kinaweza kuwa na programu hasidi."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"KIambatisho hiki hakiwezi kuhifadhiwa au kufunguliwa kwa sababu ya sera za usalama za akaunti hii."</string>
<string name="attachment_info_wifi_only" msgid="1481120960014563617">"Kiambataisho hiki ni kirefu mno kuweza kupakua kupitia kwa mtandao wa simu. Unaweza kuipakua wakati mwingine ukiunganisha kwa mtandao-hewa."</string>
- <string name="attachment_info_no_intent" msgid="8139209405745777924">"Hakuna programu zilizosakinishwa ambazo zinaweza kufungua kiambatisho hiki. Jaribu kupakua programu ifaayo kutoka kwa Android Market."</string>
- <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Kiambatisho hiki ni programu. Unapaswa kuangalia Vyanzo Visivyojulikana katika Mipangilio &gt, Prog kabla uweze kuisanidi."</string>
+ <string name="attachment_info_no_intent" msgid="8139209405745777924">"Hakuna prog zilizosakinishwa ambazo zinaweza kufungua kiambatisho hiki. Jaribu kupakua programu ifaayo kutoka kwa Android Market."</string>
+ <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Kiambatisho hiki ni prog. Unapaswa kuangalia Vyanzo Visivyojulikana katika Mipangilio &gt, Prog kabla uweze kuisanidi."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Prog haziwezi kusakinishwa moja kwa moja kutoka kwa barua pepe. Kwanza hifadhi programu hii na kisha isakinishe kwa kutumia programu za Upakuzi."</string>
<string name="attachment_not_found" msgid="7155322700141145123">"Haikuweza kupakia kiambatisho hiki."</string>
<string name="message_decode_error" msgid="5016042255170947834">"Kulikuwa na hitilafu wakati wa usimbuaji wa ujumbe."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a6ee6d3..a7ccc7c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -235,7 +235,7 @@
<string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"เพิ่มบัญชี Exchange"</string>
<string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"เพิ่มบัญชี Exchange ActiveSync"</string>
<string name="account_setup_basics_headline" msgid="6726590205905464015">"บัญชีอีเมล"</string>
- <string name="accounts_welcome" msgid="1491126253077950685">"คุณสามารถตั้งค่าอีเมลสำหรับบัญชีส่วนใหญ่ได้ในไม่กี่ขั้นตอน"</string>
+ <string name="accounts_welcome" msgid="1491126253077950685">"คุณสามารถตั้งค่าอีเมลสำหรับ\\nบัญชีส่วนใหญ่ได้ในไม่กี่ขั้นตอน"</string>
<string name="accounts_welcome_exchange" msgid="4432917203403596617">"คุณสามารถตั้งค่าบัญชี Exchange ได้ในไม่กี่ขั้นตอน"</string>
<string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"คุณสามารถตั้งค่าบัญชี Exchange ActiveSync ได้ในไม่กี่ขั้นตอน"</string>
<string name="account_setup_basics_email_label" msgid="3454164053624112047">"ที่อยู่อีเมล"</string>
diff --git a/res/values-vi/uploader.xml b/res/values-vi/uploader.xml
index e53f3d1..f8ad2a0 100644
--- a/res/values-vi/uploader.xml
+++ b/res/values-vi/uploader.xml
@@ -4,7 +4,7 @@
<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">"Tải lên tức thì"</string>
- <string name="picasa_default_destination" msgid="2052406684123992574">"Anbom tải lên tức thì"</string>
+ <string name="picasa_default_destination" msgid="2052406684123992574">"Album tải lên tức thì"</string>
<string name="summary_title_uploading" msgid="3357617474017589370">"Đang tải lên"</string>
<string name="summary_title_finished" msgid="7775292294989807025">"Đã hoàn tất"</string>
<string name="summary_title_paused" msgid="8936561302881926595">"Đã tạm dừng"</string>
@@ -115,7 +115,7 @@
<string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Thẻ SD không khả dụng"</string>
<string name="preference_plus_title" msgid="8505499389432915393">"C.đặt Tải lên t.thì"</string>
<string name="preference_plus_enable_cs" msgid="8946492352805623630">"Tải lên tức thì"</string>
- <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Tự động tải ảnh & video mới lên anbom web riêng tư"</string>
+ <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Tự động tải ảnh & video mới lên album web riêng tư"</string>
<string name="preference_plus_upload_status" msgid="7925576302519589779">"Trạng thái tải lên"</string>
<string name="preference_plus_category_advanced" msgid="1159923217131890712">"Nâng cao"</string>
<string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Nội dung tải lên qua di động"</string>
@@ -131,7 +131,7 @@
<string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d trong tổng số %2$d"</string>
<string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Tạm dừng: chạm để tiếp tục tải lên"</string>
<string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Tải lên ảnh hiện có"</string>
- <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Tải lên ảnh và video chưa được tải lên từ điện thoại của bạn lên anbom riêng tư trên web có thể mất một khoảng thời gian, nhưng sẽ được hoàn thành trong nền. Bạn có chắc chắn muốn tiếp tục không?"</string>
+ <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Tải lên ảnh và video chưa được tải lên từ điện thoại của bạn lên album riêng tư trên web có thể mất một khoảng thời gian, nhưng sẽ được hoàn thành trong nền. Bạn có chắc chắn muốn tiếp tục không?"</string>
<string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Có"</string>
<string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Không"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b1e8976..0c7ca0b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -246,7 +246,7 @@
<string name="account_duplicate_dlg_title" msgid="8089732986912704425">"I-akhawunti Ephindiwe"</string>
<string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Usuvele usebenzisa leli gama lomsebenzisi kule akhawunti \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
<string name="account_password_spaces_error" msgid="8928309156658903257">"Le phasiwedi iqala noma igcina ngezimpawu"</string>
- <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Ilanda ukwaziswa kwe-akhawunti..."</string>
+ <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Ilanda ulwazi le-akhawunti..."</string>
<string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Ihlola izilungiselelo zesiphakeli ezingenayo..."</string>
<string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Ihlola izilungiselelo zesiphakeli eziphumayo..."</string>
<string name="account_setup_names_title" msgid="8483517350241119291">"Ukumisa i-akhawunti"</string>
@@ -330,7 +330,7 @@
<string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Iseva iphendule ngephutha, sicela uhlole igama lakho lomsebenzisi nephasiwedi bese uzama futhi."</string>
<string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Ayikwazi ukuxhuma kwiseva."</string>
<string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Ayikwazi ukuxhuma kwiseva. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
- <string name="account_setup_failed_tls_required" msgid="307030406688611327">"I-TLS iyadingeka kodwa ayisekelwa isiphakeli."</string>
+ <string name="account_setup_failed_tls_required" msgid="307030406688611327">"I-TLS iyadingeka kodwa ayisekelwa iseva."</string>
<string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Izindlela zokuqinisekisa azisekelwa yiseva."</string>
<string name="account_setup_failed_security" msgid="925820957665764964">"Ayikwazanga ukuvula uxhumano kwisiphakeli ngenxa yephutha lokuphepha."</string>
<string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Ayikwazi ukuvula uxhumano kwiseva."</string>
@@ -348,7 +348,7 @@
<string name="account_security_title" msgid="3511543138560418587">"Ukuphepha kweDivaysi"</string>
<string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Iseva <xliff:g id="SERVER">%s</xliff:g> idinga ukuba uyivumele ukuba ilawule kude ezinye izici zokuphepha kwedivayisi ye-Android."</string>
<string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Hlela imininingwane"</string>
- <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" idinga ukuba ushintshe iphinikhodi yokuvala isikrini noma iphasiwedi"</string>
+ <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" idinga ukuba ushintshe iphinikhodi yokuvala isikrini noma i-password"</string>
<string name="password_expire_warning_content_title" msgid="7174669014074849304">"Iphasiwedi yokuvala isikrini iphelelwa isikhathi"</string>
<string name="password_expired_ticker" msgid="4230570412974108968">"Iphinikhodi noma iphasiwedi yakho yokuvala isikrini iphelelwe isikhathi."</string>
<string name="password_expired_content_title" msgid="4349518706602252979">"Iphasiwedi yokuvala isikrini iphelelwe isikhathi"</string>
@@ -415,7 +415,7 @@
<string name="exchange_name_alternate" msgid="5772529644749041052">"Ukuvumelanisa Okusebenzayo Kokushintshanisa kwe-Microsoft"</string>
<string name="system_account_create_failed" msgid="3673792980526246177">"Ayikwazanga ukwenza i-akhawunti. Zama futhi."</string>
<string name="device_admin_label" msgid="8680224994637869414">"I-imeyli"</string>
- <string name="device_admin_description" msgid="426727923791430306">"Ivumela isiphakeli sezinqubomgomo zokuphepha okucacisiwe"</string>
+ <string name="device_admin_description" msgid="426727923791430306">"Ivumela izinqubomgomo zokuphepha eziqondene neseva"</string>
<string name="gal_searching_fmt" msgid="6140450617663543464">"Iyasesha <xliff:g id="DOMAIN">%s</xliff:g>..."</string>
<plurals name="gal_completed_fmt">
<item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> imiphumela ephuma <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
@@ -436,7 +436,7 @@
<item msgid="4415205108584620118">"Umbhalo omncane"</item>
<item msgid="4550219696381691112">"Umbhalo ongubukhulu obujwayelekile"</item>
<item msgid="6227813549949219991">"Umbhalo omkhulu"</item>
- <item msgid="1197917420815786571">"Umbhalo omkhulu kakhulu"</item>
+ <item msgid="1197917420815786571">"Umbhalo omkhulu"</item>
</string-array>
<string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Usayizi wombhalo womyalezo"</string>
<string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Ncane kakhulu"</string>
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index a5e4109..6da58e8 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -455,10 +455,9 @@
if (HostAuth.SCHEME_EAS.equals(protocol)) {
mSyncWindow = new ListPreference(mContext);
mSyncWindow.setTitle(R.string.account_setup_options_mail_window_label);
- mSyncWindow.setEntries(R.array.account_settings_mail_window_entries);
- mSyncWindow.setEntryValues(R.array.account_settings_mail_window_values);
mSyncWindow.setValue(String.valueOf(mAccount.getSyncLookback()));
mSyncWindow.setSummary(mSyncWindow.getEntry());
+ MailboxSettings.setupLookbackPreferenceOptions(mContext, mSyncWindow, mAccount);
// Must correspond to the hole in the XML file that's reserved.
mSyncWindow.setOrder(2);
diff --git a/src/com/android/email/activity/setup/AccountSetupOptions.java b/src/com/android/email/activity/setup/AccountSetupOptions.java
index c942faa..1a246c9 100644
--- a/src/com/android/email/activity/setup/AccountSetupOptions.java
+++ b/src/com/android/email/activity/setup/AccountSetupOptions.java
@@ -44,6 +44,7 @@
import com.android.emailcommon.Logging;
import com.android.emailcommon.provider.Account;
import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.provider.Policy;
import com.android.emailcommon.service.SyncWindow;
import com.android.emailcommon.utility.Utility;
@@ -389,10 +390,24 @@
CharSequence[] windowEntries = getResources().getTextArray(
R.array.account_settings_mail_window_entries);
+ // Find a proper maximum for email lookback, based on policy (if we have one)
+ int maxEntry = windowEntries.length;
+ Policy policy = SetupData.getAccount().mPolicy;
+ if (policy != null) {
+ int maxLookback = policy.mMaxEmailLookback;
+ if (maxLookback != 0) {
+ // Offset/Code 0 1 2 3 4 5
+ // Entries auto, 1 day, 3 day, 1 week, 2 week, 1 month
+ // Lookback N/A 1 day, 3 day, 1 week, 2 week, 1 month
+ // Since our test below is i < maxEntry, we must set maxEntry to maxLookback + 1
+ maxEntry = maxLookback + 1;
+ }
+ }
+
// Now create the array used by the Spinner
- SpinnerOption[] windowOptions = new SpinnerOption[windowEntries.length];
+ SpinnerOption[] windowOptions = new SpinnerOption[maxEntry];
int defaultIndex = -1;
- for (int i = 0; i < windowEntries.length; i++) {
+ for (int i = 0; i < maxEntry; i++) {
final int value = Integer.valueOf(windowValues[i].toString());
windowOptions[i] = new SpinnerOption(value, windowEntries[i].toString());
if (value == SYNC_WINDOW_EAS_DEFAULT) {
diff --git a/src/com/android/email/activity/setup/MailboxSettings.java b/src/com/android/email/activity/setup/MailboxSettings.java
index 2b0eb58..ca17436 100644
--- a/src/com/android/email/activity/setup/MailboxSettings.java
+++ b/src/com/android/email/activity/setup/MailboxSettings.java
@@ -22,6 +22,7 @@
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
+import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
import android.preference.ListPreference;
@@ -37,6 +38,7 @@
import com.android.email.RefreshManager;
import com.android.emailcommon.Logging;
import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.Policy;
import com.android.emailcommon.provider.EmailContent.AccountColumns;
import com.android.emailcommon.provider.EmailContent.MailboxColumns;
import com.android.emailcommon.provider.Mailbox;
@@ -178,6 +180,42 @@
}
/**
+ * Setup the entries and entry values for the sync lookback preference
+ * @param context the caller's context
+ * @param pref a ListPreference to be set up
+ * @param account the Account (or owner of a Mailbox) whose preference is being set
+ */
+ public static void setupLookbackPreferenceOptions(Context context, ListPreference pref,
+ Account account) {
+ Resources resources = context.getResources();
+ // Load the complete list of entries/values
+ CharSequence[] entries =
+ resources.getTextArray(R.array.account_settings_mail_window_entries);
+ CharSequence[] values =
+ resources.getTextArray(R.array.account_settings_mail_window_values);
+ // If we have a maximum lookback policy, enforce it
+ if (account.mPolicyKey > 0) {
+ Policy policy = Policy.restorePolicyWithId(context, account.mPolicyKey);
+ if (policy != null && (policy.mMaxEmailLookback != 0)) {
+ int maxEntry = policy.mMaxEmailLookback + 1;
+ // Copy the proper number of values into new entries/values array
+ CharSequence[] policyEntries = new CharSequence[maxEntry];
+ CharSequence[] policyValues = new CharSequence[maxEntry];
+ for (int i = 0; i < maxEntry; i++) {
+ policyEntries[i] = entries[i];
+ policyValues[i] = values[i];
+ }
+ // Point entries/values to the new arrays
+ entries = policyEntries;
+ values = policyValues;
+ }
+ }
+ // Set up the preference
+ pref.setEntries(entries);
+ pref.setEntryValues(values);
+ }
+
+ /**
* Called when {@link #mAccount} and {@link #mMailbox} are loaded (either by the async task
* or from the saved state).
*/
@@ -195,12 +233,7 @@
setTitle(getString(R.string.mailbox_settings_activity_title_with_mailbox, mailboxName));
}
-
- // Special case: If setting inbox, don't show "Use account's default".
- if (mMailbox.mType == Mailbox.TYPE_INBOX) {
- mSyncLookbackPref.setEntries(R.array.account_settings_mail_window_entries);
- mSyncLookbackPref.setEntryValues(R.array.account_settings_mail_window_values);
- }
+ setupLookbackPreferenceOptions(this, mSyncLookbackPref, mAccount);
// Set default value & update summary
mSyncIntervalPref.setValue(String.valueOf(getSyncInterval()));
@@ -210,7 +243,6 @@
// Make then enabled
enablePreferences(true);
-
}
private void updatePreferenceSummary() {
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 798bfb0..bbedfdb 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -23,6 +23,7 @@
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
+import android.content.Intent;
import android.content.Context;
import android.content.OperationApplicationException;
import android.content.UriMatcher;
@@ -86,6 +87,14 @@
public static final String ATTACHMENT_UPDATED_EXTRA_FLAGS =
"com.android.email.ATTACHMENT_UPDATED_FLAGS";
+ /**
+ * Notifies that changes happened. Certain UI components, e.g., widgets, can register for this
+ * {@link android.content.Intent} and update accordingly. However, this can be very broad and
+ * is NOT the preferred way of getting notification.
+ */
+ public static final String ACTION_NOTIFY_MESSAGE_LIST_DATASET_CHANGED =
+ "com.android.email.MESSAGE_LIST_DATASET_CHANGED";
+
public static final String EMAIL_MESSAGE_MIME_TYPE =
"vnd.android.cursor.item/email-message";
public static final String EMAIL_ATTACHMENT_MIME_TYPE =
@@ -2345,6 +2354,20 @@
} else {
resolver.notifyChange(baseUri, null);
}
+
+ // We want to send the message list changed notification if baseUri is Message.NOTIFIER_URI.
+ if (baseUri.equals(Message.NOTIFIER_URI)) {
+ sendMessageListDataChangedNotification();
+ }
+ }
+
+ private void sendMessageListDataChangedNotification() {
+ final Context context = getContext();
+ final Intent intent = new Intent(ACTION_NOTIFY_MESSAGE_LIST_DATASET_CHANGED);
+ // Ideally this intent would contain information about which account changed, to limit the
+ // updates to that particular account. Unfortunately, that information is not available in
+ // sendNotifierChange().
+ context.sendBroadcast(intent);
}
@Override
diff --git a/src/com/android/email/provider/WidgetProvider.java b/src/com/android/email/provider/WidgetProvider.java
index 9f7fc85..0f6731b 100644
--- a/src/com/android/email/provider/WidgetProvider.java
+++ b/src/com/android/email/provider/WidgetProvider.java
@@ -19,12 +19,14 @@
import android.app.Service;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import android.widget.RemoteViewsService;
import com.android.email.Email;
+import com.android.email.R;
import com.android.email.widget.EmailWidget;
import com.android.email.widget.WidgetManager;
import com.android.emailcommon.Logging;
@@ -74,6 +76,20 @@
Log.d(EmailWidget.TAG, "onReceive");
}
super.onReceive(context, intent);
+
+ if (EmailProvider.ACTION_NOTIFY_MESSAGE_LIST_DATASET_CHANGED.equals(intent.getAction())) {
+ // Retrieve the list of current widgets.
+ final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+ final ComponentName component = new ComponentName(context, WidgetProvider.class);
+ final int[] widgetIds = appWidgetManager.getAppWidgetIds(component);
+
+ // Ideally, this would only call notify AppWidgetViewDataChanged for the widgets, where
+ // the account had the change, but the current intent doesn't include this information.
+
+ // Calling notifyAppWidgetViewDataChanged will cause onDataSetChanged() to be called
+ // on the RemoteViewsService.RemoteViewsFactory, starting the service if necessary.
+ appWidgetManager.notifyAppWidgetViewDataChanged(widgetIds, R.id.message_list);
+ }
}
/**
diff --git a/src/com/android/email/service/AttachmentDownloadService.java b/src/com/android/email/service/AttachmentDownloadService.java
index b0db0bb..18468fb 100644
--- a/src/com/android/email/service/AttachmentDownloadService.java
+++ b/src/com/android/email/service/AttachmentDownloadService.java
@@ -405,13 +405,22 @@
return count;
}
+ private void cancelWatchdogAlarm() {
+ if (mAlarmManager != null && mWatchdogPendingIntent != null) {
+ mAlarmManager.cancel(mWatchdogPendingIntent);
+ }
+ }
+
/**
* Watchdog for downloads; we use this in case we are hanging on a download, which might
* have failed silently (the connection dropped, for example)
*/
private void onWatchdogAlarm() {
- // If our service instance is gone, just leave...
- if (mStop) return;
+ // If our service instance is gone, just leave (but cancel alarm first!)
+ if (mStop) {
+ cancelWatchdogAlarm();
+ return;
+ }
long now = System.currentTimeMillis();
for (DownloadRequest req: mDownloadsInProgress.values()) {
// Check how long it's been since receiving a callback
@@ -425,9 +434,7 @@
}
// If there are downloads in progress, reset alarm
if (mDownloadsInProgress.isEmpty()) {
- if (mAlarmManager != null && mWatchdogPendingIntent != null) {
- mAlarmManager.cancel(mWatchdogPendingIntent);
- }
+ cancelWatchdogAlarm();
}
// Check whether we can start new downloads...
if (mConnectivityManager != null && mConnectivityManager.hasConnectivity()) {
diff --git a/src/com/android/email/widget/EmailWidget.java b/src/com/android/email/widget/EmailWidget.java
index 3f6a5c0..67a82f5 100644
--- a/src/com/android/email/widget/EmailWidget.java
+++ b/src/com/android/email/widget/EmailWidget.java
@@ -505,6 +505,10 @@
@Override
public void onDataSetChanged() {
+ // Note: we are not doing anything special in onDataSetChanged(). Since this service has
+ // a reference to a loader that will keep itself updated, if the service is running, it
+ // shouldn't be necessary to for the query to be run again. If the service hadn't been
+ // running, the act of starting the service will also start the loader.
}
public void onDeleted() {
