Import translations. DO NOT MERGE

Change-Id: I7e7ab90e7324e9070d354d0ac04770d505aa9c48
Auto-generated-cl: translation import
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5ca0c1d..120bf99 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -154,7 +154,7 @@
     <item quantity="other" msgid="1685896770174368261">"Skuif <xliff:g id="ID_1">%1$d</xliff:g> gesprekke"</item>
   </plurals>
     <string name="content_description" msgid="517417382820459541">"<xliff:g id="SENDER">%1$s</xliff:g> oor <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> op <xliff:g id="DATE">%4$s</xliff:g>"</string>
-    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> oor <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> op <xliff:g id="TIME">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> oor <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> om <xliff:g id="TIME">%4$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Boodskap as konsep gestoor."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Stuur tans boodskap na uitkassie..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Stuur tans boodskap…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Die adres <xliff:g id="WRONGEMAIL">%s</xliff:g> is ongeldig."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Wys aangehaalde teks"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Versteek aangehaalde teks"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8115fc8..4d215fd 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> በ<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> በኩል"</string>
     <string name="message_saved" msgid="7073947895562277576">"መልዕክት እንደረቂቅ ተቀምጧል።"</string>
-    <string name="sending_message" msgid="2822171587017313151">"መልዕክት ወደ ወጪ መልዕክት ሳጥን በመላክ ላይ…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"መልዕክት በመላክ ላይ…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> አድራሻ ልክ አይደለም።"</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ ትምህርተ ጥቅስ የተደረገባቸውን ፅሁፎች አሳይ"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ ትምህርተ ጥቅስ የተደረገባቸውን ፅሁፎች ደብቅ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 555ff4c..a2751d8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> عبر <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"تمّ حفظ الرسالة كمسودة."</string>
-    <string name="sending_message" msgid="2822171587017313151">"جارٍ إرسال رسالة إلى البريد الصادر..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"جارٍ إرسال الرسالة…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"العنوان <xliff:g id="WRONGEMAIL">%s</xliff:g> غير صالح."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ عرض النص المقتبس"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ إخفاء النص المقتبس"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index fe8dac2..3bf7437 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> праз <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Паведамленне захавана як чарнавік."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Адпраўка паведамленняў у \"Адпраўленыя\""</string>
+    <string name="sending_message" msgid="1498583163419122128">"Адпраўка паведамлення..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адрас <xliff:g id="WRONGEMAIL">%s</xliff:g> несапраўдны."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Паказаць цытуемы тэкст"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Схаваць цытуемы тэкст"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c15560b..2c9a737 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="EMAIL">%2$s</xliff:g>)"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="EMAIL">%2$s</xliff:g>) чрез <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Съобщението е запазено като чернова."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Съобщението се изпраща към „Изх. поща“…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Съобщението се изпраща…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адресът <xliff:g id="WRONGEMAIL">%s</xliff:g> е невалиден."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Показване на цитирания текст"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Скриване на цитирания текст"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c49a69c..bcd4ff3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -153,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Mou la conversa"</item>
     <item quantity="other" msgid="1685896770174368261">"Mou <xliff:g id="ID_1">%1$d</xliff:g> converses"</item>
   </plurals>
-    <!-- no translation found for content_description (517417382820459541) -->
-    <skip />
-    <!-- no translation found for content_description_today (3358818622191430053) -->
-    <skip />
+    <string name="content_description" msgid="517417382820459541">"<xliff:g id="SENDER">%1$s</xliff:g> sobre <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> el dia <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> sobre <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> a les <xliff:g id="TIME">%4$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -295,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> a través de <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Missatge desat com a esborrany."</string>
-    <string name="sending_message" msgid="2822171587017313151">"S\'està enviant el missatge a la bústia de sortida…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"S\'està enviant el missatge…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"L\'adreça <xliff:g id="WRONGEMAIL">%s</xliff:g> no és vàlida."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Mostra el text citat"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Amaga el text citat"</string>
@@ -371,10 +369,8 @@
     <string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
     <string name="compose_component_name" msgid="1673799619444668402">"com.android.mail.compose.ComposeActivity"</string>
     <string name="autosend_component_name" msgid="3204704549005619187"></string>
-    <!-- no translation found for senders_split_token (5895854795157860258) -->
-    <skip />
-    <!-- no translation found for draft_count_format (4869620346730961822) -->
-    <skip />
+    <string name="senders_split_token" msgid="5895854795157860258">", "</string>
+    <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Totes les carpetes"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetes recents"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e15416f..3dc7dc0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -153,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Přesunout konverzaci"</item>
     <item quantity="other" msgid="1685896770174368261">"Přesunutí <xliff:g id="ID_1">%1$d</xliff:g> konverzací"</item>
   </plurals>
-    <!-- no translation found for content_description (517417382820459541) -->
-    <skip />
-    <!-- no translation found for content_description_today (3358818622191430053) -->
-    <skip />
+    <string name="content_description" msgid="517417382820459541">"<xliff:g id="SENDER">%1$s</xliff:g> na téma <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> dne <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> na téma <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> v <xliff:g id="TIME">%4$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -295,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> přes <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Zpráva byla uložena jako koncept."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Přesouvání zprávy do pošty k odeslání…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Odesílání zprávy…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> je neplatná."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Zobrazit citovaný text"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Skrýt citovaný text"</string>
@@ -371,10 +369,8 @@
     <string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
     <string name="compose_component_name" msgid="1673799619444668402">"com.android.mail.compose.ComposeActivity"</string>
     <string name="autosend_component_name" msgid="3204704549005619187"></string>
-    <!-- no translation found for senders_split_token (5895854795157860258) -->
-    <skip />
-    <!-- no translation found for draft_count_format (4869620346730961822) -->
-    <skip />
+    <string name="senders_split_token" msgid="5895854795157860258">", "</string>
+    <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Všechny složky"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Poslední složky"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f66ebfd..f472383 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Meddelelsen er gemt som kladde."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Sender meddelelse til udbakke..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Sender meddelelsen..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> er ugyldig."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Vis citeret tekst"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Skjul citeret tekst"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1836693..847c800 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> über <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Nachricht wurde als Entwurf gespeichert."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Nachricht wird an Postausgang gesendet…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Nachricht wird gesendet…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Die Adresse <xliff:g id="WRONGEMAIL">%s</xliff:g> ist ungültig."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Zitierten Text anzeigen"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Zitierten Text ausblenden"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b202c4d..3a2bffe 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -153,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Μετακίνηση συνομιλίας"</item>
     <item quantity="other" msgid="1685896770174368261">"Μετακίνηση <xliff:g id="ID_1">%1$d</xliff:g> συνομιλιών"</item>
   </plurals>
-    <!-- no translation found for content_description (517417382820459541) -->
-    <skip />
-    <!-- no translation found for content_description_today (3358818622191430053) -->
-    <skip />
+    <string name="content_description" msgid="517417382820459541">"<xliff:g id="SENDER">%1$s</xliff:g> σχετικά με <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> στις <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> σχετικά με <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> στις <xliff:g id="TIME">%4$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -295,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> μέσω <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Το μήνυμα αποθηκεύτηκε ως πρόχειρο."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Αποστολή μηνύματος στα Προς αποστολή…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Αποστολή μηνύματος..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Η διεύθυνση <xliff:g id="WRONGEMAIL">%s</xliff:g> δεν είναι έγκυρη."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Εμφάνιση αναφερόμενου κειμένου"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Απόκρυψη αναφερόμενου κειμένου"</string>
@@ -371,10 +369,8 @@
     <string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
     <string name="compose_component_name" msgid="1673799619444668402">"com.android.mail.compose.ComposeActivity"</string>
     <string name="autosend_component_name" msgid="3204704549005619187"></string>
-    <!-- no translation found for senders_split_token (5895854795157860258) -->
-    <skip />
-    <!-- no translation found for draft_count_format (4869620346730961822) -->
-    <skip />
+    <string name="senders_split_token" msgid="5895854795157860258">", "</string>
+    <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Όλοι οι φάκελοι"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Πρόσφατοι φάκελοι"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6842f2a..057c72d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -153,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Move conversation"</item>
     <item quantity="other" msgid="1685896770174368261">"Move <xliff:g id="ID_1">%1$d</xliff:g> conversations"</item>
   </plurals>
-    <!-- no translation found for content_description (517417382820459541) -->
-    <skip />
-    <!-- no translation found for content_description_today (3358818622191430053) -->
-    <skip />
+    <string name="content_description" msgid="517417382820459541">"<xliff:g id="SENDER">%1$s</xliff:g> about <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> on <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> about <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> at <xliff:g id="TIME">%4$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -295,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Message saved as draft."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Sending message to outbox…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Sending message…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"The address <xliff:g id="WRONGEMAIL">%s</xliff:g> is invalid."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Show quoted text"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Hide quoted text"</string>
@@ -371,10 +369,8 @@
     <string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
     <string name="compose_component_name" msgid="1673799619444668402">"com.android.mail.compose.ComposeActivity"</string>
     <string name="autosend_component_name" msgid="3204704549005619187"></string>
-    <!-- no translation found for senders_split_token (5895854795157860258) -->
-    <skip />
-    <!-- no translation found for draft_count_format (4869620346730961822) -->
-    <skip />
+    <string name="senders_split_token" msgid="5895854795157860258">", "</string>
+    <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"All folders"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Recent folders"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3dbe7e0..244a2b3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -154,7 +154,7 @@
     <item quantity="other" msgid="1685896770174368261">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversaciones"</item>
   </plurals>
     <string name="content_description" msgid="517417382820459541">"<xliff:g id="SENDER">%1$s</xliff:g> acerca de <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> el <xliff:g id="DATE">%4$s</xliff:g>"</string>
-    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> acerca de <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> a la(s) <xliff:g id="TIME">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> acerca de <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> a la hora <xliff:g id="TIME">%4$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> a través de <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Mensaje guardado como borrador"</string>
-    <string name="sending_message" msgid="2822171587017313151">"Enviando mensaje a Enviados…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Enviando mensaje…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"La dirección <xliff:g id="WRONGEMAIL">%s</xliff:g> no es válida."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Mostrar el texto citado"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar el texto citado"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 42588d1..7e98ebf 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> a través de <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Mensaje guardado como borrador"</string>
-    <string name="sending_message" msgid="2822171587017313151">"Enviando mensaje a bandeja de salida…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Enviando mensaje..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"La dirección <xliff:g id="WRONGEMAIL">%s</xliff:g> no es válida."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Mostrar texto citado"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto citado"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8eac3be..6b22ecd 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> dom. <xliff:g id="VIA_DOMAIN">%3$s</xliff:g> kaudu"</string>
     <string name="message_saved" msgid="7073947895562277576">"Sõnum salvestati mustandina."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Sõnumi väljundkausta saatmine …"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Sõnumi saatmine ..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Aadress <xliff:g id="WRONGEMAIL">%s</xliff:g> on kehtetu."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Kuva osundatud tekst"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Peida osundatud tekst"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 66074d1..c6f1ed8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> از طریق <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"پیام به‌عنوان پیش‌نویس ذخیره شد."</string>
-    <string name="sending_message" msgid="2822171587017313151">"ارسال پیام به صندوق ارسال..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"در حال ارسال پیام..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"آدرس <xliff:g id="WRONGEMAIL">%s</xliff:g> معتبر نیست."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ نمایش نوشتار نقل قول شده"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ پنهان کردن نوشتار نقل قول شده"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6fa49d6..a205160 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> toimialueelta <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Viesti tallennettu luonnokseksi."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Lähetetään viestiä lähetettyihin..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Lähetetään viestiä…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Osoite <xliff:g id="WRONGEMAIL">%s</xliff:g> ei kelpaa."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Näytä lainattu teksti"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Piilota lainattu teksti"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7f6fbff..80fb1ec 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Brouillon enregistré."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Envoi du message à la boîte d\'envoi en cours…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Envoi du message en cours…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"L\'adresse <xliff:g id="WRONGEMAIL">%s</xliff:g> est incorrecte."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Afficher le texte des messages précédents"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Masquer le texte des messages précédents"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index dfaf3bb..0a7bc23 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> के द्वारा <xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"संदेश ड्राफ़्ट के रूप में सहेजा गया."</string>
-    <string name="sending_message" msgid="2822171587017313151">"आउटबॉक्स पर संदेश भेज रहा है…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"संदेश भेज रहा है..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> पता अमान्‍य है."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ उद्धृत पाठ दिखाएं"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ उद्धृत पाठ छिपाएं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 520c9de..91eabed 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="EMAIL">%2$s</xliff:g> putem <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Poruka je spremljena kao skica."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Slanje poruke u odlaznu poštu…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Slanje poruke…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> nije važeća."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Prikaži citirani tekst"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Sakrij citirani tekst"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7e6477b..8c01279 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="EMAIL">%2$s</xliff:g> | <xliff:g id="VIA_DOMAIN">%3$s</xliff:g> útján"</string>
     <string name="message_saved" msgid="7073947895562277576">"Az üzenet mentve piszkozatként."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Üzenet küldése a kimenő postafiókba..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Üzenet küldése…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"A(z) <xliff:g id="WRONGEMAIL">%s</xliff:g> cím érvénytelen."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Idézett szöveg megjelenítése"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Idézett szöveg elrejtése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3112dcc..00ecbde 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> melalui <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Pesan disimpan sebagai draf."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Mengirim pesan ke kotak keluar…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Mengirim pesan…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak valid."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Tampilkan kutipan teks"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan kutipan teks"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7002946..cf2d9f7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> tramite <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Messaggio salvato come bozza."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Invio del messaggio alla Posta in uscita…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Invio messaggio..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"L\'indirizzo <xliff:g id="WRONGEMAIL">%s</xliff:g> non è valido."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Mostra testo citato"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Nascondi testo citato"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 09985e3..a5cc55e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -26,10 +26,8 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"צרף קובץ"</string>
-    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
-    <skip />
-    <!-- no translation found for add_video_attachment (8916625983712820173) -->
-    <skip />
+    <string name="add_photo_attachment" msgid="3738882100645552858">"צרף תמונה"</string>
+    <string name="add_video_attachment" msgid="8916625983712820173">"צרף סרטון"</string>
     <string name="save_draft" msgid="5555744208032445632">"שמור טיוטה"</string>
     <string name="discard" msgid="1714960202994370243">"מחק"</string>
     <string name="compose" msgid="1473559896062432878">"כתוב"</string>
@@ -293,7 +291,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> דרך <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"ההודעה נשמרה כטיוטה."</string>
-    <string name="sending_message" msgid="2822171587017313151">"שולח הודעה לתיבת הדואר היוצא…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"שולח הודעה…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"הכתובת <xliff:g id="WRONGEMAIL">%s</xliff:g> אינה חוקית."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ הצג טקסט מצוטט"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ הסתר טקסט מצוטט"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 208f233..08874ce 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>経由の<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"メッセージを下書きとして保存しました。"</string>
-    <string name="sending_message" msgid="2822171587017313151">"送信トレイにメッセージを送信しています…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"メールを送信中..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"アドレス<xliff:g id="WRONGEMAIL">%s</xliff:g>は無効です。"</string>
     <string name="show_elided" msgid="5255917904110437886">"▶元のメッセージを表示"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼元のメッセージを隠す"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9994819..203ec84 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>(도메인: <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>)"</string>
     <string name="message_saved" msgid="7073947895562277576">"메일이 임시보관함에 저장되었습니다."</string>
-    <string name="sending_message" msgid="2822171587017313151">"보낼편지함에 메일 전송 중…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"메일 보내는 중..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"주소(<xliff:g id="WRONGEMAIL">%s</xliff:g>)가 잘못되었습니다."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ 받은메일 표시"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ 받은메일 숨기기"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0fa836a..803c2d6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> per <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Pranešimas išsaugotas kaip juodraštis."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Pranešimas siunčiamas į išsiųstuosius…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Siunčiamas pranešimas…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresas <xliff:g id="WRONGEMAIL">%s</xliff:g> yra neteisingas."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Rodyti citatą"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Slėpti citatą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index dd29978..6deebdd 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="EMAIL">%2$s</xliff:g>, izmantojot <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Ziņojums ir saglabāts kā melnraksts."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Notiek ziņojuma sūtīšana uz izsūtni…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Notiek ziņojuma sūtīšana…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adrese <xliff:g id="WRONGEMAIL">%s</xliff:g> nav derīga."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Rādīt citēto tekstu"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Paslēpt citēto tekstu"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index d5ae891..003d50e 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> melalui <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Mesej disimpan sebagai draf."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Menghantar mesej ke peti keluar..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Menghantar mesej..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak sah."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Tunjukkan teks yang dipetik"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan teks yang dipetik"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 38f6a43..d42c190 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="EMAIL">%2$s</xliff:g>) via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"E-posten er lagret som utkast."</string>
-    <string name="sending_message" msgid="2822171587017313151">"E-posten sendes til utboksen ..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Sender e-post …"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> er ugyldig."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Vis sitert tekst"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Skjul sitert tekst"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 349a913..61dc07c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Bericht opgeslagen als concept."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Bericht verzenden naar Postvak UIT…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Bericht wordt verzonden…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Het adres \'<xliff:g id="WRONGEMAIL">%s</xliff:g>\' is ongeldig."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Tekst uit oorspronkelijk bericht weergeven"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Tekst uit oorspronkelijk bericht verbergen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 56b8bd5..0340f9e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -291,7 +291,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> przez <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Wiadomość została zapisana jako wersja robocza."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Wysyłam wiadomość do skrzynki nadawczej…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Wysyłanie wiadomości…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adres <xliff:g id="WRONGEMAIL">%s</xliff:g> jest nieprawidłowy."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Pokaż cytowany tekst"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ukryj cytowany tekst"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b739f2c..016bca6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -153,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Mover conversa"</item>
     <item quantity="other" msgid="1685896770174368261">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversas"</item>
   </plurals>
-    <!-- no translation found for content_description (517417382820459541) -->
-    <skip />
-    <!-- no translation found for content_description_today (3358818622191430053) -->
-    <skip />
+    <string name="content_description" msgid="517417382820459541">"<xliff:g id="SENDER">%1$s</xliff:g> sobre <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> em <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> sobre <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> às <xliff:g id="TIME">%4$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -295,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Mensagem guardada como rascunho."</string>
-    <string name="sending_message" msgid="2822171587017313151">"A enviar mensagem para caixa de saída..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"A enviar mensagem..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"O endereço <xliff:g id="WRONGEMAIL">%s</xliff:g> não é válido."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Mostrar texto citado"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto citado"</string>
@@ -371,10 +369,8 @@
     <string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
     <string name="compose_component_name" msgid="1673799619444668402">"com.android.mail.compose.ComposeActivity"</string>
     <string name="autosend_component_name" msgid="3204704549005619187"></string>
-    <!-- no translation found for senders_split_token (5895854795157860258) -->
-    <skip />
-    <!-- no translation found for draft_count_format (4869620346730961822) -->
-    <skip />
+    <string name="senders_split_token" msgid="5895854795157860258">", "</string>
+    <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"Todas as pastas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Pastas recentes"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6e98599..554f3b5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> por <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Mensagem salva como rascunho."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Enviando a mensagem para a caixa de saída..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Enviando mensagem…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"O endereço <xliff:g id="WRONGEMAIL">%s</xliff:g> é inválido."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Exibir texto das mensagens anteriores"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto das mensagens anteriores"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index c6c08f5..742ad6e 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -407,7 +407,7 @@
     <skip />
     <!-- no translation found for message_saved (7073947895562277576) -->
     <skip />
-    <!-- no translation found for sending_message (2822171587017313151) -->
+    <!-- no translation found for sending_message (1498583163419122128) -->
     <skip />
     <!-- no translation found for invalid_recipient (2161317422860961623) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ab8347a..62b2503 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> prin <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Mesaj salvat ca mesaj nefinalizat."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Se trimite mesajul în Mesaje de trimis…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Se trimite mesajul..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> este nevalidă."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Afişaţi textul citat"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ascundeţi textul citat"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c35d52c..e3186db 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -153,8 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Переместить цепочку"</item>
     <item quantity="other" msgid="1685896770174368261">"Переместить цепочки (<xliff:g id="ID_1">%1$d</xliff:g>)"</item>
   </plurals>
-    <string name="content_description" msgid="517417382820459541">"Отправитель: <xliff:g id="SENDER">%1$s</xliff:g>; тема: <xliff:g id="SUBJECT">%2$s</xliff:g>; <xliff:g id="SNIPPET">%3$s</xliff:g> <xliff:g id="DATE">%4$s</xliff:g>"</string>
-    <string name="content_description_today" msgid="3358818622191430053">"Отправитель: <xliff:g id="SENDER">%1$s</xliff:g>; тема: <xliff:g id="SUBJECT">%2$s</xliff:g>; <xliff:g id="SNIPPET">%3$s</xliff:g> в <xliff:g id="TIME">%4$s</xliff:g>"</string>
+    <string name="content_description" msgid="517417382820459541">"Отправитель: <xliff:g id="SENDER">%1$s</xliff:g>; тема: <xliff:g id="SUBJECT">%2$s</xliff:g> – <xliff:g id="SNIPPET">%3$s</xliff:g> – <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"Отправитель: <xliff:g id="SENDER">%1$s</xliff:g>; тема: <xliff:g id="SUBJECT">%2$s</xliff:g> – <xliff:g id="SNIPPET">%3$s</xliff:g> – <xliff:g id="TIME">%4$s</xliff:g>"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="EMAIL">%2$s</xliff:g>)"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="EMAIL">%2$s</xliff:g> из домена <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>)"</string>
     <string name="message_saved" msgid="7073947895562277576">"Черновик сообщения сохранен."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Отправка сообщения в исходящие…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Отправка сообщения…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Недействительный адрес: <xliff:g id="WRONGEMAIL">%s</xliff:g>."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Показать цитируемый текст"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Скрыть цитируемый текст"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 1a2a60a..e6a80ef 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> cez doménu <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Správa bola uložená ako koncept."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Odosielanie správy do pošty na odoslanie..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Prebieha odosielanie správy..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> je neplatná."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Zobraziť citovaný text"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Skryť citovaný text"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a4f0fc1..32e3922 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> prek domene <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Sporočilo shranjeno kot osnutek."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Pošiljanje sporočil v mapo Odpošlji ..."</string>
+    <string name="sending_message" msgid="1498583163419122128">"Pošiljanje sporočila ..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Naslov <xliff:g id="WRONGEMAIL">%s</xliff:g> je neveljaven."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Pokaži citirano besedilo"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Skrij citirano besedilo"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f1563e5..ccf046b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> преко <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Порука је сачувана као недовршена."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Слање поруке у директоријум За слање…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Слање поруке…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> је неважећа."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Прикажи наведени текст"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Сакриј наведени текст"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 04d65bb..4379c0b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Meddelande sparat som utkast."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Meddelandet skickas till utkorgen …"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Skickar meddelande …"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> är ogiltig."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Visa citerad text"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Dölj citerad text"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d40dab4..9ad77b9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -179,7 +179,7 @@
   </plurals>
     <string name="confirm_discard_text" msgid="1149834186404614612">"Ujumbe huu utupwe?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Hakuna mazungumzo."</string>
-    <string name="undo" msgid="6070869718469782251">"Tengua"</string>
+    <string name="undo" msgid="6070869718469782251">"Tendua"</string>
   <plurals name="conversation_marking_read">
     <item quantity="one" msgid="394911867474214874">"Inatia alama kuwa mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> yamesomwa."</item>
     <item quantity="other" msgid="247178462544083532">"Inatia alama kuwa mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> yamesomwa."</item>
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> kupitia <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Ujumbe umehifadhiwa kama rasimu."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Inatuma ujumbe kwenye kikasha ondozi…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Inatuma ujumbe…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Anwani <xliff:g id="WRONGEMAIL">%s</xliff:g> ni batili."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Onyesha maandishi yaliyonukuliwa"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ficha maandishi yaliyonukuliwa"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 5b84cb5..a4d859c 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> ผ่าน <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"บันทึกข้อความเป็นร่างจดหมาย"</string>
-    <string name="sending_message" msgid="2822171587017313151">"กำลังส่งข้อความไปที่กล่องจดหมายออก…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"กำลังส่งข้อความ…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"ที่อยู่ <xliff:g id="WRONGEMAIL">%s</xliff:g> ไม่ถูกต้อง"</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ แสดงข้อความที่ยกมา"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ ซ่อนข้อความที่ยกมา"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0b5b3cf..e329b37 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> sa pamamagitan ng <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Na-save ang mensahe bilang draft."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Ipinapadala ang mensahe sa outbox…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Ipinapadala ang mensahe…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Ang address na <xliff:g id="WRONGEMAIL">%s</xliff:g> ay di-wasto."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Ipakita ang kasamang teksto"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Itago ang kasamang teksto"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cf54d73..bd1435d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> (<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> üzerinden)"</string>
     <string name="message_saved" msgid="7073947895562277576">"İleti taslak olarak kaydedildi."</string>
-    <string name="sending_message" msgid="2822171587017313151">"İleti Giden Kutusu\'na gönderiliyor…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"İleti gönderiliyor..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> adresi geçersiz."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Alıntılanan metni göster"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Alıntılanan metni gizle"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e7eb649..307ba6e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> через <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Повідомлення збережено як чернетку."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Повідомлення надсилається в папку \"Вихідні\"…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Надсилання повідомлення…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> не дійсна."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Показати цитований текст"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Сховати цитований текст"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 25b49bb..75be0be 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> qua <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Đang gửi thư tới hộp thư đi…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Đang gửi tin nhắn…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Địa chỉ <xliff:g id="WRONGEMAIL">%s</xliff:g> không hợp lệ."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Hiển thị văn bản được trích dẫn"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Ẩn văn bản được trích dẫn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ed2976b..1d1ec10 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -153,8 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"移动会话"</item>
     <item quantity="other" msgid="1685896770174368261">"移动 <xliff:g id="ID_1">%1$d</xliff:g> 个会话"</item>
   </plurals>
-    <string name="content_description" msgid="517417382820459541">"<xliff:g id="SUBJECT">%2$s</xliff:g> • <xliff:g id="SNIPPET">%3$s</xliff:g>(<xliff:g id="DATE">%4$s</xliff:g>,来自 <xliff:g id="SENDER">%1$s</xliff:g>)"</string>
-    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SUBJECT">%2$s</xliff:g> • <xliff:g id="SNIPPET">%3$s</xliff:g>(<xliff:g id="TIME">%4$s</xliff:g>,来自 <xliff:g id="SENDER">%1$s</xliff:g>)"</string>
+    <string name="content_description" msgid="517417382820459541">"发自<xliff:g id="SENDER">%1$s</xliff:g>,<xliff:g id="SUBJECT">%2$s</xliff:g>,<xliff:g id="SNIPPET">%3$s</xliff:g>,发件时间为 <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"发自<xliff:g id="SENDER">%1$s</xliff:g>,<xliff:g id="SUBJECT">%2$s</xliff:g>,<xliff:g id="SNIPPET">%3$s</xliff:g>(<xliff:g id="TIME">%4$s</xliff:g>,来自 )"</string>
     <string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
   <plurals name="draft">
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> 来自 <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"邮件已另存为草稿。"</string>
-    <string name="sending_message" msgid="2822171587017313151">"正在将邮件送到发件箱…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"正在发送邮件..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 无效。"</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ 显示引用文字"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ 隐藏引用文字"</string>
@@ -369,7 +369,7 @@
     <string name="hierarchical_folder_top" msgid="7574690149481839837">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕"</string>
     <string name="compose_component_name" msgid="1673799619444668402">"com.android.mail.compose.ComposeActivity"</string>
     <string name="autosend_component_name" msgid="3204704549005619187"></string>
-    <string name="senders_split_token" msgid="5895854795157860258">", "</string>
+    <string name="senders_split_token" msgid="5895854795157860258">"、"</string>
     <string name="draft_count_format" msgid="4869620346730961822">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
     <string name="all_folders_heading" msgid="2506843494725730618">"所有文件夹"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"近期文件夹"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3a874d2..a1d3d1d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g>,<xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g>,<xliff:g id="EMAIL">%2$s</xliff:g> (來源網域:<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>)"</string>
     <string name="message_saved" msgid="7073947895562277576">"已儲存郵件草稿。"</string>
-    <string name="sending_message" msgid="2822171587017313151">"正在將郵件傳送到寄件匣…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"正在傳送郵件…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 無效。"</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ 顯示引用文字"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ 隱藏引用文字"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 51af103..5cc8e3c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -293,7 +293,7 @@
     <string name="address_display_format" msgid="3581303608028992576">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g>"</string>
     <string name="address_display_format_with_via_domain" msgid="2316262813990842490">"<xliff:g id="NAME">%1$s</xliff:g> <xliff:g id="EMAIL">%2$s</xliff:g> nge-<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
     <string name="message_saved" msgid="7073947895562277576">"Umlayezo ulondolozwe njengokusalungiswa."</string>
-    <string name="sending_message" msgid="2822171587017313151">"Ithumela umlayezo ebhokisini lokuphumayo…"</string>
+    <string name="sending_message" msgid="1498583163419122128">"Ithumela umlayezo..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Ikheli <xliff:g id="WRONGEMAIL">%s</xliff:g> alivumelekile."</string>
     <string name="show_elided" msgid="5255917904110437886">"▶ Bonisa umbhalo ocashuniwe"</string>
     <string name="hide_elided" msgid="8907305605854960737">"▼ Fihla umbhalo ocashuniwe"</string>