From 9901ad307c24702ebbd33630604c5ed80d514d6b Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Mon, 30 Aug 2010 13:39:32 -0700
Subject: [PATCH] Import revised translations

Change-Id: I43c107944ef15d2ea20f439f1becf9b6d1f049e2
---
 res/values-cs/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-da/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-de/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-el/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-es-rUS/strings.xml | 33 ++++++++++++++++++++++++++++-----
 res/values-es/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-fr/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-it/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-ja/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-ko/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-nb/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-nl/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-pl/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-pt-rPT/strings.xml | 33 ++++++++++++++++++++++++++++-----
 res/values-pt/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-rm/strings.xml     | 31 +++++++++++++++++++++++--------
 res/values-ru/strings.xml     | 35 +++++++++++++++++++++++++++++------
 res/values-sv/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-tr/strings.xml     | 33 ++++++++++++++++++++++++++++-----
 res/values-zh-rCN/strings.xml | 33 ++++++++++++++++++++++++++++-----
 res/values-zh-rTW/strings.xml | 33 ++++++++++++++++++++++++++++-----
 21 files changed, 584 insertions(+), 109 deletions(-)

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1b1f69fde..367f87744 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Odesílání zpráv..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Odeslat odchozí zprávy"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Načítání přílohy"</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Načítání přílohy <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Číst přílohy e-mailů"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Umožňuje této aplikaci čtení e-mailových příloh."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Přístup k datům poskytovatele e-mailu"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Účet aktualizujete stisknutím a podržením"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"E-mailová schránka"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Načíst další zprávy"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Do"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopie"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skrytá kopie"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Text v uvozovkách"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Je třeba přidat nejméně jednoho příjemce."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Některé e-mailové adresy jsou neplatné."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Některé přílohy nelze přeposlat, protože nebyly staženy."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Soubor nelze připojit, protože je příliš velký."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"Uživatel <xliff:g id="NAME">%1$s</xliff:g> a další uživatelé (<xliff:g id="NUMBER">%2$d</xliff:g>)"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Komu:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kopie:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Otevřít"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Uložit"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Příloha byla uložena na SD kartu jako <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Nelze uložit přílohu na SD kartu."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Výběrem možnosti Zobrazit obrázky zobrazíte vnořené obrázky."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Zobrazit obrázky"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Načítání přílohy"</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Načítání přílohy <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Pozvánka z kalendáře"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Zpráva byla zrušena."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Zpráva byla uložena jako koncept."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Tuto přílohu nelze zobrazit."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavení serveru"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odebrat účet"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> bude z aplikace Email odebrán."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Upgradovat účty"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Účet nelze upgradovat"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Přístup do schránky není u některých poštovních účtů Yahoo! podporován. Pokud máte problémy s připojením, získáte další informace na webové stránce yahoo.com."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"Počet výsledků: <xliff:g id="RESULTS">%1$d</xliff:g> z webu <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Prvních <xliff:g id="RESULTS">%1$d</xliff:g> výsledků z webu <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3ef561a86..7428cfe62 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Sender beskeder ..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Send udgående beskeder"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Henter vedhæftet fil."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Henter vedhæftet fil <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Læs vedhæftede filer i e-mails"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Tillader dette program at læse dine E-mail-vedhæftninger."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Få adgang til data til e-mail-udbyder"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Hold trykket på en konto for at opdatere"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postkasse"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Indlæs flere beskeder"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Til"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citeret tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du skal tilføje mindst en modtager."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Nogle e-mail-adresser er ugyldige."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Nogle vedhæftede filer kan ikke videresendes, fordi de ikke er blevet downloadet."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen er for stor til at vedhæfte."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> og <xliff:g id="NUMBER">%2$d</xliff:g> andre"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Til:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Åbn"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Gem"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Vedhæftet fil er gemt til SD-kort som <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Den vedhæftede fil kunne ikke gemmes på SD-kortet."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Vælg \"Vis billeder\" for at vise indsatte billeder."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Vis billeder"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Henter vedhæftet fil."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Henter vedhæftet fil <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalenderinvitation"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Besked kasseret."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Beskeden er gemt som kladde."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Denne vedhæftede fil kan ikke vises."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverindstillinger"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern konto"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fjernes fra E-mail."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Opgrader konti"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Kontoen kunne ikke opgraderes"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Adgang til postkasse er ikke understøttet for nogle typer af Yahoo!-mailkonti. Hvis du har problemer med at oprette forbindelse, skal du gå til yahoo.com for at få flere oplysninger."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultater fra <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Første <xliff:g id="RESULTS">%1$d</xliff:g> resultater fra <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6338c0aaf..e38d53c86 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Nachrichten werden gesendet…"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Ausgehende Nachrichten senden"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Anhang wird abgerufen"</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Anhang <xliff:g id="FILENAME">%s</xliff:g> wird abgerufen."</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Anhänge lesen"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Erlaubt der Anwendung, Ihre Anhänge zu lesen."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Auf Daten des E-Mail-Providers zugreifen"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Konto zum Aktualisieren lange drücken"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postfach"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Weitere Nachrichten laden"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"An"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Zitierter Text"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Sie müssen mindestens einen Empfänger hinzufügen."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Einige E-Mail-Adressen sind ungültig."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Einige Anhänge können nicht weitergeleitet werden, da Sie noch nicht heruntergeladen wurden."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Dateianhang zu groß"</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> und <xliff:g id="NUMBER">%2$d</xliff:g> weitere"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"An:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Offen"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Speichern"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Anhang auf SD-Speicherkarte unter \"<xliff:g id="FILENAME">%s</xliff:g>\" abgespeichert"</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Speichern des Anhangs auf SD-Karte nicht möglich"</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Wählen Sie \"Bilder anzeigen\" aus, um eingebettete Bilder anzuzeigen."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Bilder anzeigen"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Anhang wird abgerufen"</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Anhang <xliff:g id="FILENAME">%s</xliff:g> wird abgerufen."</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalendereinladung"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Nachricht gelöscht"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Nachricht als Entwurf gespeichert"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Dieser Anhang kann nicht angezeigt werden."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <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>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Upgrade für Konten"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Konto-Upgrade nicht durchführbar"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Der Zugang zum Postfach bestimmter E-Mail-Konten von Yahoo! wird nicht unterstützt. Bei Verbindungsproblemen besuchen Sie die Website von Yahoo! für weitere Informationen."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> Ergebnisse von <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Erste <xliff:g id="RESULTS">%1$d</xliff:g> Ergebnisse von <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ad42770b4..1c17943f6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Αποστολή εικόνων..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Αποστολή εξερχόμενων μηνυμάτων"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Ανάκτηση επισύναψης."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Ανάκτηση επισύναψης <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Ανάγνωση επισυνάψεων μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Επιτρέπει σε αυτήν την εφαρμογή την ανάγνωση των επισυνάψεων των μηνυμάτων ηλεκτρονικού ταχυδρομείου."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Πρόσβαση στα δεδομένα παρόχου ηλεκτρονικού ταχυδρομείου"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Πατήστε παρατεταμένα έναν λογαριασμό για να τον ανανεώσετε"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Θυρίδες αλληλογραφίας"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Φόρτωση περισσότερων μηνυμάτων"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Προς"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Κοιν."</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Κρυφή κοιν."</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Αναφερόμενο κείμενο"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Πρέπει να προσθέσετε τουλάχιστον έναν παραλήπτη."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Ορισμένες διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρες."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Δεν ήταν δυνατή η προώθηση ορισμένων επισυνάψεων επειδή δεν έχουν ληφθεί."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Πολύ μεγάλο αρχείο για επισύναψη."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> και <xliff:g id="NUMBER">%2$d</xliff:g> ακόμα"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Προς:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Κοιν.: "</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Άνοιγμα"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Αποθήκευση"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Η επισύναψη αποθηκεύτηκε στην κάρτα SD ως <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Δεν ήταν δυνατή η αποθήκευση της επισύναψης στην κάρτα SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Επιλέξτε \"Εμφάνιση εικόνων\" για την προβολή των ενσωματωμένων εικόνων."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Εμφάνιση εικόνων"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Ανάκτηση επισύναψης."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Ανάκτηση επισύναψης <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Πρόσκληση Ημερολογίου"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Το μήνυμα απορρίφθηκε."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Το μήνυμα αποθηκεύτηκε ως πρόχειρο."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Δεν είναι δυνατή η προβολή αυτής της επισύναψης."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Ρυθμίσεις διακομιστή"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Κατάργηση λογαριασμού"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Ο λογαριασμός \"<xliff:g id="ACCOUNT">%s</xliff:g>\" θα καταργηθεί από το ηλεκτρονικό ταχυδρομείο."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Αναβάθμιση λογαριασμών"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Δεν είναι δυνατή η αναβάθμιση του λογαριασμού"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Η πρόσβαση στο γραμματοκιβώτιο δεν υποστηρίζεται από ορισμένους τύπους λογαριασμών ηλεκτρονικού ταχυδρομείου Yahoo. Εάν αντιμετωπίζετε προβλήματα σύνδεσης, επισκεφθείτε τη διεύθυνση yahoo.com για περισσότερες πληροφορίες."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> αποτελέσματα από <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Τα πρώτα <xliff:g id="RESULTS">%1$d</xliff:g> αποτελέσματα από <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 247548452..4f5cbe6cd 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Enviando mensajes..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Enviar mensajes de salida"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Extrayendo archivo adjunto."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Extrayendo archivo adjunto<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Leer archivos adjuntos de correo electrónico"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permite a esta aplicación leer tus archivos adjuntos de correo electrónico."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Acceder a los datos del proveedor de correo electrónico"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mantenga presionada una cuenta para actualizarla"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Casilla de correo"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Cargar más mensajes"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <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>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto citado"</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_attachments_skipped_toast" msgid="5611815773808423460">"Algunos archivos adjuntos no se han enviado debido a que no fueron descargados."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"El archivo es demasiado grande para adjuntarlo."</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>
     <string name="message_view_to_label" msgid="6485191743265527381">"Para:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"CC:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Abrir"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Guardar"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Archivo adjunto guardado en la tarjeta SD como <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"No es posible guardar un archivo adjunto a la tarjeta SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Seleccionar \"Mostrar imágenes\" para visualizar las imágenes insertadas."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imágenes"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Extrayendo archivo adjunto."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Extrayendo archivo adjunto<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invitación de Calendar"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensaje descartado."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensaje guardado como borrador."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"No se puede mostrar este archivo adjunto."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <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>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualizar cuentas"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"No es posible actualizar la cuenta."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"No se admite el acceso al buzón en algunos tipos de cuentas de correo de Yahoo!. Si tienes problemas para conectarte, visita yahoo.com para obtener más información."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Primeros <xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 62d34b10b..613f1d4b7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Enviando mensajes..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Enviar mensajes salientes"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Descargando archivo adjunto"</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Extrayendo archivo adjunto <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Leer los archivos adjuntos del mensaje"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permite que esta aplicación lea los archivos adjuntos del correo electrónico."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Acceder a los datos del proveedor de servicios de correo"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mantén pulsada una cuenta para actualizarla."</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Buzón de correo"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Cargar más mensajes"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Al"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"CCO"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto entre comillas"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Debes especificar, 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_attachments_skipped_toast" msgid="5611815773808423460">"No se pueden reenviar algunos archivos adjuntos porque no se han descargado."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"El archivo es demasiado grande para adjuntarlo."</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_attachment_view_action" msgid="5353550848340829134">"Abrir"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Guardar"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"El archivo adjunto se ha guardado en una tarjeta SD como <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"No es posible guardar el archivo adjunto en la tarjeta SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Selecciona \"Mostrar imágenes\" para visualizar las imágenes insertadas."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imágenes"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Descargando archivo adjunto"</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Extrayendo archivo adjunto <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invitación de calendario"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensaje descartado"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensaje guardado como borrador"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"No se puede mostrar el archivo adjunto."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Ajustes del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Se va a eliminar la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" de \"Correo electrónico\"."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualizar cuentas"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"No se ha podido actualizar la cuenta."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Algunos tipos de cuentas de correo de Yahoo! no permiten acceder al buzón de correo. Si tienes problemas de conexión, visita yahoo.com para obtener información adicional al respecto."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Primeros <xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ec8f58ae4..081b861f4 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Envoi des messages en cours"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Envoyer les messages sortants"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Récupération de la pièce jointe."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Récupération de la pièce jointe <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Lire les pièces jointes"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permet à cette application de lire les pièces jointes aux e-mails."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Accéder aux données du client de messagerie"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Appuyez de manière prolongée sur un compte pour l\'actualiser."</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Boîtes aux lettres"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Charger plus de messages"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Langue cible"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cci"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texte du message précédent"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Vous devez ajouter au moins un destinataire."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Certaines adresses e-mail sont incorrectes."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Impossible de transférer certaines pièces jointes : elles n\'ont pas été téléchargées."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Impossible de joindre le fichier, car il est trop volumineux."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> et <xliff:g id="NUMBER">%2$d</xliff:g> autres"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Langue cible:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc : "</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Ouvrir"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Enregistrer"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Pièce jointe enregistrée sur la carte SD sous le nom <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Impossible d\'enregistrer la pièce jointe sur la carte SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Sélectionnez \"Afficher les images\" pour afficher les images intégrées."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Afficher les images"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Récupération de la pièce jointe."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Récupération de la pièce jointe <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invitation d\'agenda"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Message supprimé."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Brouillon enregistré"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Impossible d\'afficher cette pièce jointe."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Paramètres du serveur"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Supprimer le compte"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" va être supprimé de votre messagerie."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Mettre les comptes à niveau"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Impossible de mettre le compte à niveau."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"L\'accès à la boîte aux lettres n\'est pas possible avec certains types de comptes Yahoo!. En cas de problème de connexion, consultez le site yahoo.fr pour obtenir plus d\'informations."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> résultats de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="RESULTS">%1$d</xliff:g> premiers résultats de <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8b311efda..6f5786787 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Invio messaggi..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Invia messaggi in uscita"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Recupero allegato in corso."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Recupero allegato <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Lettura allegati email"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Consente all\'applicazione di leggere i tuoi allegati email."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Accesso ai dati del provider di posta"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Tieni premuto a lungo su un account per aggiornarlo"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Casella di posta"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carica ulteriori messaggi"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"In"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Ccn"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Testo tra virgolette"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Devi aggiungere almeno un destinatario."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alcuni indirizzi email non sono validi."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Impossibile inviare alcuni allegati poiché non sono stati scaricati."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"File troppo grande. Impossibile allegarlo."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e <xliff:g id="NUMBER">%2$d</xliff:g> altri"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"In:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc: "</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Apri"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Salva"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Allegato salvato su scheda SD come <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Impossibile salvare l\'allegato nella scheda SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Seleziona \"Mostra immagini\" per visualizzare le immagini incorporate."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostra immagini"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Recupero allegato in corso."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Recupero allegato <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invito Calendario"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Messaggio eliminato."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Messaggio salvato come bozza."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Impossibile visualizzare questo allegato."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Impostazioni server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Rimuovi account"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"L\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" verrà rimosso da Email."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Esegui l\'upgrade degli account"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Impossibile eseguire l\'upgrade dell\'account"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Accesso alla casella di posta non supportato per alcuni tipi di account di posta Yahoo!. Se hai problemi di connessione, visita il sito yahoo.com per ulteriori informazioni."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> risultati da <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Primi <xliff:g id="RESULTS">%1$d</xliff:g> risultati da <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 346d44315..34398e196 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"メッセージを送信中..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"メッセージを送信します"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"添付ファイルを取得中"</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"添付ファイル<xliff:g id="FILENAME">%s</xliff:g>を取得中"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"メール添付ファイルの読み取り"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Eメールの添付ファイルの読取表示をこのアプリケーションに許可します。"</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"メールプロバイダデータへのアクセス"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"更新するにはアカウントを長押ししてください"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"メールボックス"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"さらにメールを読み込む"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"To"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"元のメッセージ"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"宛先を入力してください。"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"無効なメールアドレスがあります。"</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"ダウンロードされていない添付ファイルは転送できません。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"添付ファイルが大きすぎます。"</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g>他<xliff:g id="NUMBER">%2$d</xliff:g>件"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"To:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"開く"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"保存"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"「<xliff:g id="FILENAME">%s</xliff:g>」という名前で添付ファイルをSDカードに保存しました。"</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"添付ファイルをSDカードに保存できません。"</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"埋め込み画像を見るには[画像を表示]を選択します。"</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"画像を表示"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"添付ファイルを取得中"</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"添付ファイル<xliff:g id="FILENAME">%s</xliff:g>を取得中"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"カレンダーへの招待"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"メッセージを破棄しました。"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"メッセージを下書き保存しました。"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"この添付ファイルは表示できません。"</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"サーバー設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"アカウントを削除"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"アカウント\"<xliff:g id="ACCOUNT">%s</xliff:g>\"をEメールから削除しますか。"</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"アカウントをアップグレード"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"アカウントをアップグレードできません"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"一部のタイプのYahoo!メールアカウントでは、メールボックスへのアクセスがサポートされていません。接続できない場合はyahoo.comにアクセスして詳細をご確認ください。"</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g>からの結果: <xliff:g id="RESULTS">%1$d</xliff:g>件"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="DOMAIN">%2$s</xliff:g>からの結果: 最初の<xliff:g id="RESULTS">%1$d</xliff:g>件"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e239efbbe..3c8bf1db7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"메시지를 보내는 중..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"발신 메시지 보내기"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"첨부파일을 가져오는 중입니다."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"첨부파일(<xliff:g id="FILENAME">%s</xliff:g>)을 가져오는 중"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"이메일 첨부파일 읽기"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"애플리케이션이 이메일 첨부파일을 읽도록 허용합니다."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"이메일 제공업체 데이터 액세스"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"새로고침하려면 계정을 길게 누르세요."</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"편지함"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"더 많은 메시지 로드"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"받는사람"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"참조"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"숨은 참조"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"받은메일"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"받는 사람을 한 명 이상 추가해야 합니다."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"일부 이메일 주소가 올바르지 않습니다."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"일부 첨부파일이 다운로드되지 않았기 때문에 전달할 수 없습니다."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"파일이 너무 커서 첨부할 수 없습니다."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> 외 <xliff:g id="NUMBER">%2$d</xliff:g>명"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"받는사람:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"참조: "</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"열기"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"저장"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"첨부파일(<xliff:g id="FILENAME">%s</xliff:g>)이 SD 카드에 저장되었습니다."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"SD 카드에 첨부파일을 저장할 수 없습니다."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"\'사진 표시\'를 선택하여 삽입된 사진을 표시합니다."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"사진 표시"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"첨부파일을 가져오는 중입니다."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"첨부파일(<xliff:g id="FILENAME">%s</xliff:g>)을 가져오는 중"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"캘린더 초대"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"메시지를 삭제했습니다."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"메일이 임시보관함에 저장되었습니다."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"첨부파일을 표시할 수 없습니다."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"서버 설정"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"계정 삭제"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"<xliff:g id="ACCOUNT">%s</xliff:g> 계정이 이메일에서 삭제됩니다."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"계정 업그레이드"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"계정을 업그레이드할 수 없음"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"일부 Yahoo! 메일 계정의 경우 편지함에 액세스할 수 없습니다. 접속에 문제가 있을 경우 자세한 정보는 yahoo.com을 참조하세요."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g>의 검색결과 <xliff:g id="RESULTS">%1$d</xliff:g>개"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="DOMAIN">%2$s</xliff:g>의 처음 <xliff:g id="RESULTS">%1$d</xliff:g>개 검색결과"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5643ed53f..b225facd6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Sender meldinger ..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Send utgående meldinger"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Henter vedlegg."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Henter vedlegg <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"lese e-post-vedlegg"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Tillat applikasjonen å lese e-post-vedleggene dine."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"få tilgang til epostleverandørdata"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Trykk på og hold inne en konto for å oppdatere den"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postboks"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Hent flere meldinger"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Til"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopi"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Blindkopi"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Sitert tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du må legge til minst én mottager."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Noen e-postadresser er ugyldige."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Noen vedlegg kunne ikke sendes videre fordi de ikke er blitt lastet ned."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen er for stor til å bli lagt ved."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> og <xliff:g id="NUMBER">%2$d</xliff:g> andre"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Til:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kopi:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Åpne"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Lagre"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Vedlegget ble lagret til minnekortet som <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Kunne ikke lagre vedlegget til minnekort."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Velg «Vis bilder» for å vise vedlagte bilder."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Vis bilder"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Henter vedlegg."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Henter vedlegg <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalenderinvitasjon"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Meldingen ble forkastet."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Meldingen ble lagret som utkast."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Kan ikke vise vedlegget."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Innstillinger for tjener"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontoen «<xliff:g id="ACCOUNT">%s</xliff:g>» vil bli fjernet fra e-postapplikasjonen."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Oppgrader kontoer"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Får ikke oppgradert konto"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"E-posttilgang er ikke støttet for enkelte typer Yahoo!-e-postkontoer. Hvis du har problemer med å koble til, besøk yahoo.com for mer informasjon."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultater fra <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Første <xliff:g id="RESULTS">%1$d</xliff:g> resultater fra <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 93c836de8..5cfcf0c05 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Berichten verzenden…"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Uitgaande berichten verzenden"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Bijlage wordt opgehaald."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Bijlage <xliff:g id="FILENAME">%s</xliff:g> ophalen"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Bijlagen van e-mail lezen"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Staat deze toepassing toe om uw e-mailbijlagen te lezen."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Gegevens e-mailprovider openen"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Druk lang op een account om het te vernieuwen"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Mailbox"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Meer berichten laden"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Naar"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Geciteerde tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"U moet minstens één ontvanger toevoegen."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Sommige e-mailadressen zijn ongeldig."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Sommige bijlagen kunnen niet worden doorgestuurd omdat ze niet zijn gedownload."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Bestand is te groot om bij te voegen."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> en <xliff:g id="NUMBER">%2$d</xliff:g> anderen"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Aan:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Open"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Opslaan"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Bijlage opgeslagen op SD-kaart als <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Kan bijlage niet opslaan op SD-kaart."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Selecteer Afbeeldingen weergeven om ingevoegde afbeeldingen weer te geven."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Afbeeldingen weergeven"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Bijlage wordt opgehaald."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Bijlage <xliff:g id="FILENAME">%s</xliff:g> ophalen"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Agenda-uitnodiging"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Bericht wordt verwijderd"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Bericht opgeslagen als concept."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Deze bijlage kan niet worden weergegeven."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinstellingen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Account verwijderen"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"De account <xliff:g id="ACCOUNT">%s</xliff:g> wordt verwijderd van E-mail"</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Accounts upgraden"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Kan account niet upgraden"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Toegang tot postvakken wordt niet ondersteund door sommige typen Yahoo!-mailaccounts. Als er problemen ontstaan bij het verbinden, gaat u naar yahoo.com voor meer informatie."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultaten van <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Eerste <xliff:g id="RESULTS">%1$d</xliff:g> resultaten van <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e6ca36b2b..9e9601c2c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Wysyłanie wiadomości…"</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Wyślij wiadomości wychodzące"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Pobieranie załącznika."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Pobieranie załącznika <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Odczytaj załączniki w wiadomościach e-mail"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Umożliwia tej aplikacji odczyt załączników poczty e-mail."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Dostęp do danych dostawcy poczty elektronicznej"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Naciśnij i przytrzymaj konto, aby je odświeżyć"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Skrzynka pocztowa"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Załaduj więcej wiadomości"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Do"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"DW"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"UDW"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Cytowany tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Musisz dodać co najmniej jednego adresata."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Niektóre adresy e-mail są nieprawidłowe."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Nie można przekazać dalej niektórych załączników, ponieważ nie zostały one pobrane."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Plik jest zbyt duży do załączenia."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> i inni (<xliff:g id="NUMBER">%2$d</xliff:g>)"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Do:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"DW:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Otwórz"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Zapisz"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Załącznik został zapisany na karcie SD jako <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Nie można zapisać załącznika na karcie SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Wybierz opcję Pokaż obrazy, aby wyświetlić osadzone obrazy."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Pokaż obrazy"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Pobieranie załącznika."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Pobieranie załącznika <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Zaproszenie z kalendarza"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Wiadomość została odrzucona."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Wiadomość została zapisana jako wersja robocza."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Nie można wyświetlić tego załącznika."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Ustawienia serwera"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Usuń konto"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Konto <xliff:g id="ACCOUNT">%s</xliff:g> zostanie usunięte z usługi poczty e-mail."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Uaktualnij konta"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Nie można uaktualnić konta"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Dostęp do skrzynki pocztowej nie jest obsługiwany w przypadku kilku typów kont pocztowych w usłudze Yahoo! Jeśli podczas nawiązywania połączenia występują problemy, odwiedź witrynę yahoo.com w celu uzyskania dodatkowych informacji."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"Liczba wyników: <xliff:g id="RESULTS">%1$d</xliff:g> z <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Pierwsze <xliff:g id="RESULTS">%1$d</xliff:g> wyników z <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2a169af61..d4b8094ff 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"A enviar mensagens..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Enviar mensagens a enviar"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"A obter anexo."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"A obter anexo<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Ler anexos de e-mail"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permite que esta aplicação leia os seus anexos de e-mail."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Aceder a dados do fornecedor de e-mail"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Prima prolongadamente uma conta para a actualizar"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Caixa de correio"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carregar mais mensagens"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <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">"Bcc"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto entre aspas"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Tem de adicionar pelo menos um destinatário."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alguns endereços de e-mail são inválidos."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Alguns anexos não podem ser reencaminhados porque não foram transferidos."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Ficheiro demasiado grande para anexar."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e outros <xliff:g id="NUMBER">%2$d</xliff:g>"</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_attachment_view_action" msgid="5353550848340829134">"Abrir"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Guardar"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Anexo guardado no cartão SD como <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Não foi possível guardar o anexo no cartão SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Seleccione \"Mostrar imagens\" para apresentar as imagens incorporadas."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imagens"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"A obter anexo."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"A obter anexo<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Convite da agenda"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensagem rejeitada."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensagem guardada como rascunho."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Este anexo não pode ser apresentado."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Definições do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" será removida do E-mail."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualizar contas"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Não é possível actualizar a conta"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"O acesso à caixa de correio não é suportado para alguns tipos de contas de correio do Yahoo!. Se estiver com dificuldades em efectuar a ligação, visite yahoo.com para obter mais informações."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Primeiros <xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8a4b92b43..8a13d47d0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Enviando mensagens..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Enviar mensagens de saída"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Buscando anexo."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Buscando anexo <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Ler anexos do e-mail"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permite que este aplicativo leia seus anexos enviados por e-mail. "</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Acessar dados do provedor de e-mail"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mantenha pressionada uma conta para atualizá-la"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Caixa de correio"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carregar mais mensagens"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <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>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto das mensagens anteriores"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Você deve adicionar pelo menos um destinatário."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alguns endereços de e-mail são inválidos."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Alguns anexos não podem ser encaminhados pois o download deles não foi feito. "</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Arquivo muito grande para ser anexado."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e outras <xliff:g id="NUMBER">%2$d</xliff:g> pessoas"</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_attachment_view_action" msgid="5353550848340829134">"Abrir"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Salvar"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Anexo salvo no cartão SD como <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Não é possível salvar o anexo no cartão SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Selecionar \"Mostrar imagens\" para exibir imagens anexadas."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imagens"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Buscando anexo."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Buscando anexo <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Convite do Google Agenda"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensagem descartada."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensagem salva como rascunho."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Este anexo não pode ser exibido."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Configurações do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" será removida deste e-mail."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Atualizar contas"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Não é possível atualizar a conta."</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Alguns tipos de contas de e-mail do Yahoo! não suportam o acesso à caixa de e-mail. Se você tiver problemas ao conectar, visite yahoo.com para obter mais informações."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Primeiros <xliff:g id="RESULTS">%1$d</xliff:g> resultados de <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 7c651b65d..6302a742e 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -20,6 +20,10 @@
     <skip />
     <!-- no translation found for message_list_send_pending_messages_action (9100624762133992435) -->
     <skip />
+    <!-- no translation found for message_view_fetching_attachment_toast (8812363375155391184) -->
+    <skip />
+    <!-- no translation found for message_view_fetching_attachment_progress (8238550182655758164) -->
+    <skip />
     <!-- no translation found for read_attachment_label (1162255191991555285) -->
     <skip />
     <!-- no translation found for read_attachment_desc (7594746717616308643) -->
@@ -160,8 +164,6 @@
     <skip />
     <!-- no translation found for message_compose_error_invalid_email (1817633338629885643) -->
     <skip />
-    <!-- no translation found for message_compose_attachments_skipped_toast (5611815773808423460) -->
-    <skip />
     <!-- no translation found for message_compose_attachment_size (4401081828287333647) -->
     <skip />
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e <xliff:g id="NUMBER">%2$d</xliff:g> auters"</string>
@@ -169,21 +171,24 @@
     <skip />
     <!-- no translation found for message_view_cc_label (6322992216371163122) -->
     <skip />
-    <!-- no translation found for message_view_attachment_view_action (5353550848340829134) -->
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
     <skip />
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Arcunar"</string>
     <!-- no translation found for message_view_status_attachment_saved (2802843795251453632) -->
     <skip />
     <!-- no translation found for message_view_status_attachment_not_saved (5039599647697750874) -->
     <skip />
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <!-- no translation found for message_view_show_pictures_instructions (1156525837417031085) -->
     <skip />
     <!-- no translation found for message_view_show_pictures_action (5059936981743072545) -->
     <skip />
-    <!-- no translation found for message_view_fetching_attachment_toast (8812363375155391184) -->
-    <skip />
-    <!-- no translation found for message_view_fetching_attachment_progress (8238550182655758164) -->
-    <skip />
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <!-- no translation found for message_view_invite_title (5024473745902772299) -->
@@ -207,8 +212,14 @@
     <skip />
     <!-- no translation found for message_view_display_attachment_toast (6096315816776330821) -->
     <skip />
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -447,6 +458,10 @@
     <skip />
     <!-- no translation found for account_delete_dlg_instructions_fmt (8236846322040271280) -->
     <skip />
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <!-- no translation found for upgrade_accounts_title (5444140226380754014) -->
     <skip />
     <!-- no translation found for upgrade_accounts_error (7241661832029255715) -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4ded24734..b59df4e22 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Отправка сообщений..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Отправить исходящие сообщения"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Получение приложения."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Получение приложения <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Открывать приложения к письмам"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Разрешить этой программе открывать приложения электронной почты."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Получать доступ к данным провайдера электронной почты"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Нажмите и удерживайте название аккаунта, чтобы обновить его"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Почтовый ящик"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Загрузить еще сообщения"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Получатели"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Копия"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Скрытая копия"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитируемый текст"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Добавьте хотя бы одного получателя."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Некоторые адреса электронной почты являются недопустимыми."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Некоторые приложения нельзя переслать, так как они не были загружены."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файл имеет слишком большой размер и не может быть приложен."</string>
-    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> и еще <xliff:g id="NUMBER">%2$d</xliff:g>"</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> и ещё <xliff:g id="NUMBER">%2$d</xliff:g>"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"На:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Копия: "</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Открыть"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Сохранить"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Приложение сохранено на SD-карту под именем <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Не удается сохранить приложение на SD-карту."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Выберите \"Показать картинки\", чтобы видеть вложенные изображения."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Показать картинки"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Получение приложения."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Получение приложения <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Приглашение в Календаре"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Черновик удален."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Черновик сообщения сохранен."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Это приложение нельзя просмотреть."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Удалить аккаунт"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Аккаунт \"<xliff:g id="ACCOUNT">%s</xliff:g>\" будет удален из Email."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Обновить аккаунты"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Не удается обновить аккаунт"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Не все типы аккаунтов Yahoo! поддерживают доступ к почте. При возникновении проблем с подключением см. дополнительную информацию на yahoo.com."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"Кол-во результатов: <xliff:g id="RESULTS">%1$d</xliff:g> с <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Первые результаты с <xliff:g id="DOMAIN">%2$s</xliff:g> (<xliff:g id="RESULTS">%1$d</xliff:g>)"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bdf6c3984..dbccc991e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"Skickar meddelanden..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Skicka utgående meddelanden"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Hämtar bilaga."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Hämtar bilaga <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"Läs meddelandets bifogade filer"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Tillåter att programmet läser bifogade filer i meddelanden."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Använd e-postleverantörens data"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Tryck länge på ett konto om du vill uppdatera det"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"E-postkonto"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Hämta fler meddelanden"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Till"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopia"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Hemlig kopia"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citerad text"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du måste lägga till minst en mottagare."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Några av e-postadresserna är ogiltiga."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Vissa meddelanden går inte att vidarebefordra eftersom de inte har hämtats."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen är för stor för att bifogas."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> och <xliff:g id="NUMBER">%2$d</xliff:g> andra"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Till:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kopia:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Öppna"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Spara"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Bilagan har sparats som <xliff:g id="FILENAME">%s</xliff:g> på SD-kortet."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Det gick inte att spara bilaga på SD-kortet."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Välj Visa bilder om du vill visa inbäddade bilder."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Visa bilder"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Hämtar bilaga."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Hämtar bilaga <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalenderinbjudan"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Meddelandet slängs."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Meddelande sparat som utkast."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Bilagan kan inte visas."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinställningar"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ta bort konto"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontot <xliff:g id="ACCOUNT">%s</xliff:g> tas bort från E-post."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Uppgradera konton"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Det går inte att uppgradera kontot"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Vi stöder inte åtkomst till postlådan för visa typer av Yahoo!-konton. Om du har problem att ansluta besöker du yahoo.com. Där hittar du mer information."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultat från <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"De första <xliff:g id="RESULTS">%1$d</xliff:g> resultaten från <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5ce71bee4..566efb0bf 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"İletiler gönderiliyor..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"Giden iletileri gönder"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Ek alınıyor."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Ek getiriliyor: <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"E-posta eklerini oku"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Bu uygulamaya e-posta eklerinizi okuma izni verir."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"E-posta sağlayıcı verilerine eriş"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Lütfen bir hesabı yenilemek için hesaba uzun basın"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Posta kutusu"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Daha fazla ileti yükle"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Şu dile:"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Alıntılanan metin"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"En az bir alıcı eklemelisiniz."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Bazı e-posta adresleri geçersiz."</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Bazı ekler indirilmedikleri için yönlendirilemiyor."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Dosya eklenemeyecek kadar büyük."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> ve <xliff:g id="NUMBER">%2$d</xliff:g> kişi daha"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Alıcı:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"Aç"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"Kaydet"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"Ek <xliff:g id="FILENAME">%s</xliff:g> olarak SD karta kaydedildi."</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"Ek, SD karta kaydedilemiyor."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"Katıştırılmış resimleri görüntülemek için \"Resimleri göster\"i seçin."</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Resimleri göster"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Ek alınıyor."</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Ek getiriliyor: <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"Takvim Daveti"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"İleti silindi."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"İleti taslak olarak kaydedildi."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Bu ek görüntülenemiyor."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Sunucu ayarları"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hesabı kaldır"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı E-postadan kaldırılacak."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Hesapların yeni sürümüne geç"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Hesabın yeni sürümüne geçilemiyor"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"Posta kutusu erişimi bazı Yahoo! posta hesabı türlerinde desteklenmemektedir. Bağlanma sorunu yaşıyorsanız daha fazla bilgi için yahoo.com sitesini ziyaret edin."</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g> alanından <xliff:g id="RESULTS">%1$d</xliff:g> sonuç"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="DOMAIN">%2$s</xliff:g> alanından ilk <xliff:g id="RESULTS">%1$d</xliff:g> sonuç"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0374f2e9c..1332d25e0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"正在发送邮件..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"外发邮件"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"正在提取附件。"</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"正在获取附件<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"查看电子邮件附件"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"允许此应用程序读取您的电子邮件附件。"</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"访问电子邮件提供者数据"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"请长按帐户，将其刷新"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"邮箱"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"载入更多邮件"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"收件人"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"抄送"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"密送"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"引用文字"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"必须至少添加一个收件人。"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"某些电子邮件地址无效。"</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"某些附件无法转发，因为还未下载。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"文件太大，无法附加。"</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g>以及其他 <xliff:g id="NUMBER">%2$d</xliff:g> 人"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"收件人："</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"抄送："</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"打开"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"保存"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"附件已保存到 SD 卡，名为<xliff:g id="FILENAME">%s</xliff:g>。"</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"无法将附件保存到 SD 卡。"</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"选择“显示图片”可以显示内嵌的图片。"</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"显示图片"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"正在提取附件。"</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"正在获取附件<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"日历邀请"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"邮件已舍弃。"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"信息已存为草稿。"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"该附件无法显示。"</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"服务器设置"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"删除帐户"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"将会从电子邮件中删除“<xliff:g id="ACCOUNT">%s</xliff:g>”帐户。"</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"升级帐户"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"无法升级帐户"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"对于某些类型的 Yahoo! 邮件帐户，不支持邮箱访问。如果您遇到连接问题，请访问 yahoo.com 了解详细信息。"</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"来自 <xliff:g id="DOMAIN">%2$s</xliff:g> 的 <xliff:g id="RESULTS">%1$d</xliff:g> 条结果"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"来自 <xliff:g id="DOMAIN">%2$s</xliff:g> 的前 <xliff:g id="RESULTS">%1$d</xliff:g> 条结果"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b1de8ba12..07e4b2210 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,6 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="status_sending_messages" msgid="3971880826111264523">"正在傳送訊息..."</string>
     <string name="message_list_send_pending_messages_action" msgid="9100624762133992435">"傳送寄出訊息"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"正在取得附件。"</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"正在擷取附件 <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="read_attachment_label" msgid="1162255191991555285">"讀取電子郵件附件"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"允許此應用程式讀取您的電子郵件附件。"</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"存取電子郵件供應商資料"</string>
@@ -90,6 +92,8 @@
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"請按住您要重新整理的帳戶"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"信箱"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"載入更多郵件"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
     <string name="message_compose_to_hint" msgid="2891895306418177013">"收件者"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"副本"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"密件副本"</string>
@@ -100,19 +104,24 @@
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"引用的文字"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"您必須新增至少一位收件者。"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"部分電子郵件地址無效。"</string>
-    <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"尚未下載部分附件，因此無法予以轉寄。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"檔案過大，超過附件大小限制。"</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g>以及其他 <xliff:g id="NUMBER">%2$d</xliff:g> 位"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"收件者："</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"副本："</string>
-    <string name="message_view_attachment_view_action" msgid="5353550848340829134">"開啟"</string>
-    <string name="message_view_attachment_download_action" msgid="7552530274014544406">"儲存"</string>
+    <!-- no translation found for message_view_attachment_view_action (4408093860407096078) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
     <string name="message_view_status_attachment_saved" msgid="2802843795251453632">"已將附件儲存至 SD 記憶卡，檔名為 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
     <string name="message_view_status_attachment_not_saved" msgid="5039599647697750874">"無法將附件儲存至 SD 記憶卡。"</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
     <string name="message_view_show_pictures_instructions" msgid="1156525837417031085">"選取 [顯示圖片] 即可顯示內嵌的圖片。"</string>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"顯示圖片"</string>
-    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"正在取得附件。"</string>
-    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"正在擷取附件 <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <!-- no translation found for message_view_invite_view (5521032519960111675) -->
     <skip />
     <string name="message_view_invite_title" msgid="5024473745902772299">"日曆邀請"</string>
@@ -130,8 +139,14 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"已捨棄郵件。"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"已儲存郵件草稿。"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"無法顯示此附件。"</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
     <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
     <skip />
+    <!-- no translation found for forward_download_failed_ticker (6654377128589312623) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3239753701377399676) -->
+    <skip />
     <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
     <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
     <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
@@ -271,6 +286,10 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"伺服器設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"移除帳戶"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"系統將從 [電子郵件] 中移除帳戶「<xliff:g id="ACCOUNT">%s</xliff:g>」。"</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"升級帳戶"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"無法升級帳戶"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"系統不支援某些類型的 Yahoo! 郵件帳戶信箱。如果您無法順利連線，請前往 yahoo.com 以瞭解詳情。"</string>
@@ -299,4 +318,8 @@
     <item quantity="other" msgid="7816121892960632123">"共有 <xliff:g id="RESULTS">%1$d</xliff:g> 個來自 <xliff:g id="DOMAIN">%2$s</xliff:g> 的搜尋結果"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"前 <xliff:g id="RESULTS">%1$d</xliff:g> 個來自 <xliff:g id="DOMAIN">%2$s</xliff:g> 的搜尋結果"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
 </resources>