From 152ab4dfd2dbd97de3b96af5c1dcf93ed5b5af2f Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Wed, 26 Oct 2011 10:21:07 -0700
Subject: [PATCH] Import revised translations.  DO NOT MERGE

Change-Id: Ie75200d19bcc3cb267351a24a47c595465537f41
---
 res/values-bg/uploader.xml     |  4 ++--
 res/values-ca/uploader.xml     |  4 ++--
 res/values-cs/uploader.xml     |  4 ++--
 res/values-da/uploader.xml     |  4 ++--
 res/values-de/strings.xml      | 12 +++++------
 res/values-el/uploader.xml     |  4 ++--
 res/values-en-rGB/uploader.xml |  4 ++--
 res/values-es-rUS/uploader.xml |  4 ++--
 res/values-es/strings.xml      | 38 +++++++++++++++++-----------------
 res/values-es/uploader.xml     |  2 +-
 res/values-fa/uploader.xml     |  2 +-
 res/values-fi/uploader.xml     |  4 ++--
 res/values-fr/uploader.xml     |  2 +-
 res/values-hi/uploader.xml     |  4 ++--
 res/values-hr/uploader.xml     |  4 ++--
 res/values-hu/uploader.xml     |  4 ++--
 res/values-in/uploader.xml     |  4 ++--
 res/values-iw/strings.xml      |  4 ++--
 res/values-iw/uploader.xml     |  4 ++--
 res/values-ja/strings.xml      |  2 +-
 res/values-lt/uploader.xml     |  4 ++--
 res/values-lv/uploader.xml     |  4 ++--
 res/values-ms/uploader.xml     |  4 ++--
 res/values-nb/uploader.xml     |  4 ++--
 res/values-nl/uploader.xml     |  4 ++--
 res/values-pl/strings.xml      | 14 ++++++-------
 res/values-pt-rPT/uploader.xml |  4 ++--
 res/values-pt/uploader.xml     |  2 +-
 res/values-ro/uploader.xml     |  4 ++--
 res/values-sk/uploader.xml     |  4 ++--
 res/values-sl/uploader.xml     |  4 ++--
 res/values-sr/uploader.xml     |  4 ++--
 res/values-sv/uploader.xml     |  4 ++--
 res/values-th/strings.xml      |  6 +++---
 res/values-th/uploader.xml     |  4 ++--
 res/values-tl/uploader.xml     |  4 ++--
 res/values-uk/uploader.xml     |  4 ++--
 res/values-vi/uploader.xml     |  4 ++--
 res/values-zh-rCN/strings.xml  | 10 ++++-----
 res/values-zh-rCN/uploader.xml |  4 ++--
 res/values-zh-rTW/uploader.xml |  4 ++--
 41 files changed, 107 insertions(+), 107 deletions(-)

diff --git a/res/values-bg/uploader.xml b/res/values-bg/uploader.xml
index 6e454f69a..1c38811e6 100644
--- a/res/values-bg/uploader.xml
+++ b/res/values-bg/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Качва се"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Завършени"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"На пауза"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d снимки ??? %3$d видеоклипа"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d снимки ??? %2$d видеоклипа"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d снимки • %3$d видеоклипа"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d снимки • %2$d видеоклипа"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"изтощена батерия"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"квотата за снимки бе надхвърлена"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"роуминг"</string>
diff --git a/res/values-ca/uploader.xml b/res/values-ca/uploader.xml
index 3b30a7ae5..13b33af96 100644
--- a/res/values-ca/uploader.xml
+++ b/res/values-ca/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"S\'està penjant"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Finalitzades"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Aturat"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d fotos ??? %3$d vídeos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos ??? %2$d vídeos"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotos • %3$d vídeos"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos • %2$d vídeos"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"bateria baixa"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"s\'ha superat la quota de fotos"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"itinerància"</string>
diff --git a/res/values-cs/uploader.xml b/res/values-cs/uploader.xml
index a18f8f209..0ce8a868f 100644
--- a/res/values-cs/uploader.xml
+++ b/res/values-cs/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Nahrávání"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Dokončeno"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Pozastaveno"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? Fotografie: %2$d ??? Videa: %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Fotografie:%1$d ??? Videa: %2$d"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • Fotografie: %2$d • Videa: %3$d"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Fotografie:%1$d • Videa: %2$d"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"slabá baterie"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"byla překročena kvóta pro počet fotografií"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-da/uploader.xml b/res/values-da/uploader.xml
index 8c61a26a2..cc8f0e854 100644
--- a/res/values-da/uploader.xml
+++ b/res/values-da/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"uploader"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Afsluttet"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Midlertidigt standset"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d billeder ??? %3$d videoer"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d billeder ??? %2$d videoer"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d billeder • %3$d videoer"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d billeder • %2$d videoer"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"lavt batteriniveau"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"Billedkvote overskredet"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6b24acb83..e908ca7bb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -332,7 +332,7 @@
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Keine Verbindung zum Server möglich."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS erforderlich aber nicht von Server unterstützt"</string>
     <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Authentifizierungsmethoden werden nicht vom Server unterstützt."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"Verbindung zu Server kann aufgrund eines Sicherheitsfehlers nicht geöffnet werden."</string>
+    <string name="account_setup_failed_security" msgid="925820957665764964">"Verbindung zu Server kann aufgrund eines Sicherheitsfehlers nicht hergestellt werden."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Verbindung zum Server kann nicht geöffnet werden."</string>
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Sie haben eine falsche Serveradresse eingegeben oder der Server erfordert eine Protokollversion, die zurzeit nicht unterstützt wird."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Sie haben keine Berechtigung, eine Synchronisierung mit diesem Server durchzuführen. Wenden Sie sich für weitere Informationen an Ihren Server-Administrator."</string>
@@ -372,7 +372,7 @@
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Ausgehende Nachrichten"</string>
     <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nutzername, Passwort und andere Einstellungen für Ausgangsserver"</string>
     <string name="account_settings_description_label" msgid="8894815221204511715">"Kontoname"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"Ihr Name"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Mein Name"</string>
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatur"</string>
     <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Kurzantworten"</string>
     <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"Bearbeiten Sie beim Verfassen von E-Mails oft eingefügten Text."</string>
@@ -396,7 +396,7 @@
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Klingelton auswählen"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Servereinstellungen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto entfernen"</string>
-    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" wird aus Email entfernt."</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" wird aus E-Mail entfernt."</string>
     <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Konto entfernen"</string>
     <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Konto entfernen"</string>
     <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Synchronisierungsoptionen"</string>
@@ -427,8 +427,8 @@
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatisch fortfahren"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Was soll nach dem Löschen einer Nachricht angezeigt werden?"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Weiter zu"</string>
-    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Neuere Nachricht"</string>
-    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Ältere Nachricht"</string>
+    <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"neuerer Nachricht"</string>
+    <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"älterer Nachricht"</string>
     <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Nachrichtenliste"</string>
     <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Nachrichtentextgröße"</string>
   <string-array name="general_preference_text_zoom_summary_array">
@@ -446,7 +446,7 @@
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sehr groß"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Allen antworten"</string>
     <string name="general_preference_reply_all_summary" msgid="917669156784760966">"\"Allen antworten\" als Standard für die E-Mail-Beantwortung festlegen"</string>
-    <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Auf Standardeinstellung für \"Bilder anzeigen\" zurücksetzen"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Bilderanzeige zurücksetzen"</string>
     <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Auf Standardeinstellung für alle Absender zurücksetzen (Bilder nicht automatisch anzeigen)"</string>
     <string name="trusted_senders_cleared" msgid="8079053907862270420">"\"Bilder anzeigen\" wurde gelöscht."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> von <xliff:g id="ID_2">%2$s</xliff:g>"</string>
diff --git a/res/values-el/uploader.xml b/res/values-el/uploader.xml
index 49c3a1eb6..5cc8922ec 100644
--- a/res/values-el/uploader.xml
+++ b/res/values-el/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Μεταφόρτωση"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Ολοκληρώθηκε"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Σε παύση"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d φωτογραφίες ??? %3$d βίντεο"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d φωτογραφίες ??? %2$d βίντεο"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d φωτογραφίες • %3$d βίντεο"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d φωτογραφίες • %2$d βίντεο"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"χαμηλή ισχύς μπαταρίας"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"υπέρβαση ορίου φωτογραφιών"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"περιαγωγή"</string>
diff --git a/res/values-en-rGB/uploader.xml b/res/values-en-rGB/uploader.xml
index 6e126b696..17bcf9267 100644
--- a/res/values-en-rGB/uploader.xml
+++ b/res/values-en-rGB/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Uploading"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Finished"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Paused"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d photos ??? %3$d videos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d photos ??? %2$d videos"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d photos • %3$d videos"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d photos • %2$d videos"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"low battery"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"exceeded photo quota"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-es-rUS/uploader.xml b/res/values-es-rUS/uploader.xml
index 62064ecd5..b3d583920 100644
--- a/res/values-es-rUS/uploader.xml
+++ b/res/values-es-rUS/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Cargando"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Completadas"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Pausado"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d fotos ??? %3$d videos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos ??? %2$d videos"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotos • %3$d videos"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos • %2$d videos"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"batería baja"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"se excedió el cupo de fotos"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"Itinerancia"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3d806b9af..b3b505656 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -53,8 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Opciones de sincronización"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leído"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
-    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ Cc/Cco"</string>
-    <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Añadir Cc/CCO"</string>
+    <string name="add_cc_bcc_action" msgid="413546910281713891">"+ CC/CCO"</string>
+    <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Añadir CC/CCO"</string>
     <string name="add_attachment_menu" msgid="6854757034409168845">"Adjuntar archivo"</string>
     <string name="close_action" msgid="533058985745238100">"Cerrar"</string>
     <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Enviar todos"</string>
@@ -90,7 +90,7 @@
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Enviados"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Borradores"</string>
     <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papelera"</string>
-    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviado"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviados"</string>
     <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Correo basura"</string>
     <string name="mailbox_name_display_unread" msgid="1015674989793998695">"No leído"</string>
     <string name="picker_mailbox_name_all_unread" msgid="6392491216581687644">"Recibidos (no leídos)"</string>
@@ -119,13 +119,13 @@
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionados"</item>
   </plurals>
     <string name="message_list_no_messages" msgid="7846910091922523867">"No hay ningún mensaje."</string>
-    <string name="message_compose_to_hint" msgid="2891895306418177013">"Al"</string>
-    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Para"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"CC"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"CCO"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Asunto"</string>
     <string name="message_compose_from_label" msgid="4084843296548498041">"De:"</string>
     <string name="message_compose_to_label" msgid="6806045787441348009">"Para:"</string>
-    <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
+    <string name="message_compose_cc_label" msgid="5608567337432359209">"CC:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"CCO:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Asunto:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Redactar"</string>
@@ -139,7 +139,7 @@
     <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> más"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Para:"</string>
-    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"CC:"</string>
     <string name="message_view_bcc_label" msgid="7577479221285310198">"CCO:"</string>
     <string name="message_view_date_label" msgid="7033814961837313339">"Fecha:"</string>
     <string name="message_view_from_label" msgid="6055076379282772675">"De:"</string>
@@ -241,7 +241,7 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Dirección de correo electrónico"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Contraseña"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar correo electrónico 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_basics_manual_setup_action" msgid="8053852205391155912">"Conf. manual"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Introduce una dirección de correo electrónico y una 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>
@@ -250,13 +250,13 @@
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando la configuración del servidor de entrada..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando la configuración del servidor de salida..."</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuración de cuenta"</string>
-    <string name="account_setup_names_headline" msgid="2413440250372658881">"Tu cuenta ya está configurada y en breve verás tu correo."</string>
+    <string name="account_setup_names_headline" msgid="2413440250372658881">"Tu cuenta ya está configurada y en breve verás tu correo"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asignar un nombre a esta cuenta (opcional)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (aparece en los mensajes salientes)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (aparece en los mensajes enviados)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Este campo no puede estar vacío."</string>
     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuración de cuenta"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipo de cuenta"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es ésta?"</string>
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta tienes?"</string>
     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuración de cuenta"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Ajustes del servidor de entrada"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
@@ -266,13 +266,13 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Puerto"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de seguridad"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguno"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (aceptar todos los certificados)"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (aceptar todos los certif.)"</string>
     <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_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (aceptar todos los certif.)"</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_never_label" msgid="3222897501875871041">"Nunca"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuando suprimo algún mensaje de \"Bandeja de entrada\""</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Al borrar mensajes"</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 cuenta"</string>
@@ -294,10 +294,10 @@
     <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Utilizar certificado de cliente"</string>
     <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eliminar"</string>
     <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ninguno"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositivo móvil"</string>
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID del dispositivo móvil"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"Ajustes de la cuenta"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"Opciones de cuenta"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecuencia comprobación de inbox"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Comprobar si hay mensajes nuevos"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Comprobación automática"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Cada 5 minutos"</string>
@@ -366,7 +366,7 @@
     <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 barra del sistema cuando llegue un correo electrónico"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frecuencia comprobación de inbox"</string>
+    <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Comprobar si hay mensajes nuevos"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuración entrante"</string>
     <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nombre usuario, contraseña y otros ajustes servidor de entrada"</string>
     <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuración saliente"</string>
@@ -425,7 +425,7 @@
     <string name="header_label_general_preferences" msgid="9204600297009680176">"General"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Aplicación"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avance automático"</string>
-    <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Selecciona la pantalla que se mostrará después de eliminar el mensaje."</string>
+    <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Selecciona la pantalla que se mostrará después de eliminar el mensaje"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Ir a"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Mensaje más reciente"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Mensaje anterior"</string>
@@ -461,7 +461,7 @@
     <string name="widget_no_accounts" msgid="2412482205591224408">"Aún no se ha configurado una cuenta de correo electrónico."</string>
     <string name="more_than_999" msgid="8704425397397918798">"999+"</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_mailbox_hint" msgid="7854987729678942790">"Buscar en <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="search_header_text_fmt" msgid="3857004638127418247">"Resultados de búsqueda de \"<xliff:g id="ID_1">%1$s</xliff:g>\""</string>
     <string name="search_slow_warning_title" msgid="2826118321880530239">"Esperando resultados"</string>
     <string name="search_slow_warning_message" msgid="8494483410797387903">"Algunos servidores pueden tardar mucho tiempo."</string>
diff --git a/res/values-es/uploader.xml b/res/values-es/uploader.xml
index 2317ddd53..fb6ff2ae0 100644
--- a/res/values-es/uploader.xml
+++ b/res/values-es/uploader.xml
@@ -8,7 +8,7 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Subiendo"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Subidas completadas"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"En pausa"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d fotos ??? %3$d vídeos"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotos • %3$d vídeos"</string>
     <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos, %2$d vídeos"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"batería baja"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"cuota de fotos superada"</string>
diff --git a/res/values-fa/uploader.xml b/res/values-fa/uploader.xml
index c293bfcd3..f4657da3a 100644
--- a/res/values-fa/uploader.xml
+++ b/res/values-fa/uploader.xml
@@ -8,7 +8,7 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"در حال آپلود"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"تمام شد"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"موقتاً متوقف شد"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d عکس ??? %3$d ویدیو"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d عکس • %3$d ویدیو"</string>
     <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d عکس ؟؟؟ %2$d ویدیو"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"باتری ضعیف است"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"از تعداد مجاز عکس‌ها بیشتر شد"</string>
diff --git a/res/values-fi/uploader.xml b/res/values-fi/uploader.xml
index 57f9f8795..8ca406f22 100644
--- a/res/values-fi/uploader.xml
+++ b/res/values-fi/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Ladataan"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Valmiit"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Keskeytetty"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d kuvaa ??? %3$d videota"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d valokuvaa ??? %2$d videota"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d kuvaa • %3$d videota"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d valokuvaa • %2$d videota"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"akku lähes tyhjä"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"kuvakiintiö ylitetty"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-fr/uploader.xml b/res/values-fr/uploader.xml
index 3f9a2dab9..42de0bc5d 100644
--- a/res/values-fr/uploader.xml
+++ b/res/values-fr/uploader.xml
@@ -8,7 +8,7 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Transfert..."</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Terminé"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Interrompu"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d photos ??? %3$d vidéos"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d photos • %3$d vidéos"</string>
     <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d photos et %2$d vidéos"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"batterie faible"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"quota photos dépassé"</string>
diff --git a/res/values-hi/uploader.xml b/res/values-hi/uploader.xml
index 9038cabdc..5c3a66e11 100644
--- a/res/values-hi/uploader.xml
+++ b/res/values-hi/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"अपलोड हो रहा है"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"पूर्ण"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"रोका गया"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d फ़ोटो ??? %3$d वीडियो"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d फ़ोटो ??? %2$d वीडियो"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d फ़ोटो • %3$d वीडियो"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d फ़ोटो • %2$d वीडियो"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"कम बैटरी"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"फ़ोटो कोटा पार हुआ"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"रोमिंग"</string>
diff --git a/res/values-hr/uploader.xml b/res/values-hr/uploader.xml
index 2873f7b65..e84da77f0 100644
--- a/res/values-hr/uploader.xml
+++ b/res/values-hr/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Prijenos"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Završeno"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Pauzirano"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? Fotografija: %2$d ??? Videozapisa: %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Fotografija: %1$d ??? videozapisa: %2$d"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • Fotografija: %2$d • Videozapisa: %3$d"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Fotografija: %1$d • videozapisa: %2$d"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"slaba baterija"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"premašena kvota fotografija"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-hu/uploader.xml b/res/values-hu/uploader.xml
index ef582cbbe..6044d685f 100644
--- a/res/values-hu/uploader.xml
+++ b/res/values-hu/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Feltöltés"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Befejeződött"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Szüneteltetve"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d fotó ??? %3$d videó"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotó ??? %2$d videó"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotó • %3$d videó"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotó • %2$d videó"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"alacsony töltöttség"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"túllépte a fotókra vonatkozó kvótát"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"barangolás"</string>
diff --git a/res/values-in/uploader.xml b/res/values-in/uploader.xml
index 6f8d3e322..fa9c3be4e 100644
--- a/res/values-in/uploader.xml
+++ b/res/values-in/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Mengunggah"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Selesai"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Dijeda"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d foto ??? %3$d video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto ??? %2$d video"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foto • %3$d video"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto • %2$d video"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"baterai lemah"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"kuota foto melebihi batas"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e845a0453..e7858b28f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -230,7 +230,7 @@
   </plurals>
     <string name="message_view_move_to_newer" msgid="2190862552581773765">"חדש יותר"</string>
     <string name="message_view_move_to_older" msgid="4993043091356700890">"ישן יותר"</string>
-    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" ??? "</string>
+    <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" — "</string>
     <string name="account_setup_basics_title" msgid="3578333196594678422">"הגדרת חשבון"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"הוספת חשבון Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"הוסף חשבון Exchange ActiveSync"</string>
@@ -456,7 +456,7 @@
     <string name="widget_all_mail" msgid="4352573990283094963">"דואר נכנס משולב"</string>
     <string name="widget_unread" msgid="4404711399009077833">"לא נקרא"</string>
     <string name="widget_starred" msgid="8290352707134011791">"מסומן בכוכבית"</string>
-    <string name="widget_loading" msgid="2340962056927255554">"טוען???"</string>
+    <string name="widget_loading" msgid="2340962056927255554">"טוען…"</string>
     <string name="widget_touch_to_configure" msgid="7062039013915225323">"גע כדי להגדיר."</string>
     <string name="widget_no_accounts" msgid="2412482205591224408">"עוד לא הגדרת חשבון דואר אלקטרוני."</string>
     <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
diff --git a/res/values-iw/uploader.xml b/res/values-iw/uploader.xml
index afc5da124..712280bd1 100644
--- a/res/values-iw/uploader.xml
+++ b/res/values-iw/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"העלאה"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"העלאות שהסתיימו"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"מושהה"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? ‏%2$d תמונות ??? %3$d סרטוני וידאו"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d תמונות ??? %2$d סרטוני וידאו"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • ‏%2$d תמונות • %3$d סרטוני וידאו"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d תמונות • %2$d סרטוני וידאו"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"סוללה חלשה"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"חריגה ממכסת התמונות"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"נדידה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d871049f0..e033a5f4a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -435,7 +435,7 @@
     <item msgid="4693576184223089069">"文字サイズ極小"</item>
     <item msgid="4415205108584620118">"文字サイズ小"</item>
     <item msgid="4550219696381691112">"文字サイズ中"</item>
-    <item msgid="6227813549949219991">"文字サイズ大"</item>
+    <item msgid="6227813549949219991">"大きい文字サイズ"</item>
     <item msgid="1197917420815786571">"文字サイズ極大"</item>
   </string-array>
     <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"メッセージの文字サイズ"</string>
diff --git a/res/values-lt/uploader.xml b/res/values-lt/uploader.xml
index 0a60a093c..d1a65c669 100644
--- a/res/values-lt/uploader.xml
+++ b/res/values-lt/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Įkeliama"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Baigta"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Pristabdyta"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d nuotrauk. ??? %3$d vaizdo įraš."</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d nuotrauk. ??? %2$d vaizdo įraš."</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d nuotrauk. • %3$d vaizdo įraš."</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d nuotrauk. • %2$d vaizdo įraš."</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"akumuliatorius senka"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"viršyta nuotraukų kvota"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"tarptinklinis ryšys"</string>
diff --git a/res/values-lv/uploader.xml b/res/values-lv/uploader.xml
index 32b1d19db..d333de6d7 100644
--- a/res/values-lv/uploader.xml
+++ b/res/values-lv/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Notiek augšupielāde"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Pabeigtas"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Pārtrauktas"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d fotoattēli ??? %3$d videoklipi"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotoattēli ??? %2$d videoklipi"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotoattēli • %3$d videoklipi"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotoattēli • %2$d videoklipi"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"zems akumulatora uzlādes līmenis"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"pārsniegta fotoattēlu kvota"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"viesabonēšana"</string>
diff --git a/res/values-ms/uploader.xml b/res/values-ms/uploader.xml
index 415f3cd1f..1b760de4b 100644
--- a/res/values-ms/uploader.xml
+++ b/res/values-ms/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Memuat naik"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Selesai"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Dijeda"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d foto ??? %3$d video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto ??? %2$d video"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foto • %3$d video"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto • %2$d video"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"bateri lemah"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"melebihi kuota foto"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"perayauan"</string>
diff --git a/res/values-nb/uploader.xml b/res/values-nb/uploader.xml
index 2d7eed131..0846aff57 100644
--- a/res/values-nb/uploader.xml
+++ b/res/values-nb/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Laster opp"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Fullført"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Satt på pause"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d bilder ??? %3$d videoer"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d bilder ??? %2$d videoer"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d bilder • %3$d videoer"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d bilder • %2$d videoer"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"lavt batteri"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"bildekvote er overskredet"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-nl/uploader.xml b/res/values-nl/uploader.xml
index 668adaae0..f2d6c8242 100644
--- a/res/values-nl/uploader.xml
+++ b/res/values-nl/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Uploaden"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Voltooid"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Onderbroken"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d foto\'s ??? %3$d video\'s"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto\'s ??? %2$d video\'s"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foto\'s • %3$d video\'s"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto\'s • %2$d video\'s"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"de accu is bijna leeg"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"fotoquotum overschreden"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8fc5ad832..70e79a906 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -51,7 +51,7 @@
     <string name="account_settings_action" msgid="4494079183315085171">"Ustawienia konta"</string>
     <string name="settings_action" msgid="6334807007967459412">"Ustawienia"</string>
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Opcje synchronizacji"</string>
-    <string name="mark_as_unread_action" msgid="3766298115778767554">"Oznacz jako nieprzeczyt."</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Oznacz jako nieprzeczytane"</string>
     <string name="move_action" msgid="3059189775933985898">"Przenieś"</string>
     <string name="add_cc_bcc_action" msgid="413546910281713891">"+ DW/UDW"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Dodaj DW/UDW"</string>
@@ -130,7 +130,7 @@
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Temat:"</string>
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Utwórz wiadomość"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Wiadomość oryginalna --------"\n"Temat: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Od: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Do: <xliff:g id="TO">%3$s</xliff:g>"\n"DW: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
-    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Użytkownik <xliff:g id="SENDER">%s</xliff:g> napisał:"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> napisał(a):"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Cytowany tekst"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Dołącz tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Musisz dodać co najmniej jednego adresata."</string>
@@ -241,7 +241,7 @@
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adres e-mail"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Hasło"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Konfiguracja ręczna"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Konfig. ręczna"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Wpisz prawidłowy adres e-mail i hasło."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Zduplikowane konto"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Używasz już tej nazwy użytkownika na koncie „<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
@@ -361,7 +361,7 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nazwa użytkownika lub hasło dla konta <xliff:g id="ACCOUNT">%s</xliff:g> są niepoprawne. Zaktualizować je teraz?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Domyślne konto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
-    <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Automatyczne pobierz załączniki"</string>
+    <string name="account_settings_background_attachments_label" msgid="6044567979405738536">"Pobieranie załączników"</string>
     <string name="account_settings_background_attachments_summary" msgid="323937814012234081">"Automatycznie pobieraj załączniki, gdy połączono z siecią Wi-Fi."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Powiadomienia e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Częstotliwość synchronizacji, powiadomienia itd."</string>
@@ -445,9 +445,9 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Duży"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Wielki"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpowiedz wszystkim"</string>
-    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Ustaw opcję „Odpowiedz wszystkim” jako domyślną dla wiadomości"</string>
-    <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Przywróć wartość domyślną opcji „Pokaż obrazy”"</string>
-    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Przywróć wartość domyślną dla wszystkich nadawców (nie pokazuj obrazów automatycznie)"</string>
+    <string name="general_preference_reply_all_summary" msgid="917669156784760966">"Ustaw opcję „Odpowiedz wszystkim” jako domyślną"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"Resetuj opcję „Pokaż obrazy”"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"Przywróć wartość domyślną dla wszystkich nadawców (nie pokazuj obrazów)"</string>
     <string name="trusted_senders_cleared" msgid="8079053907862270420">"Opcja „Pokaż obrazy” została wyczyszczona."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Oczekiwanie na synchronizację"</string>
diff --git a/res/values-pt-rPT/uploader.xml b/res/values-pt-rPT/uploader.xml
index fc8ca4cf1..fe226aa27 100644
--- a/res/values-pt-rPT/uploader.xml
+++ b/res/values-pt-rPT/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"A carregar"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Concluídos"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Pausado"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d fotografias ??? %3$d vídeos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotografias ??? %2$d vídeos"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotografias • %3$d vídeos"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotografias • %2$d vídeos"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"bateria fraca"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"quota de fotografias excedida"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-pt/uploader.xml b/res/values-pt/uploader.xml
index fb0717047..bf9b37971 100644
--- a/res/values-pt/uploader.xml
+++ b/res/values-pt/uploader.xml
@@ -8,7 +8,7 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Fazendo upload"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Concluído"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Pausado"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d fotos ??? %3$d vídeos"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotos • %3$d vídeos"</string>
     <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos e %2$d vídeos"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"pouca bateria"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"cota de fotos excedida"</string>
diff --git a/res/values-ro/uploader.xml b/res/values-ro/uploader.xml
index 14375e91a..b06fe413a 100644
--- a/res/values-ro/uploader.xml
+++ b/res/values-ro/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Se încarcă"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Finalizate"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Întreruptă"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d (de) fotografii ??? %3$d (de) videoclipuri"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d (de) fotografii ??? %2$d (de) videoclipuri"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d (de) fotografii • %3$d (de) videoclipuri"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d (de) fotografii • %2$d (de) videoclipuri"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"baterie descărcată"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"s-a depăşit cota de fotografii"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-sk/uploader.xml b/res/values-sk/uploader.xml
index ade89d777..ffbdfd627 100644
--- a/res/values-sk/uploader.xml
+++ b/res/values-sk/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Odovzdáva sa"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Dokončené"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Pozastavené"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"Počet fotografií: %1$d%% ??? %2$d ??? Počet videí: %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Počet fotografií: %1$d ??? Počet videí: %2$d"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"Počet fotografií: %1$d%% • %2$d • Počet videí: %3$d"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Počet fotografií: %1$d • Počet videí: %2$d"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"slabá batéria"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"kvóta pre fotografie bola prekročená"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-sl/uploader.xml b/res/values-sl/uploader.xml
index a0b8e5e16..d7b659175 100644
--- a/res/values-sl/uploader.xml
+++ b/res/values-sl/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Prenos"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Končano"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Začasno ustavljeno"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? št. fotografij: %2$d ??? št. videoposnetkov: %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"št. fotografij: %1$d ??? št. videoposnetkov: %2$d"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • št. fotografij: %2$d • št. videoposnetkov: %3$d"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"št. fotografij: %1$d • št. videoposnetkov: %2$d"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"baterija je skoraj prazna"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"presežena količinska omejitev fotografij"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"gostovanje"</string>
diff --git a/res/values-sr/uploader.xml b/res/values-sr/uploader.xml
index 7ef5e620b..43f162d7a 100644
--- a/res/values-sr/uploader.xml
+++ b/res/values-sr/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Отпремање"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Завршено"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Паузирано"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d фотографије(а) ??? %3$d видео сним(а)ка"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d фотографије(а) ??? %2$d видео сним(а)ка"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d фотографије(а) • %3$d видео сним(а)ка"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d фотографије(а) • %2$d видео сним(а)ка"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"слаба батерија"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"премашена је квота за фотографије"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"роминг"</string>
diff --git a/res/values-sv/uploader.xml b/res/values-sv/uploader.xml
index 7857db0c8..af8cfcb6f 100644
--- a/res/values-sv/uploader.xml
+++ b/res/values-sv/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Överför"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Slutförda"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Pausad"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d foton ??? %3$d videor"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foton ??? %2$d videor"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foton • %3$d videor"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foton • %2$d videor"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"svagt batteri"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"bildkvoten har överskridits"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ad5887eba..ce61fb6da 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -271,7 +271,7 @@
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (ยอมรับใบรับรองทั้งหมด)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"ลบอีเมลจากเซิร์ฟเวอร์"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"ไม่เคย"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"ไม่ต้องเลย"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"เมื่อฉันลบจากกล่องจดหมาย"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"ส่วนนำของพาธ IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"เป็นตัวเลือก"</string>
@@ -298,7 +298,7 @@
     <string name="account_setup_options_title" msgid="9016600767888846051">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"ตัวเลือกของบัญชี"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"ความถี่ในการตรวจสอบกล่องจดหมาย"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"ไม่เคย"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"ไม่ต้องเลย"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"อัตโนมัติ (Push)"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"ทุก 5 นาที"</string>
     <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"ทุก 10 นาที"</string>
@@ -391,7 +391,7 @@
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"สั่นเมื่อมีอีเมลเข้า"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ทุกครั้ง"</string>
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"เฉพาะเมื่อปิดเสียง"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"ไม่เคย"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"ไม่ต้องเลย"</string>
     <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"สั่น"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"เลือกเสียงเรียกเข้า"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"การตั้งค่าเซิร์ฟเวอร์"</string>
diff --git a/res/values-th/uploader.xml b/res/values-th/uploader.xml
index c29b3b9b2..3c4cd2d10 100644
--- a/res/values-th/uploader.xml
+++ b/res/values-th/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"กำลังอัปโหลด"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"เสร็จสิ้น"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"หยุดชั่วคราว"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d ภาพ ??? %3$d วิดีโอ"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d ภาพ ??? %2$d วิดีโอ"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d ภาพ • %3$d วิดีโอ"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d ภาพ • %2$d วิดีโอ"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"แบตเตอรี่อ่อน"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"รูปภาพเกินโควต้าแล้ว"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"โรมมิ่ง"</string>
diff --git a/res/values-tl/uploader.xml b/res/values-tl/uploader.xml
index d467a6b70..157de852d 100644
--- a/res/values-tl/uploader.xml
+++ b/res/values-tl/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Ina-upload"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Tapos na"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Naka-pause"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d (na) larawan ??? %3$d (na) video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d (na) larawan ??? %2$d (na) video"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d (na) larawan • %3$d (na) video"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d (na) larawan • %2$d (na) video"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"mahinang baterya"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"lumampas sa quota ng mga larawan"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
diff --git a/res/values-uk/uploader.xml b/res/values-uk/uploader.xml
index f2e3b1f56..f894c08dc 100644
--- a/res/values-uk/uploader.xml
+++ b/res/values-uk/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"Завантаження"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"Завершено"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"Призупинено"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d фото ??? %3$d відео"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d фото ??? %2$d відео"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d фото • %3$d відео"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d фото • %2$d відео"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"розряджена батарея"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"перевищено квоту на фотографії"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"роумінг"</string>
diff --git a/res/values-vi/uploader.xml b/res/values-vi/uploader.xml
index f6b449ed1..aaecb218d 100644
--- a/res/values-vi/uploader.xml
+++ b/res/values-vi/uploader.xml
@@ -8,8 +8,8 @@
     <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>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d ảnh ??? %3$d video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d ảnh ??? %2$d video"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d ảnh • %3$d video"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d ảnh • %2$d video"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"pin yếu"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"đã vượt quá dung lượng ảnh quy định"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"Đang chuyển vùng"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 7d5c444a9..096d4e284 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -21,7 +21,7 @@
     <string name="permission_access_provider_label" msgid="378256653525377586">"访问电子邮件服务提供商数据"</string>
     <string name="permission_access_provider_desc" msgid="2221907862438022705">"允许此应用程序访问您的电子邮件数据库，包括已收邮件、已发邮件、用户名和密码。"</string>
     <string name="app_name" msgid="5815426892327290362">"电子邮件"</string>
-    <string name="compose_title" msgid="427986915662706899">"撰写"</string>
+    <string name="compose_title" msgid="427986915662706899">"写邮件"</string>
     <string name="debug_title" msgid="5175710493691536719">"调试"</string>
     <string name="next_action" msgid="3931301986364184415">"下一步"</string>
     <string name="okay_action" msgid="8365197396795675617">"确定"</string>
@@ -46,7 +46,7 @@
     <string name="remove_star_action" msgid="6689770999647007163">"删除星标"</string>
     <string name="refresh_action" msgid="5951383001436708175">"刷新"</string>
     <string name="add_account_action" msgid="8835736309476033727">"添加帐户"</string>
-    <string name="compose_action" msgid="4045702519637388045">"撰写"</string>
+    <string name="compose_action" msgid="4045702519637388045">"写邮件"</string>
     <string name="search_action" msgid="6325101454876682308">"搜索"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"帐户设置"</string>
     <string name="settings_action" msgid="6334807007967459412">"设置"</string>
@@ -272,7 +272,7 @@
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"从服务器中删除电子邮件"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"一律不"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"当从收件箱中删除时"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"当我从收件箱中删除时"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路径前缀"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"可选"</string>
     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"帐户设置"</string>
@@ -297,7 +297,7 @@
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"移动设备 ID"</string>
     <string name="account_setup_options_title" msgid="9016600767888846051">"帐户设置"</string>
     <string name="account_setup_options_headline" msgid="4181274232835368085">"帐户选项"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"收件箱检查频率"</string>
+    <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"邮件查收频率"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"一律不"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"自动（推送）"</string>
     <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"每隔 5 分钟"</string>
@@ -447,7 +447,7 @@
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"全部回复"</string>
     <string name="general_preference_reply_all_summary" msgid="917669156784760966">"将“全部回复”作为回复邮件的默认设置"</string>
     <string name="general_preferences_clear_trusted_senders_title" msgid="8540277615940620308">"恢复“显示图片”的默认设置"</string>
-    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"恢复所有发件人的默认设置（不自动显示图片）"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2018233140620247">"针对所有发件人恢复默认设置（不自动显示图片）"</string>
     <string name="trusted_senders_cleared" msgid="8079053907862270420">"“显示图片”列表已清除。"</string>
     <string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封，共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"正在等待同步"</string>
diff --git a/res/values-zh-rCN/uploader.xml b/res/values-zh-rCN/uploader.xml
index ed90effef..e227885cd 100644
--- a/res/values-zh-rCN/uploader.xml
+++ b/res/values-zh-rCN/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"正在上传"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"已完成"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"已暂停"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d 张照片 ??? %3$d 段视频"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d 张照片 ??? %2$d 段视频"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d 张照片 • %3$d 段视频"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d 张照片 • %2$d 段视频"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"电量不足"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"超出照片配额"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"正在漫游"</string>
diff --git a/res/values-zh-rTW/uploader.xml b/res/values-zh-rTW/uploader.xml
index 406ea9407..4b32be321 100644
--- a/res/values-zh-rTW/uploader.xml
+++ b/res/values-zh-rTW/uploader.xml
@@ -8,8 +8,8 @@
     <string name="summary_title_uploading" msgid="3357617474017589370">"上傳中"</string>
     <string name="summary_title_finished" msgid="7775292294989807025">"已完成"</string>
     <string name="summary_title_paused" msgid="8936561302881926595">"已暫停"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ??? %2$d 張相片 ??? %3$d 部影片"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d 張相片 ??? %2$d 部影片"</string>
+    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d 張相片 • %3$d 部影片"</string>
+    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d 張相片 • %2$d 部影片"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"低電量"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"超出相片配額"</string>
     <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"漫遊中"</string>