Import translations. DO NOT MERGE

Change-Id: I982d3fd86512f8e3ce19835db81e21633754379e
Auto-generated-cl: translation import
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d1a0e52..a704762 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> het <xliff:g id="SUBJECT">%2$s</xliff:g> op <xliff:g id="DATE">%3$s</xliff:g> gestuur"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -171,7 +174,7 @@
     <item quantity="other" msgid="4713469868399246772">"Argiveer hierdie <xliff:g id="COUNT">%1$d</xliff:g> gesprekke?"</item>
   </plurals>
   <plurals name="confirm_discard_drafts_conversation">
-    <item quantity="one" msgid="5974090449454432874">"Gooi konsep weg uit hierdie gesprek?"</item>
+    <item quantity="one" msgid="5974090449454432874">"Gooi konsepte weg uit hierdie gesprek?"</item>
     <item quantity="other" msgid="4173815457177336569">"Gooi konsepte weg uit hierdie <xliff:g id="COUNT">%1$d</xliff:g> gesprekke?"</item>
   </plurals>
     <string name="confirm_discard_text" msgid="1149834186404614612">"Gooi hierdie boodskap weg?"</string>
@@ -366,4 +369,10 @@
     <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="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 ed260f8..6dd6ef1 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"ውይይት አንቀሳቅስ"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> ውይይቶች አንቀሳቅስ"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g> ላይ <xliff:g id="SUBJECT">%2$s</xliff:g>ን ልኳል"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 f412e9e..7fc06ab 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"نقل المحادثة"</item>
     <item quantity="other" msgid="1685896770174368261">"نقل <xliff:g id="ID_1">%1$d</xliff:g> من المحادثات"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> أرسل <xliff:g id="SUBJECT">%2$s</xliff:g> في <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 59fcd8e..87758ed 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"Перамясціць размову"</item>
     <item quantity="other" msgid="1685896770174368261">"Перамяшчэнне размоў: <xliff:g id="ID_1">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"Адпраўнiк <xliff:g id="SENDER">%1$s</xliff:g> адправіў <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 bbab896..f5a8070 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"Преместване на кореспонденция"</item>
     <item quantity="other" msgid="1685896770174368261">"Преместване на <xliff:g id="ID_1">%1$d</xliff:g> кореспонденции"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> изпрати <xliff:g id="SUBJECT">%2$s</xliff:g> на <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 2e42527..445040f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -41,7 +41,7 @@
     <string name="cc_attribution" msgid="374493748526504562">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="4711524151968942082">"Tria el tipus de fitxer adjunt"</string>
     <string name="too_large_to_attach_single" msgid="2996733972478212136">"No es pot adjuntar un fitxer de més de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
-    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"No s\'ha adjuntat un fitxer com a mínim. Límit: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"No s\'han adjuntat un o més fitxers. Límit: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="3366607594339390249">"El fitxer no s\'ha adjuntat. Has arribat al límit de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"No s\'ha pogut adjuntar el fitxer."</string>
     <string name="recipient_needed" msgid="999037027358925655">"Afegeix com a mínim un destinatari."</string>
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"Mou la conversa"</item>
     <item quantity="other" msgid="1685896770174368261">"Mou <xliff:g id="ID_1">%1$d</xliff:g> converses"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ha enviat <xliff:g id="SUBJECT">%2$s</xliff:g> el dia <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="all_folders_heading" msgid="2506843494725730618">"Totes les carpetes"</string>
+    <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetes recents"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6afba6a..9301820 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"Přesunout konverzaci"</item>
     <item quantity="other" msgid="1685896770174368261">"Přesunutí <xliff:g id="ID_1">%1$d</xliff:g> konverzací"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> dne <xliff:g id="DATE">%3$s</xliff:g> odeslal(a) zprávu <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="all_folders_heading" msgid="2506843494725730618">"Všechny složky"</string>
+    <string name="recent_folders_heading" msgid="8613621794529777406">"Poslední složky"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 67ea9f5..829ac7a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> sendte <xliff:g id="SUBJECT">%2$s</xliff:g> den <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 ecb7658..7a48bc6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> hat <xliff:g id="SUBJECT">%2$s</xliff:g> am <xliff:g id="DATE">%3$s</xliff:g> gesendet."</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 4a15b32..7830cd4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"Μετακίνηση συνομιλίας"</item>
     <item quantity="other" msgid="1685896770174368261">"Μετακίνηση <xliff:g id="ID_1">%1$d</xliff:g> συνομιλιών"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"Ο χρήστης <xliff:g id="SENDER">%1$s</xliff:g> έστειλε <xliff:g id="SUBJECT">%2$s</xliff:g> στις <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="all_folders_heading" msgid="2506843494725730618">"Όλοι οι φάκελοι"</string>
+    <string name="recent_folders_heading" msgid="8613621794529777406">"Πρόσφατοι φάκελοι"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index e3c1c11..c8ce4ba 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"Move conversation"</item>
     <item quantity="other" msgid="1685896770174368261">"Move <xliff:g id="ID_1">%1$d</xliff:g> conversations"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> sent <xliff:g id="SUBJECT">%2$s</xliff:g> on <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="all_folders_heading" msgid="2506843494725730618">"All folders"</string>
+    <string name="recent_folders_heading" msgid="8613621794529777406">"Recent folders"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 512914f..164e5dc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> envió <xliff:g id="SUBJECT">%2$s</xliff:g> el <xliff:g id="DATE">%3$s</xliff:g>."</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -171,8 +174,8 @@
     <item quantity="other" msgid="4713469868399246772">"¿Deseas archivar estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>
   </plurals>
   <plurals name="confirm_discard_drafts_conversation">
-    <item quantity="one" msgid="5974090449454432874">"¿Descartar los borradores de esta conversación?"</item>
-    <item quantity="other" msgid="4173815457177336569">"¿Descartar los borradores de estas <xliff:g id="COUNT">%1$d</xliff:g> convers.?"</item>
+    <item quantity="one" msgid="5974090449454432874">"¿Descartar borradores de esta conversación?"</item>
+    <item quantity="other" msgid="4173815457177336569">"¿Descartar borradores de estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>
   </plurals>
     <string name="confirm_discard_text" msgid="1149834186404614612">"¿Quieres descartar este mensaje?"</string>
     <string name="no_conversations" msgid="35400008890372241">"No hay conversaciones."</string>
@@ -366,4 +369,10 @@
     <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="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 d676ca9..a1cce3f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> envió <xliff:g id="SUBJECT">%2$s</xliff:g> el <xliff:g id="DATE">%3$s</xliff:g>."</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 768cce9..c9976f1 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -40,9 +40,9 @@
     <string name="forward_attribution" msgid="1498936339458535158">"---------- Edastatud sõnum ----------&lt;br&gt;Saatja: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Kuupäev: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Teema: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Saaja: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="cc_attribution" msgid="374493748526504562">"Koopia: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="4711524151968942082">"Valige manuse tüüp"</string>
-    <string name="too_large_to_attach_single" msgid="2996733972478212136">"Ei saa lisada faile, mis ületavad suuruse <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
-    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"Üht või mitut faili ei lisatud. Piir <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
-    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Faili ei lisatud. Saavutatud piir <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_single" msgid="2996733972478212136">"Ei saa lisada faile, mis ületavad mahu <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"Üht või mitut faili ei lisatud. Limiit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Faili ei lisatud. Saavutatud limiit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"Faili ei saanud manustada."</string>
     <string name="recipient_needed" msgid="999037027358925655">"Lisage vähemalt üks saaja."</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"Saaja viga"</string>
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> saatis sõnumi <xliff:g id="SUBJECT">%2$s</xliff:g> kuupäeval <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 5542dd0..efac26a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"انتقال مکالمه"</item>
     <item quantity="other" msgid="1685896770174368261">"انتقال <xliff:g id="ID_1">%1$d</xliff:g> مکالمه"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> <xliff:g id="SUBJECT">%2$s</xliff:g> را در تاریخ <xliff:g id="DATE">%3$s</xliff:g> ارسال کرد"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 ac2e97d..cfc7f2f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -40,9 +40,9 @@
     <string name="forward_attribution" msgid="1498936339458535158">"---------- Edelleenlähetetty viesti ----------&lt;br&gt;Lähettäjä: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Päivämäärä: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Aihe: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Vastaanottaja: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="cc_attribution" msgid="374493748526504562">"Kopio: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="4711524151968942082">"Valitse liitetiedoston tyyppi"</string>
-    <string name="too_large_to_attach_single" msgid="2996733972478212136">"Et voi liittää yli <xliff:g id="MAXSIZE">%1$s</xliff:g> kokoisia tiedostoja."</string>
+    <string name="too_large_to_attach_single" msgid="2996733972478212136">"Et voi liittää tiedostoja, joiden koko on yli <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"Vähintään yhtä tiedostoa ei liitetty. Raja <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
-    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Tiedostoa ei liitetty. <xliff:g id="MAXSIZE">%1$s</xliff:g> raja saavutettu."</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Tiedostoa ei liitetty. Raja (<xliff:g id="MAXSIZE">%1$s</xliff:g> ) saavutettu."</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"Tiedostoa ei voi liittää."</string>
     <string name="recipient_needed" msgid="999037027358925655">"Lisää vähintään yksi vastaanottaja."</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"Vastaanottajavirhe"</string>
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> lähetti viestin <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 bd74415..641db73 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> a envoyé le message \"<xliff:g id="SUBJECT">%2$s</xliff:g>\" le <xliff:g id="DATE">%3$s</xliff:g>."</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 fa44024..8c93f74 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"बातचीत ले जाएं"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> बातचीत ले जाएं"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ने <xliff:g id="DATE">%3$s</xliff:g> को <xliff:g id="SUBJECT">%2$s</xliff:g> भेजा"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 03ea76c..e938d99 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -41,7 +41,7 @@
     <string name="cc_attribution" msgid="374493748526504562">"Kopija: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="4711524151968942082">"Odaberite vrstu privitka"</string>
     <string name="too_large_to_attach_single" msgid="2996733972478212136">"Nije moguće priložiti datoteku veću od <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
-    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"Jedna ili više datoteka nisu priložene. Ograničenje je <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"Jedna ili više datoteka nije priloženo. Ograničenje je <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Datoteka nije priložena. Dosegnuto je ograničenje od <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"Nije moguće priložiti datoteku."</string>
     <string name="recipient_needed" msgid="999037027358925655">"Dodajte barem jednog primatelja."</string>
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"Pošiljatelj: <xliff:g id="SENDER">%1$s</xliff:g>, predmet: <xliff:g id="SUBJECT">%2$s</xliff:g>, datum: <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 35d4f29..1b29d53 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> küldte a következőt: <xliff:g id="SUBJECT">%2$s</xliff:g> | ekkor: <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 1777acb..1ac4429 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> mengirim <xliff:g id="SUBJECT">%2$s</xliff:g> pada <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 9d1d0c3..8136718 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ha inviato <xliff:g id="SUBJECT">%2$s</xliff:g> il giorno <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 21537cf..b0f5167 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"העבר שיחה"</item>
     <item quantity="other" msgid="1685896770174368261">"העבר <xliff:g id="ID_1">%1$d</xliff:g> שיחות"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> שלח את <xliff:g id="SUBJECT">%2$s</xliff:g> בתאריך <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 7125ac9..d1c1b77 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -40,12 +40,9 @@
     <string name="forward_attribution" msgid="1498936339458535158">"---------- 転送メッセージ ----------&lt;br&gt;From: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;日付: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;件名: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;To: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="cc_attribution" msgid="374493748526504562">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="4711524151968942082">"添付ファイルの形式を選択"</string>
-    <!-- no translation found for too_large_to_attach_single (2996733972478212136) -->
-    <skip />
-    <!-- no translation found for too_large_to_attach_multiple (5452547998184881210) -->
-    <skip />
-    <!-- no translation found for too_large_to_attach_additional (3366607594339390249) -->
-    <skip />
+    <string name="too_large_to_attach_single" msgid="2996733972478212136">"<xliff:g id="MAXSIZE">%1$s</xliff:g>を超えるファイルは添付できません。"</string>
+    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"ファイルを1件以上添付できません。上限は<xliff:g id="MAXSIZE">%1$s</xliff:g>です。"</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"ファイルを添付できません。上限の<xliff:g id="MAXSIZE">%1$s</xliff:g>に達しています。"</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"ファイルを添付できませんでした。"</string>
     <string name="recipient_needed" msgid="999037027358925655">"宛先を入力してください。"</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"宛先エラー"</string>
@@ -68,8 +65,7 @@
     <string name="mark_not_spam" msgid="694891665407228160">"迷惑メールでないことを報告"</string>
     <string name="report_phishing" msgid="5714205737453138338">"フィッシングを報告"</string>
     <string name="delete" msgid="844871204175957681">"削除"</string>
-    <!-- no translation found for discard_drafts (6862272443470085375) -->
-    <skip />
+    <string name="discard_drafts" msgid="6862272443470085375">"下書きを破棄"</string>
     <string name="next" msgid="4674401197968248302">"前"</string>
     <string name="previous" msgid="309943944831349924">"次"</string>
     <string name="refresh" msgid="490989798005710951">"更新"</string>
@@ -155,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"1件のスレッドを移動"</item>
     <item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g>件のスレッドを移動"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>が<xliff:g id="DATE">%3$s</xliff:g>に<xliff:g id="SUBJECT">%2$s</xliff:g>を送信"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -174,8 +173,10 @@
     <item quantity="one" msgid="2990537295519552069">"このスレッドをアーカイブしますか?"</item>
     <item quantity="other" msgid="4713469868399246772">"<xliff:g id="COUNT">%1$d</xliff:g>件のスレッドをアーカイブしますか?"</item>
   </plurals>
-    <!-- no translation found for confirm_discard_drafts_conversation:one (5974090449454432874) -->
-    <!-- no translation found for confirm_discard_drafts_conversation:other (4173815457177336569) -->
+  <plurals name="confirm_discard_drafts_conversation">
+    <item quantity="one" msgid="5974090449454432874">"このスレッドから下書きを破棄してもよろしいですか?"</item>
+    <item quantity="other" msgid="4173815457177336569">"<xliff:g id="COUNT">%1$d</xliff:g>件のスレッドから下書きを破棄してもよろしいですか?"</item>
+  </plurals>
     <string name="confirm_discard_text" msgid="1149834186404614612">"このメールを破棄しますか?"</string>
     <string name="no_conversations" msgid="35400008890372241">"スレッドがありません。"</string>
     <string name="undo" msgid="6070869718469782251">"元に戻す"</string>
@@ -368,4 +369,10 @@
     <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="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 2c34aea..47149c3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"대화 이동"</item>
     <item quantity="other" msgid="1685896770174368261">"대화 <xliff:g id="ID_1">%1$d</xliff:g>개 이동"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>님이 <xliff:g id="SUBJECT">%2$s</xliff:g>을(를) <xliff:g id="DATE">%3$s</xliff:g>에 보냈습니다."</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 bb2f4ce..3379f62 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> išsiuntė <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 610fd43..3ec49ee 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> nosūtīja: <xliff:g id="SUBJECT">%2$s</xliff:g> (šādā datumā: <xliff:g id="DATE">%3$s</xliff:g>)"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 e2a1814..99ec638 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> menghantar <xliff:g id="SUBJECT">%2$s</xliff:g> pada <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 e3cb5a2..c994ca5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> sendte <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 340eaeb..277ae34 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> heeft <xliff:g id="SUBJECT">%2$s</xliff:g> verzonden op <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 78494d3..a14481e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -149,7 +149,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> wysłał(a) <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -364,4 +367,10 @@
     <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="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 62a83d0..babebe0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> enviou <xliff:g id="SUBJECT">%2$s</xliff:g> em <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="all_folders_heading" msgid="2506843494725730618">"Todas as pastas"</string>
+    <string name="recent_folders_heading" msgid="8613621794529777406">"Pastas recentes"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index eca32bd..1717f74 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -40,12 +40,9 @@
     <string name="forward_attribution" msgid="1498936339458535158">"---------- Mensagem encaminhada ----------&lt;br&gt;De: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Data: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Assunto: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Para: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="cc_attribution" msgid="374493748526504562">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="4711524151968942082">"Escolher tipo de anexo"</string>
-    <!-- no translation found for too_large_to_attach_single (2996733972478212136) -->
-    <skip />
-    <!-- no translation found for too_large_to_attach_multiple (5452547998184881210) -->
-    <skip />
-    <!-- no translation found for too_large_to_attach_additional (3366607594339390249) -->
-    <skip />
+    <string name="too_large_to_attach_single" msgid="2996733972478212136">"Não é possível anexar o arquivo com mais de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"Um ou mais arquivos não foram anexados. Limite de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Arquivo não anexado. O limite de <xliff:g id="MAXSIZE">%1$s</xliff:g> foi atingido."</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"Não foi possível anexar o arquivo."</string>
     <string name="recipient_needed" msgid="999037027358925655">"Adicione pelo menos um destinatário."</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"Erro de destinatário"</string>
@@ -68,8 +65,7 @@
     <string name="mark_not_spam" msgid="694891665407228160">"Não é spam"</string>
     <string name="report_phishing" msgid="5714205737453138338">"Denunciar phishing"</string>
     <string name="delete" msgid="844871204175957681">"Excluir"</string>
-    <!-- no translation found for discard_drafts (6862272443470085375) -->
-    <skip />
+    <string name="discard_drafts" msgid="6862272443470085375">"Descartar rascunhos"</string>
     <string name="next" msgid="4674401197968248302">"Mais antiga"</string>
     <string name="previous" msgid="309943944831349924">"Mais recente"</string>
     <string name="refresh" msgid="490989798005710951">"Atualizar"</string>
@@ -155,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> enviou <xliff:g id="SUBJECT">%2$s</xliff:g> em <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -174,8 +173,10 @@
     <item quantity="one" msgid="2990537295519552069">"Arquivar esta conversa?"</item>
     <item quantity="other" msgid="4713469868399246772">"Arquivar estas <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
   </plurals>
-    <!-- no translation found for confirm_discard_drafts_conversation:one (5974090449454432874) -->
-    <!-- no translation found for confirm_discard_drafts_conversation:other (4173815457177336569) -->
+  <plurals name="confirm_discard_drafts_conversation">
+    <item quantity="one" msgid="5974090449454432874">"Descartar rascunhos da conversa?"</item>
+    <item quantity="other" msgid="4173815457177336569">"Descartar rascunhos das <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
+  </plurals>
     <string name="confirm_discard_text" msgid="1149834186404614612">"Descartar esta mensagem?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Não há conversas."</string>
     <string name="undo" msgid="6070869718469782251">"Desfazer"</string>
@@ -368,4 +369,10 @@
     <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="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 9291221..07f8d82 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -265,7 +265,9 @@
     <skip />
     <!-- no translation found for move_conversation:one (3657821200245019288) -->
     <!-- no translation found for move_conversation:other (1685896770174368261) -->
-    <!-- no translation found for content_description (175899621885107464) -->
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
     <skip />
     <!-- no translation found for filtered_tag (6470627954465675488) -->
     <skip />
@@ -531,4 +533,12 @@
     <!-- no translation found for compose_component_name (1673799619444668402) -->
     <skip />
     <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 />
+    <!-- no translation found for all_folders_heading (2506843494725730618) -->
+    <skip />
+    <!-- no translation found for recent_folders_heading (8613621794529777406) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7aaad6b..925ac11 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> a trimis <xliff:g id="SUBJECT">%2$s</xliff:g> pe <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 1b0c3d2..74be1e1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"Переместить цепочку"</item>
     <item quantity="other" msgid="1685896770174368261">"Переместить цепочки (<xliff:g id="ID_1">%1$d</xliff:g>)"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"Отправитель: <xliff:g id="SENDER">%1$s</xliff:g>; тема: <xliff:g id="SUBJECT">%2$s</xliff:g>; дата: <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 636e30b..a208859 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"Používateľ <xliff:g id="SENDER">%1$s</xliff:g> dňa <xliff:g id="DATE">%3$s</xliff:g> poslal správu <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 280f31c..bbc66f6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"Oseba <xliff:g id="SENDER">%1$s</xliff:g> je poslala <xliff:g id="SUBJECT">%2$s</xliff:g> dne <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 d25c12e..c29b870 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"Премести преписку"</item>
     <item quantity="other" msgid="1685896770174368261">"Премести преписке (<xliff:g id="ID_1">%1$d</xliff:g>)"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> је послао/ла <xliff:g id="SUBJECT">%2$s</xliff:g> <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 5ab0f0c..930c7b8 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> skickade <xliff:g id="SUBJECT">%2$s</xliff:g> den <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 14bd377..02baf66 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ilitumwa <xliff:g id="SUBJECT">%2$s</xliff:g> mnamo <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 28db9a1..0592f06 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -42,7 +42,7 @@
     <string name="select_attachment_type" msgid="4711524151968942082">"เลือกประเภทของไฟล์แนบ"</string>
     <string name="too_large_to_attach_single" msgid="2996733972478212136">"ไม่สามารถแนบไฟล์ที่มีขนาดเกิน <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
     <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"ไม่ได้แนบไฟล์อย่างน้อยหนึ่งไฟล์ จำกัดขนาดที่ <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
-    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"ไม่ได้แนบไฟล์ ครบตามขนาดที่จำกัดสูงสุดที่ <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"ไม่ได้แนบไฟล์ เกินขนาดที่จำกัดสูงสุด <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"ไม่สามารถแนบไฟล์"</string>
     <string name="recipient_needed" msgid="999037027358925655">"เพิ่มผู้รับอย่างน้อยหนึ่งราย"</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"พบข้อผิดพลาดกับผู้รับ"</string>
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"ย้ายการสนทนา"</item>
     <item quantity="other" msgid="1685896770174368261">"ย้ายการสนทนา <xliff:g id="ID_1">%1$d</xliff:g> รายการ"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> ส่ง <xliff:g id="SUBJECT">%2$s</xliff:g> เมื่อวันที่ <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 2ffccf0..df98d86 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"Ipinadala ni <xliff:g id="SENDER">%1$s</xliff:g> ang <xliff:g id="SUBJECT">%2$s</xliff:g> noong <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 70a20f7..eaa90e4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>, <xliff:g id="SUBJECT">%2$s</xliff:g> konulu iletiyi <xliff:g id="DATE">%3$s</xliff:g> tarihinde gönderdi"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 cd744c9..95f5ec3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -42,7 +42,7 @@
     <string name="select_attachment_type" msgid="4711524151968942082">"Вибрати тип вкладеного файлу"</string>
     <string name="too_large_to_attach_single" msgid="2996733972478212136">"Неможливо вкласти файл розміром понад <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"Один або декілька файлів не вкладено. Максимальний розмір: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
-    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Файл не вкладено. Досягнуто максимальний розмір: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"Файл не вкладено. Досягнуто максимального розміру: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"Не вдалося вкласти файл."</string>
     <string name="recipient_needed" msgid="999037027358925655">"Додайте принаймні одного отримувача."</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"Помилка отримувача"</string>
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"Перемістити бесіду"</item>
     <item quantity="other" msgid="1685896770174368261">"Перемістити бесід: <xliff:g id="ID_1">%1$d</xliff:g>"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>, надіслано: <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 19fe88b..71b530c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> đã gửi <xliff:g id="SUBJECT">%2$s</xliff:g> vào <xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 bdcb50f..37a88fc 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -40,12 +40,9 @@
     <string name="forward_attribution" msgid="1498936339458535158">"---------- 转发的邮件 ----------&lt;br&gt;发件人:<xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;日期:<xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;主题:<xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;收件人:<xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="cc_attribution" msgid="374493748526504562">"抄送:<xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="4711524151968942082">"选择附件类型"</string>
-    <!-- no translation found for too_large_to_attach_single (2996733972478212136) -->
-    <skip />
-    <!-- no translation found for too_large_to_attach_multiple (5452547998184881210) -->
-    <skip />
-    <!-- no translation found for too_large_to_attach_additional (3366607594339390249) -->
-    <skip />
+    <string name="too_large_to_attach_single" msgid="2996733972478212136">"不能附加大小超过 <xliff:g id="MAXSIZE">%1$s</xliff:g> 的文件。"</string>
+    <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"未能附加一个或多个文件。上限为 <xliff:g id="MAXSIZE">%1$s</xliff:g>。"</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"未能附加文件。已达到上限 (<xliff:g id="MAXSIZE">%1$s</xliff:g>)。"</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"无法附加文件。"</string>
     <string name="recipient_needed" msgid="999037027358925655">"请至少添加一位收件人。"</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"收件人出错"</string>
@@ -68,8 +65,7 @@
     <string name="mark_not_spam" msgid="694891665407228160">"这不是垃圾邮件"</string>
     <string name="report_phishing" msgid="5714205737453138338">"举报网上诱骗行为"</string>
     <string name="delete" msgid="844871204175957681">"删除"</string>
-    <!-- no translation found for discard_drafts (6862272443470085375) -->
-    <skip />
+    <string name="discard_drafts" msgid="6862272443470085375">"舍弃草稿"</string>
     <string name="next" msgid="4674401197968248302">"更早"</string>
     <string name="previous" msgid="309943944831349924">"更晚"</string>
     <string name="refresh" msgid="490989798005710951">"刷新"</string>
@@ -155,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"移动会话"</item>
     <item quantity="other" msgid="1685896770174368261">"移动 <xliff:g id="ID_1">%1$d</xliff:g> 个会话"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g>于<xliff:g id="DATE">%3$s</xliff:g>发送了“<xliff:g id="SUBJECT">%2$s</xliff:g>”"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -174,8 +173,10 @@
     <item quantity="one" msgid="2990537295519552069">"要将此会话归档吗?"</item>
     <item quantity="other" msgid="4713469868399246772">"要将这 <xliff:g id="COUNT">%1$d</xliff:g> 个会话归档吗?"</item>
   </plurals>
-    <!-- no translation found for confirm_discard_drafts_conversation:one (5974090449454432874) -->
-    <!-- no translation found for confirm_discard_drafts_conversation:other (4173815457177336569) -->
+  <plurals name="confirm_discard_drafts_conversation">
+    <item quantity="one" msgid="5974090449454432874">"要舍弃此会话中的草稿吗?"</item>
+    <item quantity="other" msgid="4173815457177336569">"要舍弃这 <xliff:g id="COUNT">%1$d</xliff:g> 个会话中的草稿吗?"</item>
+  </plurals>
     <string name="confirm_discard_text" msgid="1149834186404614612">"要舍弃此邮件吗?"</string>
     <string name="no_conversations" msgid="35400008890372241">"无会话。"</string>
     <string name="undo" msgid="6070869718469782251">"撤消"</string>
@@ -368,4 +369,10 @@
     <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="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 9d51ef3..b19a849 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -42,7 +42,7 @@
     <string name="select_attachment_type" msgid="4711524151968942082">"選擇附件類型"</string>
     <string name="too_large_to_attach_single" msgid="2996733972478212136">"無法附加大小超過 <xliff:g id="MAXSIZE">%1$s</xliff:g> 的檔案。"</string>
     <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"無法附加一或多個檔案 (大小上限:<xliff:g id="MAXSIZE">%1$s</xliff:g>)。"</string>
-    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"無法附加檔案。檔案大小已達 <xliff:g id="MAXSIZE">%1$s</xliff:g> 上限。"</string>
+    <string name="too_large_to_attach_additional" msgid="3366607594339390249">"無法附加檔案。檔案大小已達上限 <xliff:g id="MAXSIZE">%1$s</xliff:g>。"</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"無法附加檔案。"</string>
     <string name="recipient_needed" msgid="999037027358925655">"請至少新增一位收件者。"</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"收件者錯誤"</string>
@@ -151,7 +151,10 @@
     <item quantity="one" msgid="3657821200245019288">"移動會話群組"</item>
     <item quantity="other" msgid="1685896770174368261">"移動 <xliff:g id="ID_1">%1$d</xliff:g> 個會話群組"</item>
   </plurals>
-    <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> 在 <xliff:g id="DATE">%3$s</xliff:g>傳送了主旨為「<xliff:g id="SUBJECT">%2$s</xliff:g>」的郵件"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="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 c6c86e1..537c290 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -151,7 +151,10 @@
     <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>
-    <string name="content_description" msgid="175899621885107464">"U-<xliff:g id="SENDER">%1$s</xliff:g> uthumele i-<xliff:g id="SUBJECT">%2$s</xliff:g> ngomhla ka-<xliff:g id="DATE">%3$s</xliff:g>"</string>
+    <!-- no translation found for content_description (517417382820459541) -->
+    <skip />
+    <!-- no translation found for content_description_today (3358818622191430053) -->
+    <skip />
     <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">
@@ -366,4 +369,10 @@
     <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="all_folders_heading" msgid="2506843494725730618">"Wonke amafolda"</string>
+    <string name="recent_folders_heading" msgid="8613621794529777406">"Amafolda akamuva"</string>
 </resources>