diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f38314c38..2bed10a90 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"Chyba připojení"</string>
     <string name="status_loading_more_failed">"Opakovat načítání dalších zpráv"</string>
     <string name="notification_new_title">"Nový e-mail"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> nepřečtená zpráva (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"Nepřečtené zprávy: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"Nepřečtené zprávy: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"v(e) <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtech"</item>
+    <item quantity="other">"v(e) <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtech"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"Doručená pošta"</string>
     <string name="accounts_welcome">"Vítá vás nastavení aplikace Email!"\n\n"V aplikaci Email můžete používat jakékoli e-mailové účty."\n\n"Nejznámější e-mailové účty lze nastavit ve dvou krocích!"</string>
     <string name="debug_version_fmt">"Verze: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"Kopie"</string>
     <string name="message_compose_bcc_hint">"Skrytá kopie"</string>
     <string name="message_compose_subject_hint">"Předmět"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"Napsat e-mail"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Původní zpráva --------"\n"Předmět: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Odesílatel: <xliff:g id="SENDER">%s</xliff:g>"\n"Komu: <xliff:g id="TO">%s</xliff:g>"\n"Kopie: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>napsal/a:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Text v uvozovkách"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"Zpráva byla smazána."</string>
     <string name="message_discarded_toast">"Zpráva byla zrušena."</string>
     <string name="message_saved_toast">"Zpráva byla uložena jako koncept."</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"Přidat kontakt"</string>
+    <string name="add_contact_dlg_message_fmt">"Přidat „<xliff:g id="EMAIL">%s</xliff:g>“ do kontaktů"</string>
     <string name="account_setup_basics_title">"Nastavit e-mail"</string>
     <string name="account_setup_basics_instructions">"Zadejte e-mailovou adresu účtu:"</string>
     <string name="account_setup_basics_email_hint">"E-mailová adresa"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 28bb5d218..3bfa8c709 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"Verbindungsfehler"</string>
     <string name="status_loading_more_failed">"Laden weiterer Nachrichten erneut versuchen"</string>
     <string name="notification_new_title">"Neue E-Mail"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> E-Mail-Konten"</item>
+    <item quantity="other">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> E-Mail-Konten"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"Posteingang"</string>
     <string name="accounts_welcome">"Willkommen bei der Einrichtung von E-Mails."\n\n"Nutzen Sie ein beliebiges E-Mail-Konto."\n\n"Gängige E-Mail-Konten können in nur zwei Schritten eingerichtet werden."</string>
     <string name="debug_version_fmt">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"Cc"</string>
     <string name="message_compose_bcc_hint">"Bcc"</string>
     <string name="message_compose_subject_hint">"Betreff"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"E-Mail schreiben"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Originalnachricht --------"\n"Betreff: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Von: <xliff:g id="SENDER">%s</xliff:g>"\n"An: <xliff:g id="TO">%s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> schrieb:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Zitierter Text"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"Nachricht gelöscht"</string>
     <string name="message_discarded_toast">"Nachricht gelöscht"</string>
     <string name="message_saved_toast">"Nachricht als Entwurf gespeichert"</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"Kontakt hinzufügen"</string>
+    <string name="add_contact_dlg_message_fmt">"\"<xliff:g id="EMAIL">%s</xliff:g>\" zu den Kontakten hinzufügen"</string>
     <string name="account_setup_basics_title">"E-Mail einrichten"</string>
     <string name="account_setup_basics_instructions">"Geben Sie Ihre im Konto gespeicherte E-Mail-Adresse ein:"</string>
     <string name="account_setup_basics_email_hint">"E-Mail-Adresse"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 71a7fd0d7..e253906ba 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"Error de conexión"</string>
     <string name="status_loading_more_failed">"Intentar cargar más mensajes"</string>
     <string name="notification_new_title">"Nuevo mensaje"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> no leídos (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> no leídos (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> no leídos (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
+    <item quantity="other">"en <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> cuentas"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"Recibidos"</string>
     <string name="accounts_welcome">"Te damos la bienvenida a la configuración del correo electrónico."\n\n"Usa cualquier cuenta de correo electrónico con \"Correo electrónico\"."\n\n"Las cuentas de correo electrónico más populares se pueden configurar en 2 pasos."</string>
     <string name="debug_version_fmt">"Versión: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"Cc"</string>
     <string name="message_compose_bcc_hint">"CCO"</string>
     <string name="message_compose_subject_hint">"Asunto"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"Redactar"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%s</xliff:g>"\n"From: <xliff:g id="SENDER">%s</xliff:g>"\n"To: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Texto entre comillas"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"Mensaje suprimido"</string>
     <string name="message_discarded_toast">"Mensaje descartado"</string>
     <string name="message_saved_toast">"Mensaje guardado como borrador"</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"Añadir contacto"</string>
+    <string name="add_contact_dlg_message_fmt">"Añadir \"<xliff:g id="EMAIL">%s</xliff:g>\" a los contactos"</string>
     <string name="account_setup_basics_title">"Configurar correo electrónico"</string>
     <string name="account_setup_basics_instructions">"Introduce la dirección de correo electrónico de tu cuenta:"</string>
     <string name="account_setup_basics_email_hint">"Dirección de correo electrónico"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f72f185c0..9a0f522ea 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"Erreur de connexion"</string>
     <string name="status_loading_more_failed">"Essayer de charger plus de messages"</string>
     <string name="notification_new_title">"Nouvel e-mail"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lu (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lus (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> non lus (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"dans <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
+    <item quantity="other">"dans <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"Boîte de réception"</string>
     <string name="accounts_welcome">"Bienvenue dans le programme de configuration de votre messagerie électronique !"\n\n"Utilisez le compte de votre choix."\n\n"Les comptes de messagerie les plus courants peuvent être configurés en deux étapes !"</string>
     <string name="debug_version_fmt">"Version : <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"Cc"</string>
     <string name="message_compose_bcc_hint">"Cci"</string>
     <string name="message_compose_subject_hint">"Objet"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"Nouveau message"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Message original --------"\n"Objet : <xliff:g id="SUBJECT">%s</xliff:g>"\n"De : <xliff:g id="SENDER">%s</xliff:g>"\n"À : <xliff:g id="TO">%s</xliff:g>"\n"Cc : <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> a écrit :"\n\n</string>
     <string name="message_compose_quoted_text_label">"Texte du message précédent"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"Message supprimé."</string>
     <string name="message_discarded_toast">"Message supprimé."</string>
     <string name="message_saved_toast">"Message enregistré comme brouillon."</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"Ajouter un contact"</string>
+    <string name="add_contact_dlg_message_fmt">"Ajouter \"<xliff:g id="EMAIL">%s</xliff:g>\" aux contacts"</string>
     <string name="account_setup_basics_title">"Configurer la messagerie électronique"</string>
     <string name="account_setup_basics_instructions">"Saisissez l\'adresse e-mail de votre compte :"</string>
     <string name="account_setup_basics_email_hint">"Adresse e-mail"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 112fad49d..b95d1c6bb 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"Errore di connessione"</string>
     <string name="status_loading_more_failed">"Prova nuovamente a caricare altri messaggi"</string>
     <string name="notification_new_title">"Nuova email"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> da leggere (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> da leggere (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> da leggere (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> account"</item>
+    <item quantity="other">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> account"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"Posta in arrivo"</string>
     <string name="accounts_welcome">"Benvenuto in Impostazione email."\n\n"Usa qualunque account email con Email."\n\n"Puoi impostare gli account email più popolari in due semplici passaggi."</string>
     <string name="debug_version_fmt">"Versione: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"Cc"</string>
     <string name="message_compose_bcc_hint">"Ccn"</string>
     <string name="message_compose_subject_hint">"Oggetto"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"Scrivi email"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Messaggio originale --------"\n"Oggetto: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Da: <xliff:g id="SENDER">%s</xliff:g>"\n"A: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha scritto:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Testo tra virgolette"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"Messaggio eliminato."</string>
     <string name="message_discarded_toast">"Messaggio eliminato."</string>
     <string name="message_saved_toast">"Messaggio salvato come bozza."</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"Aggiungi contatto"</string>
+    <string name="add_contact_dlg_message_fmt">"Aggiungi \"<xliff:g id="EMAIL">%s</xliff:g>\" ai contatti"</string>
     <string name="account_setup_basics_title">"Imposta email"</string>
     <string name="account_setup_basics_instructions">"Digita l\'indirizzo email del tuo account:"</string>
     <string name="account_setup_basics_email_hint">"Indirizzo email"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 24d598073..b1944e756 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -31,7 +31,7 @@
     <string name="forward_action">"転送"</string>
     <string name="done_action">"完了"</string>
     <string name="discard_action">"破棄"</string>
-    <string name="save_draft_action">"下書きとして保存"</string>
+    <string name="save_draft_action">"下書き保存"</string>
     <string name="refresh_action">"更新"</string>
     <string name="add_account_action">"アカウントを追加"</string>
     <string name="compose_action">"作成"</string>
@@ -50,11 +50,15 @@
     <string name="status_network_error">"接続エラー"</string>
     <string name="status_loading_more_failed">"追加のメールを読み込み直す"</string>
     <string name="notification_new_title">"新着メール"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"未読<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>件（<xliff:g id="ACCOUNT">%s</xliff:g>）"</item>
+    <item quantity="few">"未読<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>件（<xliff:g id="ACCOUNT">%s</xliff:g>）"</item>
+    <item quantity="other">"未読<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>件（<xliff:g id="ACCOUNT">%s</xliff:g>）"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"（<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>個のアカウント）"</item>
+    <item quantity="other">"（<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>個のアカウント）"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"受信トレイ"</string>
     <string name="accounts_welcome">"メールアカウントのセットアップ"\n\n"お好きなメールアカウントを登録してください。"\n\n"画面の手順に沿って簡単に追加できます。"</string>
     <string name="debug_version_fmt">"バージョン: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"Cc"</string>
     <string name="message_compose_bcc_hint">"Bcc"</string>
     <string name="message_compose_subject_hint">"件名"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"メールを作成"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- 元のメッセージ --------"\n"件名: <xliff:g id="SUBJECT">%s</xliff:g>"\n"From: <xliff:g id="SENDER">%s</xliff:g>"\n"To: <xliff:g id="TO">%s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>: "\n\n</string>
     <string name="message_compose_quoted_text_label">"元のメッセージ"</string>
@@ -83,11 +86,9 @@
     <string name="message_view_fetching_attachment_toast">"添付ファイルを取得中"</string>
     <string name="message_deleted_toast">"メッセージを削除しました。"</string>
     <string name="message_discarded_toast">"メッセージを破棄しました。"</string>
-    <string name="message_saved_toast">"メッセージを下書きとして保存しました。"</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="message_saved_toast">"メッセージを下書き保存しました。"</string>
+    <string name="add_contact_dlg_title">"連絡先を追加"</string>
+    <string name="add_contact_dlg_message_fmt">"<xliff:g id="EMAIL">%s</xliff:g> を連絡先に追加する"</string>
     <string name="account_setup_basics_title">"メールアカウントの登録"</string>
     <string name="account_setup_basics_instructions">"メールのアカウント情報を入力:"</string>
     <string name="account_setup_basics_email_hint">"メールアドレス"</string>
@@ -157,8 +158,8 @@
     <string name="account_settings_title_fmt">"全般設定"</string>
     <string name="account_settings_default_label">"既定のアカウント"</string>
     <string name="account_settings_default_summary">"いつもこのアカウントでメールを送信する"</string>
-    <string name="account_settings_notify_label">"メール通知"</string>
-    <string name="account_settings_notify_summary">"メールの着信をステータスバーで知らせる"</string>
+    <string name="account_settings_notify_label">"メール着信通知"</string>
+    <string name="account_settings_notify_summary">"メール受信: ステータスバーで通知"</string>
     <string name="account_settings_mail_check_frequency_label">"メールチェックの頻度"</string>
     <string name="account_settings_incoming_label">"受信設定"</string>
     <string name="account_settings_outgoing_label">"送信設定"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 85511805b..b85d26aa4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"연결 오류"</string>
     <string name="status_loading_more_failed">"추가 메일 로드 재시도"</string>
     <string name="notification_new_title">"새 이메일"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"읽지 않은 메시지 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>개(<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"읽지 않은 메시지 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>개(<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"읽지 않은 메시지 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g>개(<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"(<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정)"</item>
+    <item quantity="other">"(<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>개 계정)"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"받은편지함"</string>
     <string name="accounts_welcome">"이메일 설정에 오신 것을 환영합니다."\n\n"원하는 이메일 계정을 사용하세요."\n\n"가장 많이 사용하는 이메일 계정은 2단계 만에 설정할 수 있습니다."</string>
     <string name="debug_version_fmt">"버전: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"참조"</string>
     <string name="message_compose_bcc_hint">"숨은참조"</string>
     <string name="message_compose_subject_hint">"제목"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"편지쓰기"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- 원본 메일 --------"\n"제목: <xliff:g id="SUBJECT">%s</xliff:g>"\n"보낸사람: <xliff:g id="SENDER">%s</xliff:g>"\n"받는사람: <xliff:g id="TO">%s</xliff:g>"\n"참조: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>님이 작성:"\n\n</string>
     <string name="message_compose_quoted_text_label">"받은메일"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"메일이 삭제되었습니다."</string>
     <string name="message_discarded_toast">"메일이 삭제되었습니다."</string>
     <string name="message_saved_toast">"메일을 임시로 저장했습니다."</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"주소 추가"</string>
+    <string name="add_contact_dlg_message_fmt">"주소록에 \'<xliff:g id="EMAIL">%s</xliff:g>\' 추가"</string>
     <string name="account_setup_basics_title">"이메일 설정"</string>
     <string name="account_setup_basics_instructions">"계정 이메일 주소 입력:"</string>
     <string name="account_setup_basics_email_hint">"이메일 주소"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7e6b025c2..78dbc31f9 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -50,23 +50,24 @@
     <string name="status_network_error">"Feil ved tilkobling"</string>
     <string name="status_loading_more_failed">"Prøv på nytt å hente flere meldinger"</string>
     <string name="notification_new_title">"Ny e-post"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulest (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> uleste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> uleste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
     <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
     <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
     <string name="special_mailbox_name_inbox">"Innboks"</string>
     <string name="accounts_welcome">"Velkommen til e-post-oppsettet!"\n\n"Du kan bruke hvilken som helst e-postkonto."\n\n"De fleste vanlige e-postkontoer kan settes opp i to trinn!"</string>
     <string name="debug_version_fmt">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
-    <string name="debug_enable_debug_logging_label">"Enable extra debug logging?"</string>
-    <string name="debug_enable_sensitive_logging_label">"Enable sensitive information debug logging? (May show passwords in logs.)"</string>
+    <string name="debug_enable_debug_logging_label">"Slå på ekstra debug-logging?"</string>
+    <string name="debug_enable_sensitive_logging_label">"Slå på debug-logging av sensitiv informasjon? (Kan vise passord i logger.)"</string>
     <string name="message_list_load_more_messages_action">"Hent flere meldinger"</string>
     <string name="message_compose_to_hint">"Til"</string>
     <string name="message_compose_cc_hint">"Kopi"</string>
     <string name="message_compose_bcc_hint">"Blindkopi"</string>
     <string name="message_compose_subject_hint">"Emne"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"Skriv e-post"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%s</xliff:g>"\n"From: <xliff:g id="SENDER">%s</xliff:g>"\n"To: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Sitert tekst"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e71de77a3..b209fd167 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"Verbindingsfout"</string>
     <string name="status_loading_more_failed">"Probeer opnieuw meer berichten te laden"</string>
     <string name="notification_new_title">"Nieuwe e-mail"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ongelezen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ongelezen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ongelezen (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
+    <item quantity="other">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"Postvak IN"</string>
     <string name="accounts_welcome">"Welkom bij E-mail instellen."\n\n"Je kunt elke account gebruiken met E-mail."\n\n"De meest populaire e-mailaccounts kunnen in twee stappen worden ingesteld."</string>
     <string name="debug_version_fmt">"Versie: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"Cc"</string>
     <string name="message_compose_bcc_hint">"Bcc"</string>
     <string name="message_compose_subject_hint">"Onderwerp"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"Nieuw bericht"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Oorspronkelijk bericht --------"\n"Onderwerp: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Van: <xliff:g id="SENDER">%s</xliff:g>"\n"Aan: <xliff:g id="TO">%s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>schreef:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Geciteerde tekst"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"Bericht verwijderd."</string>
     <string name="message_discarded_toast">"Bericht wordt verwijderd"</string>
     <string name="message_saved_toast">"Bericht opgeslagen als concept."</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"Contactpersoon toevoegen"</string>
+    <string name="add_contact_dlg_message_fmt">"Voeg \"<xliff:g id="EMAIL">%s</xliff:g>\" toe aan contactpersonen"</string>
     <string name="account_setup_basics_title">"E-mail instellen"</string>
     <string name="account_setup_basics_instructions">"Typ het e-mailadres van je account:"</string>
     <string name="account_setup_basics_email_hint">"E-mailadres"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ab4f036cc..3c1ca1da7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"Błąd połączenia"</string>
     <string name="status_loading_more_failed">"Ponów próbę załadowania większej liczby wiadomości"</string>
     <string name="notification_new_title">"Nowa wiadomość e-mail"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"Nieprzeczytane: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"Nieprzeczytane: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"Nieprzeczytane: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"na <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontach"</item>
+    <item quantity="other">"na <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontach"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"Odebrane"</string>
     <string name="accounts_welcome">"Zapraszamy do skonfigurowania poczty e-mail!"\n\n"W tej usłudze można korzystać z dowolnego konta e-mail."\n\n"Konfiguracja najpopularniejszych kont e-mail składa się z tylko 2 etapów."</string>
     <string name="debug_version_fmt">"Wersja: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"DW"</string>
     <string name="message_compose_bcc_hint">"UDW"</string>
     <string name="message_compose_subject_hint">"Temat"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"Utwórz wiadomość"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Wiadomość oryginalna --------"\n"Temat: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Od: <xliff:g id="SENDER">%s</xliff:g>"\n"Do: <xliff:g id="TO">%s</xliff:g>"\n"DW: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"Użytkownik <xliff:g id="SENDER">%s</xliff:g> napisał:"\n\n</string>
     <string name="message_compose_quoted_text_label">"Cytowany tekst"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"Wiadomość została usunięta."</string>
     <string name="message_discarded_toast">"Wiadomość została odrzucona."</string>
     <string name="message_saved_toast">"Wiadomość została zapisana jako wersja robocza."</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"Dodaj kontakt"</string>
+    <string name="add_contact_dlg_message_fmt">"Dodaj adres „<xliff:g id="EMAIL">%s</xliff:g>” do kontaktów"</string>
     <string name="account_setup_basics_title">"Skonfiguruj konto e-mail"</string>
     <string name="account_setup_basics_instructions">"Podaj adres e-mail swojego konta:"</string>
     <string name="account_setup_basics_email_hint">"Adres e-mail"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 805e85d07..58ee0cfa1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"Ошибка подключения"</string>
     <string name="status_loading_more_failed">"Повторить попытку загрузки остальных писем"</string>
     <string name="notification_new_title">"Новое письмо"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"Непрочитанных: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"Непрочитанных: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"Непрочитанных: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"в нескольких (<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>) аккаунтах"</item>
+    <item quantity="other">"в нескольких (<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g>) аккаунтах"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"Входящие"</string>
     <string name="accounts_welcome">"Добро пожаловать на страницу настройки электронной почты."\n\n"С нашей почтовой системой можно использовать любой аккаунт электронной почты."\n\n"Самые распространенные аккаунты электронной почты можно настроить за 2 шага."</string>
     <string name="debug_version_fmt">"Версия: <xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"Копия"</string>
     <string name="message_compose_bcc_hint">"Скрытая"</string>
     <string name="message_compose_subject_hint">"Тема"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"Написать письмо"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- Исходное сообщение --------"\n"Тема: <xliff:g id="SUBJECT">%s</xliff:g>"\n"От: <xliff:g id="SENDER">%s</xliff:g>"\n"Кому: <xliff:g id="TO">%s</xliff:g>"\n"Копия: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> написал(а):"\n\n</string>
     <string name="message_compose_quoted_text_label">"Цитируемый текст"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"Письмо удалено."</string>
     <string name="message_discarded_toast">"Письмо не сохранено."</string>
     <string name="message_saved_toast">"Письмо сохранено как черновик."</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"Добавить контакт"</string>
+    <string name="add_contact_dlg_message_fmt">"Добавить адрес <xliff:g id="EMAIL">%s</xliff:g> в контакты"</string>
     <string name="account_setup_basics_title">"Настройка электронной почты"</string>
     <string name="account_setup_basics_instructions">"Укажите почтовый адрес своего аккаунта:"</string>
     <string name="account_setup_basics_email_hint">"Адрес электронной почты"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2e0614814..2964b889c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"连接错误"</string>
     <string name="status_loading_more_failed">"重新尝试载入更多邮件"</string>
     <string name="notification_new_title">"新电子邮件"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"有 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未读邮件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"有 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未读邮件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"有 <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未读邮件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"在 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 个帐户中"</item>
+    <item quantity="other">"在 <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 个帐户中"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"收件箱"</string>
     <string name="accounts_welcome">"欢迎设置电子邮件！"\n\n"在此可使用任意电子邮件帐户。"\n\n"大多数常见的电子邮件帐户通过 2 步即可完成设置！"</string>
     <string name="debug_version_fmt">"版本：<xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"抄送"</string>
     <string name="message_compose_bcc_hint">"密送"</string>
     <string name="message_compose_subject_hint">"主题"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"撰写邮件"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"-------- 原始邮件 --------"\n"主题：<xliff:g id="SUBJECT">%s</xliff:g>"\n"发件人：<xliff:g id="SENDER">%s</xliff:g>"\n"收件人：<xliff:g id="TO">%s</xliff:g>"\n"抄送：<xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>写道："\n\n</string>
     <string name="message_compose_quoted_text_label">"引用文字"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"邮件已删除。"</string>
     <string name="message_discarded_toast">"邮件已取消。"</string>
     <string name="message_saved_toast">"邮件已另存为草稿。"</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"添加联系人"</string>
+    <string name="add_contact_dlg_message_fmt">"将“<xliff:g id="EMAIL">%s</xliff:g>”添加到通讯录中"</string>
     <string name="account_setup_basics_title">"设置电子邮件"</string>
     <string name="account_setup_basics_instructions">"键入您的帐户电子邮件地址："</string>
     <string name="account_setup_basics_email_hint">"电子邮件地址"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d2345e1d9..093ba286f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -50,11 +50,15 @@
     <string name="status_network_error">"連線錯誤"</string>
     <string name="status_loading_more_failed">"重新載入更多郵件"</string>
     <string name="notification_new_title">"新電子郵件"</string>
-    <!-- no translation found for notification_new_one_account_fmt:one (3422945912787702191) -->
-    <!-- no translation found for notification_new_one_account_fmt:few (6543078667692990869) -->
-    <!-- no translation found for notification_new_one_account_fmt:other (6937673814351448076) -->
-    <!-- no translation found for notification_new_multi_account_fmt:few (1991747245324120305) -->
-    <!-- no translation found for notification_new_multi_account_fmt:other (2723797835410343458) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未讀取郵件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="few">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未讀取郵件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+    <item quantity="other">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> 封未讀取郵件 (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 個帳戶"</item>
+    <item quantity="other">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> 個帳戶"</item>
+  </plurals>
     <string name="special_mailbox_name_inbox">"收件匣"</string>
     <string name="accounts_welcome">"歡迎使用 [電子郵件] 設定！"\n\n"[電子郵件] 設定可讓您使用各種電子郵件帳戶！"\n\n"大部分常見的電子郵件只需要兩個步驟就能設定完成！"</string>
     <string name="debug_version_fmt">"版本：<xliff:g id="VERSION">%s</xliff:g>"</string>
@@ -65,8 +69,7 @@
     <string name="message_compose_cc_hint">"副本"</string>
     <string name="message_compose_bcc_hint">"密件副本"</string>
     <string name="message_compose_subject_hint">"主旨"</string>
-    <!-- no translation found for message_compose_body_hint (7575406246484103697) -->
-    <skip />
+    <string name="message_compose_body_hint">"撰寫郵件"</string>
     <string name="message_compose_fwd_header_fmt">\n\n"--------原始郵件 --------"\n"主旨：<xliff:g id="SUBJECT">%s</xliff:g>"\n"寄件者：<xliff:g id="SENDER">%s</xliff:g>"\n"收件者：<xliff:g id="TO">%s</xliff:g>"\n"副本：<xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>提到："\n\n</string>
     <string name="message_compose_quoted_text_label">"引用的文字"</string>
@@ -84,10 +87,8 @@
     <string name="message_deleted_toast">"已刪除郵件。"</string>
     <string name="message_discarded_toast">"已捨棄郵件。"</string>
     <string name="message_saved_toast">"已儲存郵件草稿。"</string>
-    <!-- no translation found for add_contact_dlg_title (7424641029188006580) -->
-    <skip />
-    <!-- no translation found for add_contact_dlg_message_fmt (4470846346726847478) -->
-    <skip />
+    <string name="add_contact_dlg_title">"新增聯絡人"</string>
+    <string name="add_contact_dlg_message_fmt">"將「<xliff:g id="EMAIL">%s</xliff:g>」新增為聯絡人"</string>
     <string name="account_setup_basics_title">"設定電子郵件"</string>
     <string name="account_setup_basics_instructions">"請輸入您帳戶的電子郵件地址："</string>
     <string name="account_setup_basics_email_hint">"電子郵件地址"</string>