Import translations. DO NOT MERGE

Change-Id: I03348c018c860004ae0b447f50463df01641f545
Auto-generated-cl: translation import
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a704762..5ca0c1d 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Heg lêer aan"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Heg prent aan"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Heg video aan"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Stoor konsep"</string>
     <string name="discard" msgid="1714960202994370243">"Gooi weg"</string>
     <string name="compose" msgid="1473559896062432878">"Skryf"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Skuif gesprek"</item>
     <item quantity="other" msgid="1685896770174368261">"Skuif <xliff:g id="ID_1">%1$d</xliff:g> gesprekke"</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> 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="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">
@@ -369,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">"Alle vouers"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Onlangse vouers"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6dd6ef1..8115fc8 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"ፋይል አያይዝ"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"ስዕል አያይዝ"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"ቪዲዮ አያይዝ"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"ረቂቅ አስቀምጥ"</string>
     <string name="discard" msgid="1714960202994370243">"አስወግድ"</string>
     <string name="compose" msgid="1473559896062432878">"አዲስ ጻፍ"</string>
@@ -151,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">
@@ -369,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-ar/strings.xml b/res/values-ar/strings.xml
index 7fc06ab..555ff4c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"إرفاق ملف"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"إرفاق صورة"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"إرفاق فيديو"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"حفظ كمسودة"</string>
     <string name="discard" msgid="1714960202994370243">"إلغاء"</string>
     <string name="compose" msgid="1473559896062432878">"إنشاء"</string>
@@ -151,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">
@@ -369,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-be/strings.xml b/res/values-be/strings.xml
index 87758ed..fe8dac2 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Далучыць файл"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Далучыць фота"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Далучыць відэа"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Захаваць чарнавік"</string>
     <string name="discard" msgid="1714960202994370243">"Скасаваць"</string>
     <string name="compose" msgid="1473559896062432878">"Напісаць"</string>
@@ -151,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">
@@ -369,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">"Усе папкi"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Апошнія папкi"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f5a8070..c15560b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Прикачване на файл"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Прикачване на снимка"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Прикачване на клип"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Запазване на черновата"</string>
     <string name="discard" msgid="1714960202994370243">"Отхвърляне"</string>
     <string name="compose" msgid="1473559896062432878">"Ново съобщение"</string>
@@ -151,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">
@@ -369,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-ca/strings.xml b/res/values-ca/strings.xml
index 445040f..c49a69c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Adjunta un fitxer"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Adjunta una imatge"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Adjunta un vídeo"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Desa l\'esborrany"</string>
     <string name="discard" msgid="1714960202994370243">"Descarta"</string>
     <string name="compose" msgid="1473559896062432878">"Redacta"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9301820..e15416f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Přiložit soubor"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Připojit obrázek"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Připojit video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Uložit koncept"</string>
     <string name="discard" msgid="1714960202994370243">"Zahodit"</string>
     <string name="compose" msgid="1473559896062432878">"Napsat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 829ac7a..f66ebfd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Vedhæft fil"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Vedhæft billede"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Vedhæft video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Gem kladde"</string>
     <string name="discard" msgid="1714960202994370243">"Kassér"</string>
     <string name="compose" msgid="1473559896062432878">"Skriv"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Flyt samtale"</item>
     <item quantity="other" msgid="1685896770174368261">"Flyt <xliff:g id="ID_1">%1$d</xliff:g> samtaler"</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> om <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> den <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> om <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> kl. <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">
@@ -369,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">"Alle mapper"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Seneste mapper"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7a48bc6..1836693 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Datei anhängen"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Bild anhängen"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Video anhängen"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Entwurf speichern"</string>
     <string name="discard" msgid="1714960202994370243">"Verwerfen"</string>
     <string name="compose" msgid="1473559896062432878">"Schreiben"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Konversation verschieben"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> Konversationen verschieben"</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> über <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> am <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> über <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> um <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">
@@ -369,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">"Alle Ordner"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Letzte Ordner"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7830cd4..b202c4d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Επισύναψη αρχείου"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Επισύναψη εικόνας"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Επισύναψη βίντεο"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Αποθήκευση προχείρου"</string>
     <string name="discard" msgid="1714960202994370243">"Απόρριψη"</string>
     <string name="compose" msgid="1473559896062432878">"Σύνταξη"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c8ce4ba..6842f2a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Attach file"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Attach Picture"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Attach Video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Save draft"</string>
     <string name="discard" msgid="1714960202994370243">"Discard"</string>
     <string name="compose" msgid="1473559896062432878">"Compose"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 164e5dc..3dbe7e0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar un archivo"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Adjuntar imagen"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Adjuntar video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Guardar como borrador"</string>
     <string name="discard" msgid="1714960202994370243">"Descartar"</string>
     <string name="compose" msgid="1473559896062432878">"Redactar"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Mover conversación"</item>
     <item quantity="other" msgid="1685896770174368261">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversaciones"</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> 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="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">
@@ -369,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 las carpetas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetas recientes"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a1cce3f..42588d1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar archivo"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Adjuntar imagen"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Adjuntar vídeo"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Guardar borrador"</string>
     <string name="discard" msgid="1714960202994370243">"Descartar"</string>
     <string name="compose" msgid="1473559896062432878">"Redactar"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Mover una conversación"</item>
     <item quantity="other" msgid="1685896770174368261">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversaciones"</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 <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 las <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">
@@ -369,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 las carpetas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetas recientes"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index c9976f1..8eac3be 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Manusta fail"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Manusta pilt"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Manusta video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Salvesta mustand"</string>
     <string name="discard" msgid="1714960202994370243">"Loobu"</string>
     <string name="compose" msgid="1473559896062432878">"Koosta"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Meilivestluse teisaldamine"</item>
     <item quantity="other" msgid="1685896770174368261">"Teisalda <xliff:g id="ID_1">%1$d</xliff:g> meilivestlust"</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="DATE">%4$s</xliff:g> saatis <xliff:g id="SENDER">%1$s</xliff:g> teemal <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"Kell <xliff:g id="TIME">%4$s</xliff:g> saatis <xliff:g id="SENDER">%1$s</xliff:g> teemal <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$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">
@@ -369,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">"Kõik kaustad"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Hiljutised kaustad"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index efac26a..66074d1 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"پیوست کردن فایل"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"پیوست کردن تصویر"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"پیوست کردن ویدیو"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"ذخیره پیش‌نویس"</string>
     <string name="discard" msgid="1714960202994370243">"رد کردن"</string>
     <string name="compose" msgid="1473559896062432878">"نوشتن نامه"</string>
@@ -151,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="SNIPPET">%3$s</xliff:g>، <xliff:g id="SUBJECT">%2$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="SNIPPET">%3$s</xliff:g>، <xliff:g id="SUBJECT">%2$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">
@@ -369,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-fi/strings.xml b/res/values-fi/strings.xml
index cfc7f2f..6fa49d6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Liitä tiedosto"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Liitä kuva"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Liitä video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Tallenna luonnos"</string>
     <string name="discard" msgid="1714960202994370243">"Hylkää"</string>
     <string name="compose" msgid="1473559896062432878">"Viestin kirj."</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Siirrä keskustelu"</item>
     <item quantity="other" msgid="1685896770174368261">"Siirrä <xliff:g id="ID_1">%1$d</xliff:g> keskustelua"</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> aiheesta <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g>, päiväys <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> aiheesta <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g>, kello <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">
@@ -369,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">"Kaikki kansiot"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Viimeaikaiset kansiot"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 641db73..7f6fbff 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Joindre un fichier"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Joindre une photo"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Joindre une vidéo"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Enregistrer le brouillon"</string>
     <string name="discard" msgid="1714960202994370243">"Ignorer"</string>
     <string name="compose" msgid="1473559896062432878">"Nouveau message"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Déplacer la conversation"</item>
     <item quantity="other" msgid="1685896770174368261">"Déplacer <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> à propos de <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> le <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> à propos de <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">
@@ -369,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">"Tous les dossiers"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Dossiers récents"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8c93f74..dfaf3bb 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"फ़ाइल अनुलग्‍न करें"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"चित्र अनुलग्न करें"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"वीडियो अनुलग्न करें"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"ड्राफ़्ट सहेजें"</string>
     <string name="discard" msgid="1714960202994370243">"छोड़ें"</string>
     <string name="compose" msgid="1473559896062432878">"लिखें"</string>
@@ -151,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="SUBJECT">%2$s</xliff:g> के बारे में <xliff:g id="SENDER">%1$s</xliff:g>, <xliff:g id="DATE">%4$s</xliff:g> का <xliff:g id="SNIPPET">%3$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SUBJECT">%2$s</xliff:g> के बारे में <xliff:g id="SENDER">%1$s</xliff:g>, <xliff:g id="TIME">%4$s</xliff:g> का <xliff:g id="SNIPPET">%3$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">
@@ -369,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-hr/strings.xml b/res/values-hr/strings.xml
index e938d99..520c9de 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteku"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Priloži sliku"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Priloži videozapis"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Spremi skicu"</string>
     <string name="discard" msgid="1714960202994370243">"Odbaci"</string>
     <string name="compose" msgid="1473559896062432878">"Nova poruka"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Premjesti razgovor"</item>
     <item quantity="other" msgid="1685896770174368261">"Premjesti sljedeći broj razgovora: <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> o temi \"<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> o temi \"<xliff:g id="SUBJECT">%2$s</xliff:g>\", <xliff:g id="SNIPPET">%3$s</xliff:g> u <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">
@@ -369,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">"Sve mape"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nedavne mape"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1b29d53..7e6477b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Fájl csatolása"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Kép csatolása"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Videó csatolása"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Piszkozat mentése"</string>
     <string name="discard" msgid="1714960202994370243">"Elvetés"</string>
     <string name="compose" msgid="1473559896062432878">"Levélírás"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Beszélgetés áthelyezése"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> beszélgetés áthelyezése"</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> a következővel kapcsolatban: <xliff:g id="SUBJECT">%2$s</xliff:g> | <xliff:g id="SNIPPET">%3$s</xliff:g>, ezen a napon: <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> a következővel kapcsolatban: <xliff:g id="SUBJECT">%2$s</xliff:g> | <xliff:g id="SNIPPET">%3$s</xliff:g>, ekkor: <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">
@@ -369,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">"Összes mappa"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Legutóbbi mappák"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 1ac4429..3112dcc 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan file"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Lampirkan Gambar"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Lampirkan Video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Simpan draf"</string>
     <string name="discard" msgid="1714960202994370243">"Buang"</string>
     <string name="compose" msgid="1473559896062432878">"Tulis"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Pindahkan percakapan"</item>
     <item quantity="other" msgid="1685896770174368261">"Pindahkan <xliff:g id="ID_1">%1$d</xliff:g> percakapan"</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> tentang <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> pada tanggal <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> tentang <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> pukul <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">
@@ -369,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">"Semua folder"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Folder terbaru"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8136718..7002946 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Allega file"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Allega foto"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Allega video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Salva bozza"</string>
     <string name="discard" msgid="1714960202994370243">"Elimina"</string>
     <string name="compose" msgid="1473559896062432878">"Scrivi"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Sposta conversazione"</item>
     <item quantity="other" msgid="1685896770174368261">"Sposta <xliff:g id="ID_1">%1$d</xliff:g> conversazioni"</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> in merito a <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> il <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> in merito a <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> alle <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">
@@ -369,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">"Tutte le cartelle"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Cartelle recenti"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b0f5167..09985e3 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"צרף קובץ"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"צרף תמונה"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"צרף סרטון"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"שמור טיוטה"</string>
     <string name="discard" msgid="1714960202994370243">"מחק"</string>
     <string name="compose" msgid="1473559896062432878">"כתוב"</string>
@@ -151,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">
@@ -369,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-ja/strings.xml b/res/values-ja/strings.xml
index d1c1b77..208f233 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"ファイルを添付"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"画像を添付"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"動画を添付"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"下書きを保存"</string>
     <string name="discard" msgid="1714960202994370243">"破棄"</string>
     <string name="compose" msgid="1473559896062432878">"作成"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"1件のスレッドを移動"</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="DATE">%4$s</xliff:g>に<xliff:g id="SUBJECT">%2$s</xliff:g>について送信。抜粋: <xliff:g id="SNIPPET">%3$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g>が<xliff:g id="TIME">%4$s</xliff:g>に<xliff:g id="SUBJECT">%2$s</xliff:g>について送信。抜粋: <xliff:g id="SNIPPET">%3$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">
@@ -369,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-ko/strings.xml b/res/values-ko/strings.xml
index 47149c3..9994819 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"파일 첨부"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"사진 첨부"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"동영상 첨부"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"임시보관함에 저장"</string>
     <string name="discard" msgid="1714960202994370243">"삭제"</string>
     <string name="compose" msgid="1473559896062432878">"편지쓰기"</string>
@@ -151,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">
@@ -369,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-lt/strings.xml b/res/values-lt/strings.xml
index 3379f62..0fa836a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Pridėti failą"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Pridėti paveikslėlį"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Pridėti vaizdo įrašą"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Išsaugoti juodraštį"</string>
     <string name="discard" msgid="1714960202994370243">"Atmesti"</string>
     <string name="compose" msgid="1473559896062432878">"Sukurti"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Perkelti pokalbį"</item>
     <item quantity="other" msgid="1685896770174368261">"Perkelti <xliff:g id="ID_1">%1$d</xliff:g> pokalbius (-ių)"</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> apie <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> apie <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">
@@ -369,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">"Visi aplankai"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nauji aplankai"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3ec49ee..dd29978 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Pievienot failu"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Pievienot attēlu"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Pievienot videoklipu"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Saglabāt melnrakstu"</string>
     <string name="discard" msgid="1714960202994370243">"Atmest"</string>
     <string name="compose" msgid="1473559896062432878">"Rakstīt"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Pārvietot sarunu"</item>
     <item quantity="other" msgid="1685896770174368261">"Pārvietot <xliff:g id="ID_1">%1$d</xliff:g> sarunu(-as)"</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> par: <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> par: <xliff:g id="SUBJECT">%2$s</xliff:g>; <xliff:g id="SNIPPET">%3$s</xliff:g> plkst. <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">
@@ -369,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">"Visas mapes"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Jaunākās mapes"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 99ec638..d5ae891 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan fail"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Lampirkan Gambar"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Lampirkan Video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Simpan draf"</string>
     <string name="discard" msgid="1714960202994370243">"Buang"</string>
     <string name="compose" msgid="1473559896062432878">"Karang"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Alih perbualan"</item>
     <item quantity="other" msgid="1685896770174368261">"Alih <xliff:g id="ID_1">%1$d</xliff:g> perbualan"</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> tentang <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> pada <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> tentang <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> pada <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">
@@ -369,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">"Semua folder"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Folder terbaru"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c994ca5..38f6a43 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Legg ved fil"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Legg ved bilde"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Legg ved video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Lagre utkast"</string>
     <string name="discard" msgid="1714960202994370243">"Forkast"</string>
     <string name="compose" msgid="1473559896062432878">"Skriv ny"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Flytt samtale"</item>
     <item quantity="other" msgid="1685896770174368261">"Flytt <xliff:g id="ID_1">%1$d</xliff:g> samtaler"</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> om <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> om <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> kl. <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">
@@ -369,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">"Alle mapper"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nylige mapper"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 277ae34..349a913 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Bestand bijvoegen"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Foto bijvoegen"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Video bijvoegen"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Concept opslaan"</string>
     <string name="discard" msgid="1714960202994370243">"Weggooien"</string>
     <string name="compose" msgid="1473559896062432878">"Opstellen"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Conversatie verplaatsen"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> conversaties verplaatsen"</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> over <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> over <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">
@@ -369,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">"Alle mappen"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Recente mappen"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a14481e..56b8bd5 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Załącz plik"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Dołącz zdjęcie"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Dołącz film"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Zapisz wersję roboczą"</string>
     <string name="discard" msgid="1714960202994370243">"Odrzuć"</string>
     <string name="compose" msgid="1473559896062432878">"Utwórz"</string>
@@ -149,10 +151,8 @@
     <item quantity="one" msgid="3657821200245019288">"Przenieś wątek"</item>
     <item quantity="other" msgid="1685896770174368261">"Przenieś <xliff:g id="ID_1">%1$d</xliff:g> wątki(ów)"</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 temat: <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> w dniu <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 temat: <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> o godz. <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">
@@ -367,10 +367,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">"Wszystkie foldery"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Ostatnie foldery"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index babebe0..b739f2c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Anexar ficheiro"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Anexar Imagem"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Anexar Vídeo"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Guardar rascunho"</string>
     <string name="discard" msgid="1714960202994370243">"Rejeitar"</string>
     <string name="compose" msgid="1473559896062432878">"Compor"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1717f74..6e98599 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Anexar arquivo"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Anexar imagem"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Anexar vídeo"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Salvar rascunho"</string>
     <string name="discard" msgid="1714960202994370243">"Descartar"</string>
     <string name="compose" msgid="1473559896062432878">"Escrever"</string>
@@ -151,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">
@@ -369,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-rm/strings.xml b/res/values-rm/strings.xml
index 07f8d82..c6c08f5 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -34,9 +34,9 @@
     <skip />
     <!-- no translation found for add_file_attachment (2203398371671979481) -->
     <skip />
-    <!-- no translation found for add_photo_attachment (8548176514426323119) -->
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
     <skip />
-    <!-- no translation found for add_video_attachment (4284457799113546464) -->
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
     <skip />
     <!-- no translation found for save_draft (5555744208032445632) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 925ac11..ab8347a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Ataşaţi un fişier"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Ataşaţi o fotografie"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Ataşaţi un videoclip"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Salvaţi mesajul nefinal."</string>
     <string name="discard" msgid="1714960202994370243">"Renunţaţi"</string>
     <string name="compose" msgid="1473559896062432878">"Scrieţi"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Mutaţi conversaţia"</item>
     <item quantity="other" msgid="1685896770174368261">"Mutaţi <xliff:g id="ID_1">%1$d</xliff:g> (de) conversaţii"</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> despre <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> pe data de <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> despre <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> la ora <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">
@@ -369,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">"Toate dosarele"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Dosare recente"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 74be1e1..c35d52c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Прикрепить файл"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Прикрепить фото"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Прикрепить видео"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Сохранить черновик"</string>
     <string name="discard" msgid="1714960202994370243">"Закрыть"</string>
     <string name="compose" msgid="1473559896062432878">"Написать"</string>
@@ -151,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">
@@ -369,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-sk/strings.xml b/res/values-sk/strings.xml
index a208859..1a2a60a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Pripojiť súbor"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Pripojiť obrázok"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Pripojiť video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Uložiť koncept"</string>
     <string name="discard" msgid="1714960202994370243">"Zahodiť"</string>
     <string name="compose" msgid="1473559896062432878">"Napísať správu"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Presunúť konverzáciu"</item>
     <item quantity="other" msgid="1685896770174368261">"Presunúť konverzácie (počet: <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> na tému <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> dňa <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ému <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> o <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">
@@ -369,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šetky priečinky"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nedávne priečinky"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bbc66f6..a4f0fc1 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteko"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Priložite sliko"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Priložite videoposnetek"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Shrani osnutek"</string>
     <string name="discard" msgid="1714960202994370243">"Zavrzi"</string>
     <string name="compose" msgid="1473559896062432878">"Novo"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Premakni pogovor"</item>
     <item quantity="other" msgid="1685896770174368261">"Premakni toliko pogovorov: <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> o zadevi <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> o zadevi <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> ob <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">
@@ -369,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">"Vse mape"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nedavne mape"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c29b870..f1563e5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Приложи датотеку"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Приложи слику"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Приложи видео"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Сачувај недовршену поруку"</string>
     <string name="discard" msgid="1714960202994370243">"Одбаци"</string>
     <string name="compose" msgid="1473559896062432878">"Нова порука"</string>
@@ -151,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">
@@ -369,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-sv/strings.xml b/res/values-sv/strings.xml
index 930c7b8..04d65bb 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Bifoga fil"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Bifoga bild"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Bifoga video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Spara utkast"</string>
     <string name="discard" msgid="1714960202994370243">"Släng"</string>
     <string name="compose" msgid="1473559896062432878">"Skriv"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Flytta konversation"</item>
     <item quantity="other" msgid="1685896770174368261">"Flytta <xliff:g id="ID_1">%1$d</xliff:g> konversationer"</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> om <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> den <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> om <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> klockan <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">
@@ -369,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">"Alla mappar"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Senaste mapparna"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 02baf66..d40dab4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Ambatisha faili"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Ambatisha Picha"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Ambatisha Video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Hifadhi rasimu"</string>
     <string name="discard" msgid="1714960202994370243">"Tupa"</string>
     <string name="compose" msgid="1473559896062432878">"Tunga"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Hamisha mazungumzo"</item>
     <item quantity="other" msgid="1685896770174368261">"Hamisha mazungumzo <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> kuhusu <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> kwenye <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> kuhusu <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> saa <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">
@@ -369,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">"Folda zote"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Folda za hivi karibuni"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0592f06..5b84cb5 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"แนบไฟล์"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"แนบรูปภาพ"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"แนบวิดีโอ"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"บันทึกร่างจดหมาย"</string>
     <string name="discard" msgid="1714960202994370243">"ยกเลิก"</string>
     <string name="compose" msgid="1473559896062432878">"เขียน"</string>
@@ -151,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">
@@ -369,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-tl/strings.xml b/res/values-tl/strings.xml
index df98d86..0b5b3cf 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Mag-attach ng file"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Mag-attach Larawan"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Mag-attach ng Video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"I-save ang draft"</string>
     <string name="discard" msgid="1714960202994370243">"Itapon"</string>
     <string name="compose" msgid="1473559896062432878">"Bumuo"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Ilipat ang pag-uusap"</item>
     <item quantity="other" msgid="1685896770174368261">"Ilipat ang <xliff:g id="ID_1">%1$d</xliff:g> (na) pag-uusap"</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> tungkol sa <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> sa <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> tungkol sa <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> sa <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">
@@ -369,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">"Lahat ng folder"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Mga kamakailang folder"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index eaa90e4..cf54d73 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Dosya ekleyin"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Resim Ekle"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Video Ekle"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Taslağı kaydet"</string>
     <string name="discard" msgid="1714960202994370243">"Sil"</string>
     <string name="compose" msgid="1473559896062432878">"E-posta yaz"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"İleti dizisini taşı"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> ileti dizisini taşı"</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>, konu: <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> tarih: <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> konu: <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> saat: <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">
@@ -369,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">"Tüm klasörler"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Son klasörler"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 95f5ec3..e7eb649 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Вкласти файл"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Вкласти фото"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Вкласти відео"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Зберегти як чернетку"</string>
     <string name="discard" msgid="1714960202994370243">"Закрити"</string>
     <string name="compose" msgid="1473559896062432878">"Написати"</string>
@@ -151,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">
@@ -369,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-vi/strings.xml b/res/values-vi/strings.xml
index 71b530c..25b49bb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Đính kèm tệp"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Đính kèm ảnh"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Đính kèm video"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Lưu bản nháp"</string>
     <string name="discard" msgid="1714960202994370243">"Hủy"</string>
     <string name="compose" msgid="1473559896062432878">"Soạn thư"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Di chuyển cuộc hội thoại"</item>
     <item quantity="other" msgid="1685896770174368261">"Di chuyển <xliff:g id="ID_1">%1$d</xliff:g> cuộc hội thoại"</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> về <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> vào <xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> về <xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> lúc <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">
@@ -369,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">"Tất cả thư mục"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Thư mục gần đây"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 37a88fc..ed2976b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"添加附件"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"附加图片"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"附加视频"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"保存草稿"</string>
     <string name="discard" msgid="1714960202994370243">"舍弃"</string>
     <string name="compose" msgid="1473559896062432878">"写邮件"</string>
@@ -151,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="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="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">
@@ -369,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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b19a849..3a874d2 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"附加檔案"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"附加圖片"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"附加影片"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"儲存草稿"</string>
     <string name="discard" msgid="1714960202994370243">"捨棄"</string>
     <string name="compose" msgid="1473559896062432878">"撰寫"</string>
@@ -151,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">
@@ -264,7 +264,7 @@
     <string name="normalMode" msgid="4250277414924926730">"設定標準模式"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"搜尋結果模式"</string>
     <string name="folderMode" msgid="553052020619895714">"設定資料夾模式"</string>
-    <string name="search_results_searching_header" msgid="3821361153909466819">"搜尋中..."</string>
+    <string name="search_results_searching_header" msgid="3821361153909466819">"搜尋中…"</string>
     <string name="recent_folders" msgid="8240081561436891330">"最近使用過的資料夾"</string>
     <string name="add_label" msgid="1638508840481944248">"新增標籤"</string>
     <string name="conversation_count" msgid="4459776616201694172">"第 <xliff:g id="COUNT">%1$s</xliff:g> 封,共 <xliff:g id="TOTAL">%2$s</xliff:g> 封"</string>
@@ -337,7 +337,7 @@
     <skip />
     <string name="folders" msgid="3359679829905256429">"資料夾"</string>
     <string name="network_error" msgid="2125579009654728299">"沒有網路連線"</string>
-    <string name="loading" msgid="2600808404156989255">"正在載入會話群組..."</string>
+    <string name="loading" msgid="2600808404156989255">"正在載入會話群組…"</string>
     <string name="retry" msgid="4515885444824418022">"重試"</string>
     <string name="load_more" msgid="420892447103014683">"載入更多"</string>
     <string name="shortcut_name_title" msgid="8220482314700618391">"名稱資料夾捷徑"</string>
@@ -369,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-zu/strings.xml b/res/values-zu/strings.xml
index 537c290..51af103 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -26,8 +26,10 @@
     <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
     <string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Namathisela ifayela"</string>
-    <string name="add_photo_attachment" msgid="8548176514426323119">"Namathisela isithombe"</string>
-    <string name="add_video_attachment" msgid="4284457799113546464">"Namathisela ividiyo"</string>
+    <!-- no translation found for add_photo_attachment (3738882100645552858) -->
+    <skip />
+    <!-- no translation found for add_video_attachment (8916625983712820173) -->
+    <skip />
     <string name="save_draft" msgid="5555744208032445632">"Londoloza okusazolungiswa"</string>
     <string name="discard" msgid="1714960202994370243">"Lahla"</string>
     <string name="compose" msgid="1473559896062432878">"Bhala"</string>
@@ -151,10 +153,8 @@
     <item quantity="one" msgid="3657821200245019288">"Hambisa ingxoxo"</item>
     <item quantity="other" msgid="1685896770174368261">"Hambisa izingxoxo <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> mayelana ne-<xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> ngomhla ka-<xliff:g id="DATE">%4$s</xliff:g>"</string>
+    <string name="content_description_today" msgid="3358818622191430053">"<xliff:g id="SENDER">%1$s</xliff:g> mayelana ne-<xliff:g id="SUBJECT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%3$s</xliff:g> ngo-<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">
@@ -369,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">"Wonke amafolda"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Amafolda akamuva"</string>
 </resources>