Import translations. DO NOT MERGE

Change-Id: Idf7358ea5cd640a8698cacaf3b540b797c362bfb
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index dda919f..1f3f05f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Nagemaakte inhoudverskaffer"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Gesprek-inhoudverskaffer"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Rekening se kasverskaffer"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Nagemaakte Gmail-verskaffer"</string>
-    <string name="test_application" msgid="5613907578447924035">"Toets program"</string>
     <string name="app_name" msgid="8197930422134712215">"Verenigde e-pos"</string>
     <string name="to" msgid="4392614766835725698">"Aan"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Redigeer"</string>
     <string name="forward" msgid="6822914459902983767">"Stuur aan"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skryf"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Verander etikette"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Bestuur etikette"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etikette"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniseer en laat weet"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Kanselleer"</string>
     <string name="close" msgid="419945428844076406">"Maak toe"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Geen lêers is vir hierdie rekening opgestel nie."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index bc9d2d6..a44d4e1 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"የውሸት የይዘት አቅራቢ"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"የውይይት ይዘት አቅራቢ"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"የመለያ መሸጎጫ አቅራቢ"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"የውሸት ጂሜይል አቅራቢ"</string>
-    <string name="test_application" msgid="5613907578447924035">"የሙከራ መተግበሪያ"</string>
     <string name="app_name" msgid="8197930422134712215">"የተዋሃደ ኢሜይል"</string>
     <string name="to" msgid="4392614766835725698">"ለ"</string>
     <string name="cc" msgid="7017720927911078193">"ካርቦን ቅጂ"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"አርትዕ"</string>
     <string name="forward" msgid="6822914459902983767">"አስተላልፍ"</string>
     <string name="menu_compose" msgid="6274193058224230645">"አዲስ ጻፍ"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"ስያሜዎች ቀይር"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"ስያሜዎችን አደራጅ"</string>
     <string name="label_list_title" msgid="7948730824763052410">"መለያዎች"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"አመሳስል &amp; አሳውቅ"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"ሰርዝ"</string>
     <string name="close" msgid="419945428844076406">"ዝጋ"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"ለዚህ መለያ ምንም ስያሜዎች አልተዘጋጁም።"</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 70ff1b3..93f4d39 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"مزود محتوى زائف"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"مزود محتوى محادثة"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"مزود ذاكرة تخزين مؤقت للحساب"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"مزود Gmail وهمي"</string>
-    <string name="test_application" msgid="5613907578447924035">"اختبار التطبيق"</string>
     <string name="app_name" msgid="8197930422134712215">"عنوان بريد إلكتروني موحَّد"</string>
     <string name="to" msgid="4392614766835725698">"إلى"</string>
     <string name="cc" msgid="7017720927911078193">"نسخة إلى"</string>
@@ -37,10 +32,10 @@
     <string name="compose" msgid="1473559896062432878">"إنشاء"</string>
   <string-array name="compose_modes">
     <item msgid="8631190144210933782">"رد"</item>
-    <item msgid="4085029907540221568">"الرد على الكل"</item>
+    <item msgid="4085029907540221568">"رد على الكل"</item>
     <item msgid="857480048798815437">"إعادة توجيه"</item>
   </string-array>
-    <string name="reply_attribution" msgid="717207316577386788">"بتاريخ <xliff:g id="DATE">%s</xliff:g>، كتب <xliff:g id="PERSON">%s</xliff:g>:"</string>
+    <string name="reply_attribution" msgid="717207316577386788">"بتاريخ <xliff:g id="DATE">%s</xliff:g>، جاء من <xliff:g id="PERSON">%s</xliff:g>:"</string>
     <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>
@@ -66,11 +61,12 @@
     <string name="previous" msgid="309943944831349924">"أحدث"</string>
     <string name="refresh" msgid="490989798005710951">"تحديث"</string>
     <string name="reply" msgid="2032052598496088561">"رد"</string>
-    <string name="reply_all" msgid="7257248094625487557">"الرد على الكل"</string>
+    <string name="reply_all" msgid="7257248094625487557">"رد على الكل"</string>
     <string name="resume_draft" msgid="6450150180834092146">"تعديل"</string>
     <string name="forward" msgid="6822914459902983767">"إعادة توجيه"</string>
     <string name="menu_compose" msgid="6274193058224230645">"إنشاء"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"تغيير التصنيفات"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"إدارة التصنيفات"</string>
     <string name="label_list_title" msgid="7948730824763052410">"التصنيفات"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"المزامنة والإشعارات"</string>
@@ -90,7 +86,7 @@
     <string name="feedback" msgid="79365993169715049">"إرسال تعليقات"</string>
     <string name="help_and_info" msgid="7873089811705257882">"مساعدة"</string>
     <string name="quoted_text" msgid="7250749398672037355">"إدراج النص المقتبس"</string>
-    <string name="quoted_text_label" msgid="541007446961960617">"اقتباس نص"</string>
+    <string name="quoted_text_label" msgid="541007446961960617">"نص مقتبس"</string>
     <string name="respond_inline" msgid="6797117334768201180">"الرد مضمّن"</string>
     <string name="bytes" msgid="8851050881674287386">"بايت"</string>
     <string name="kilobytes" msgid="8506546136898321025">"كيلوبايت"</string>
@@ -165,8 +161,8 @@
     <item quantity="other" msgid="5071459475389411227">"تم الإبلاغ عن &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; كغير مرغوب فيها."</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="5457612502965117672">"تم وضع &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; في أرشيف."</item>
-    <item quantity="other" msgid="3012054504370916482">"تم وضع &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; في أرشيف."</item>
+    <item quantity="one" msgid="5457612502965117672">"تمت أرشفة &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="other" msgid="3012054504370916482">"تمت أرشفة &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
   </plurals>
   <plurals name="conversation_moved_to_inbox">
     <item quantity="one" msgid="8031416635831380071">"تم نقل &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; إلى البريد الوارد."</item>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"إلغاء"</string>
     <string name="close" msgid="419945428844076406">"إغلاق"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"لم يتم تعيين أية مجلدات لهذا الحساب."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index f6f91f8..1f2d579 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Правайдар фiктыўнага кантэнта"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Правайдар кантэнта размоў"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Правайдар кэша для ўлiковага запiсу"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Фiктыўны правайдар Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Тэставае прыкладанне"</string>
     <string name="app_name" msgid="8197930422134712215">"Унiфiкаваная электронная пошта"</string>
     <string name="to" msgid="4392614766835725698">"Каму"</string>
     <string name="cc" msgid="7017720927911078193">"Копія"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Рэдагаваць"</string>
     <string name="forward" msgid="6822914459902983767">"Пераслаць"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Напісаць"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Змяніць цэтлікі"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Кіраванне цэтлікамі"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Цэтлікі"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Сінхранізацыя і апавяшчэнне"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Адмена"</string>
     <string name="close" msgid="419945428844076406">"Закрыць"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Для гэтага ўліковага запісу не былі ўсталяваны цэтлікі."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index fd7e81e..7d5f67c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Доставчик на мнимо съдържание"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Доставчик на съдържание за кореспонденция"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Доставчик на кеш за профила"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Фиктивен доставчик на Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Тестово приложение"</string>
     <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"До"</string>
     <string name="cc" msgid="7017720927911078193">"Як"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Редактиране"</string>
     <string name="forward" msgid="6822914459902983767">"Препращане"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Ново съобщение"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Промяна на етикетите"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Управление на етикетите"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Етикети"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизиране и известяване"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Отказ"</string>
     <string name="close" msgid="419945428844076406">"Затваряне"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"В този профил не са зададени папки."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1231126..5750c8b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Proveïdor de contingut fictici"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Proveïdor de contingut de la conversa"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Proveïdor de memòria cau del compte"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Proveïdor de Gmail fictici"</string>
-    <string name="test_application" msgid="5613907578447924035">"Aplicació de prova"</string>
     <string name="app_name" msgid="8197930422134712215">"Correu electrònic unificat"</string>
     <string name="to" msgid="4392614766835725698">"Per a:"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edita"</string>
     <string name="forward" msgid="6822914459902983767">"Reenvia"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Redacta"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Canvia les etiquetes"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Gestiona les etiquetes"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiquetes"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronitza i notifica"</string>
@@ -149,7 +145,7 @@
     <item quantity="other" msgid="44965256231544025">"S\'estan destacant <xliff:g id="COUNT">%1$d</xliff:g> converses."</item>
   </plurals>
   <plurals name="conversation_unstarring">
-    <item quantity="one" msgid="9149763486272528029">"<xliff:g id="COUNT">%1$d</xliff:g> conversa sense destacar."</item>
+    <item quantity="one" msgid="9149763486272528029">"No destaquis <xliff:g id="COUNT">%1$d</xliff:g> conversa."</item>
     <item quantity="other" msgid="460057780793159215">"No destaquis <xliff:g id="COUNT">%1$d</xliff:g> converses."</item>
   </plurals>
   <plurals name="conversation_unknown_operation">
@@ -158,11 +154,11 @@
   </plurals>
   <plurals name="conversation_muted">
     <item quantity="one" msgid="3197365771487542615">"Se n\'ha silenciat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="1941193356069303587">"Se n\'ha silenciat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="other" msgid="1941193356069303587">"Se n\'han silenciat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
   </plurals>
   <plurals name="conversation_spammed">
     <item quantity="one" msgid="3060864972122279220">"S\'ha informat d\'&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa com a activitat brossa."</item>
-    <item quantity="other" msgid="5071459475389411227">"S\'ha informat d\'&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversa com a activitat brossa."</item>
+    <item quantity="other" msgid="5071459475389411227">"S\'ha informat d\'&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; converses com a activitat brossa."</item>
   </plurals>
   <plurals name="conversation_archived">
     <item quantity="one" msgid="5457612502965117672">"Se n\'ha arxivat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
@@ -170,7 +166,7 @@
   </plurals>
   <plurals name="conversation_moved_to_inbox">
     <item quantity="one" msgid="8031416635831380071">"Se n\'ha mogut &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a la bústia d\'entrada."</item>
-    <item quantity="other" msgid="395816799927580909">"Se n\'ha mogut &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a la bústia d\'entrada."</item>
+    <item quantity="other" msgid="395816799927580909">"Se n\'han mogut &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a la bústia d\'entrada."</item>
   </plurals>
   <plurals name="conversation_deleted">
     <item quantity="one" msgid="4398693029405479323">"Se n\'han suprimit &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
@@ -178,19 +174,19 @@
   </plurals>
   <plurals name="conversation_marked_important">
     <item quantity="one" msgid="2335171317119674993">"Se n\'ha marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a important."</item>
-    <item quantity="other" msgid="709648106181749594">"Se n\'ha marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a important."</item>
+    <item quantity="other" msgid="709648106181749594">"Se n\'han marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a importants."</item>
   </plurals>
   <plurals name="conversation_marked_not_important">
-    <item quantity="one" msgid="63750576337670941">"Se n\'han marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no importants."</item>
+    <item quantity="one" msgid="63750576337670941">"Se n\'ha marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no important."</item>
     <item quantity="other" msgid="6160886583510022920">"Se n\'han marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no importants."</item>
   </plurals>
   <plurals name="conversation_marked_read">
     <item quantity="one" msgid="7853066345561670409">"Se n\'ha marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a llegida."</item>
-    <item quantity="other" msgid="6554100868671029370">"Se n\'ha marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a llegida."</item>
+    <item quantity="other" msgid="6554100868671029370">"Se n\'han marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a llegides."</item>
   </plurals>
   <plurals name="conversation_marked_unread">
     <item quantity="one" msgid="365581967734960166">"Se n\'ha marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no llegida."</item>
-    <item quantity="other" msgid="858491333253953462">"Se n\'ha marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no llegida."</item>
+    <item quantity="other" msgid="858491333253953462">"Se n\'han marcat &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; com a no llegides."</item>
   </plurals>
     <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
     <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Cancel·la"</string>
     <string name="close" msgid="419945428844076406">"Tanca"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"No s\'ha definit cap carpeta per a aquest compte."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 921f762..2000106 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Poskytovatel simulovaného obsahu"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Poskytovatel obsahu konverzací"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Poskytovatel mezipaměti účtu"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Poskytovatel zkušebního účtu Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Testovat aplikaci"</string>
     <string name="app_name" msgid="8197930422134712215">"Sjednocené e-maily"</string>
     <string name="to" msgid="4392614766835725698">"Komu"</string>
     <string name="cc" msgid="7017720927911078193">"Kopie"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Upravit"</string>
     <string name="forward" msgid="6822914459902983767">"Přeposlat"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Napsat"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Změnit štítky"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Spravovat štítky"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Štítky"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizace a upozornění"</string>
@@ -85,11 +81,11 @@
     <string name="older" msgid="6651690916337202936">"Starší"</string>
     <string name="mark_important" msgid="6904096897104265870">"Označit jako důležité"</string>
     <string name="mark_not_important" msgid="4550967327747977068">"Označit jako nedůležité"</string>
-    <string name="add_cc_label" msgid="504861315425773180">"Přidat kopii/skrytou kopii"</string>
+    <string name="add_cc_label" msgid="504861315425773180">"Přidat kopii/skrytou"</string>
     <string name="add_bcc_label" msgid="7432027645493843336">"Přidat skrytou kopii"</string>
     <string name="feedback" msgid="79365993169715049">"Odeslat názor"</string>
     <string name="help_and_info" msgid="7873089811705257882">"Nápověda"</string>
-    <string name="quoted_text" msgid="7250749398672037355">"Zahrnout text v uvozovkách"</string>
+    <string name="quoted_text" msgid="7250749398672037355">"Zahrnout citovaný text"</string>
     <string name="quoted_text_label" msgid="541007446961960617">"Text citace"</string>
     <string name="respond_inline" msgid="6797117334768201180">"Vložená odpověď"</string>
     <string name="bytes" msgid="8851050881674287386">"B"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Zrušit"</string>
     <string name="close" msgid="419945428844076406">"Zavřít"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Pro tento účet nebyly nastaveny žádné složky."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"&gt; %d"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"&gt;%d"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 92a708f..d2843d3 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Leverandør af imiteret indhold"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Leverandør af indhold i samtaler"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Leverandør af cache til konto"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Leverandør af Gmail-dummy"</string>
-    <string name="test_application" msgid="5613907578447924035">"Test applikationen"</string>
     <string name="app_name" msgid="8197930422134712215">"Samlet e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Til"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Rediger"</string>
     <string name="forward" msgid="6822914459902983767">"Videresend"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Skift etiketter"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Administrer etiketter"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketter"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkroniser og underret"</string>
@@ -192,8 +188,10 @@
     <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er markeret som ulæst."</item>
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; er markeret som ulæste."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Ændret mappe."</item>
+    <item quantity="other" msgid="8918589141287976985">"Ændrede mapper."</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultater"</string>
     <string name="searchMode" msgid="3329807422114758583">"Søgetilstand"</string>
     <string name="searchConversationMode" msgid="8015441927706455618">"Tilstand for søgning i samtaler"</string>
@@ -228,11 +226,41 @@
     <string name="cancel" msgid="8762981157252199115">"Annuller"</string>
     <string name="close" msgid="419945428844076406">"Luk"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Der er ikke angivet nogen etiketter for denne konto."</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Gennemført"</item>
+    <item msgid="5037283655022689372">"Forbindelsesfejl"</item>
+    <item msgid="4252875340758600974">"Godkendelsesfejl"</item>
+    <item msgid="7611299631880179587">"Sikkerhedsrelateret fejl"</item>
+    <item msgid="665244114363057627">"Fejl i hukommelse"</item>
+    <item msgid="9190542479647789762">"Intern fejl"</item>
+  </string-array>
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1b7ef2c..bd3bf61 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Falscher Inhaltsanbieter"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Inhaltsanbieter für Konversation"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Cache-Anbieter des Kontos"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Dummy-Gmail-Anbieter"</string>
-    <string name="test_application" msgid="5613907578447924035">"App testen"</string>
     <string name="app_name" msgid="8197930422134712215">"Einheitliche E-Mail"</string>
     <string name="to" msgid="4392614766835725698">"An"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Bearbeiten"</string>
     <string name="forward" msgid="6822914459902983767">"Weiterleiten"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Schreiben"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Labels ändern"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Labels verwalten"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Labels"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchr. &amp; benachrichtigen"</string>
@@ -192,8 +188,10 @@
     <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als ungelesen markiert"</item>
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; als ungelesen markiert"</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Ordner geändert"</item>
+    <item quantity="other" msgid="8918589141287976985">"Ordner geändert"</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Ergebnisse"</string>
     <string name="searchMode" msgid="3329807422114758583">"Suchmodus"</string>
     <string name="searchConversationMode" msgid="8015441927706455618">"Modus \"In Konversationen suchen\""</string>
@@ -228,11 +226,41 @@
     <string name="cancel" msgid="8762981157252199115">"Abbrechen"</string>
     <string name="close" msgid="419945428844076406">"Schließen"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Für dieses Konto wurden noch keine Ordner festgelegt."</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Erfolgreich"</item>
+    <item msgid="5037283655022689372">"Verbindungsfehler"</item>
+    <item msgid="4252875340758600974">"Authentifizierungsfehler"</item>
+    <item msgid="7611299631880179587">"Sicherheitsfehler"</item>
+    <item msgid="665244114363057627">"Speicherfehler"</item>
+    <item msgid="9190542479647789762">"Interner Fehler"</item>
+  </string-array>
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 90ce767..ce3943f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Ψευδής πάροχος περιεχομένου"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Πάροχος περιεχομένου συνομιλίας"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Πάροχος προσωρινής μνήμης λογαριασμού"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Εικονικός πάροχος υπηρεσιών Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Δοκιμή εφαρμογής"</string>
     <string name="app_name" msgid="8197930422134712215">"Ενοποιημένη ηλεκτρονική αλληλογραφία"</string>
     <string name="to" msgid="4392614766835725698">"Προς"</string>
     <string name="cc" msgid="7017720927911078193">"Κοιν."</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Επεξεργασία"</string>
     <string name="forward" msgid="6822914459902983767">"Προώθηση"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Σύνταξη"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Αλλαγή ετικετών"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Διαχείριση ετικετών"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Ετικέτες"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Συγχρονισμός και ειδοποίηση"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Ακύρωση"</string>
     <string name="close" msgid="419945428844076406">"Κλείσιμο"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Δεν έχουν οριστεί φάκελοι σε αυτόν τον λογαριασμό."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b39785e..e71d6d7 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Mock Content Provider"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Conversation Content Provider"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Account Cache Provider"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Dummy Gmail Provider"</string>
-    <string name="test_application" msgid="5613907578447924035">"Test Application"</string>
     <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"To"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edit"</string>
     <string name="forward" msgid="6822914459902983767">"Forward"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Compose"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Change labels"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Manage labels"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Labels"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sync &amp; notify"</string>
@@ -192,8 +188,10 @@
     <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked unread."</item>
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; marked unread."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Changed folder."</item>
+    <item quantity="other" msgid="8918589141287976985">"Changed folders."</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Results"</string>
     <string name="searchMode" msgid="3329807422114758583">"Search Mode"</string>
     <string name="searchConversationMode" msgid="8015441927706455618">"Search Conversation Mode"</string>
@@ -228,11 +226,41 @@
     <string name="cancel" msgid="8762981157252199115">"Cancel"</string>
     <string name="close" msgid="419945428844076406">"Close"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"No folders have been set for this account."</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Success"</item>
+    <item msgid="5037283655022689372">"Connection error"</item>
+    <item msgid="4252875340758600974">"Authentication error"</item>
+    <item msgid="7611299631880179587">"Security error"</item>
+    <item msgid="665244114363057627">"Storage error"</item>
+    <item msgid="9190542479647789762">"Internal error"</item>
+  </string-array>
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f79e4c7..e07f9a2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Proveedor de contenido simulado"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Proveedor de contenido de la conversación"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Proveedor de caché de la cuenta"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Proveedor ficticio de Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Probar aplicación"</string>
     <string name="app_name" msgid="8197930422134712215">"Correo unificado"</string>
     <string name="to" msgid="4392614766835725698">"Para"</string>
     <string name="cc" msgid="7017720927911078193">"CC"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editar"</string>
     <string name="forward" msgid="6822914459902983767">"Reenviar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Redactar"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Cambiar etiquetas"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Administrar etiquetas"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiquetas"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
@@ -192,8 +188,10 @@
     <item quantity="one" msgid="365581967734960166">"Se marcaron &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; como no leídas."</item>
     <item quantity="other" msgid="858491333253953462">"Se marcaron &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; como no leídas."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Carpeta modificada"</item>
+    <item quantity="other" msgid="8918589141287976985">"Carpetas modificadas"</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
     <string name="searchMode" msgid="3329807422114758583">"Buscar modo"</string>
     <string name="searchConversationMode" msgid="8015441927706455618">"Buscar modo de conversación"</string>
@@ -228,11 +226,41 @@
     <string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
     <string name="close" msgid="419945428844076406">"Cerrar"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"No se definieron carpetas para esta cuenta."</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"La acción se realizó correctamente."</item>
+    <item msgid="5037283655022689372">"Error de conexión"</item>
+    <item msgid="4252875340758600974">"Error de autenticación"</item>
+    <item msgid="7611299631880179587">"Error de seguridad"</item>
+    <item msgid="665244114363057627">"Error de almacenamiento"</item>
+    <item msgid="9190542479647789762">"Error interno"</item>
+  </string-array>
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 751a8bf..305654a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Proveedor de contenido simulado"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Proveedor de contenido de conversación"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Proveedor de caché de cuenta"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Proveedor de Gmail ficticio"</string>
-    <string name="test_application" msgid="5613907578447924035">"Probar aplicación"</string>
     <string name="app_name" msgid="8197930422134712215">"Correo unificado"</string>
     <string name="to" msgid="4392614766835725698">"Para"</string>
     <string name="cc" msgid="7017720927911078193">"CC"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editar"</string>
     <string name="forward" msgid="6822914459902983767">"Reenviar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Redactar"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Cambiar etiquetas"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Administrar etiquetas"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiquetas"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
@@ -192,8 +188,10 @@
     <item quantity="one" msgid="365581967734960166">"Se ha marcado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como no leída."</item>
     <item quantity="other" msgid="858491333253953462">"Se han marcado &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como no leídas."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Carpeta cambiada"</item>
+    <item quantity="other" msgid="8918589141287976985">"Carpetas cambiadas"</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
     <string name="searchMode" msgid="3329807422114758583">"Modo de búsqueda"</string>
     <string name="searchConversationMode" msgid="8015441927706455618">"Buscar modo de conversación"</string>
@@ -228,11 +226,41 @@
     <string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
     <string name="close" msgid="419945428844076406">"Cerrar"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"No se ha establecido ninguna carpeta para esta cuenta."</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Sin errores"</item>
+    <item msgid="5037283655022689372">"Error de conexión"</item>
+    <item msgid="4252875340758600974">"Error de autenticación"</item>
+    <item msgid="7611299631880179587">"Error de seguridad"</item>
+    <item msgid="665244114363057627">"Error de almacenamiento"</item>
+    <item msgid="9190542479647789762">"Error interno"</item>
+  </string-array>
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index ba948d4..0b7dc38 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -18,12 +18,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Võlts meilivestluse pakkuja"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Meilivestluse sisupakkuja"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Konto vahemälu pakkuja"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Fiktiivne Gmaili pakkuja"</string>
-    <string name="test_application" msgid="5613907578447924035">"Katseta rakendust"</string>
-    <string name="app_name" msgid="8197930422134712215">"Ühendatud meil"</string>
+    <string name="app_name" msgid="8197930422134712215">"Ühendatud e-post"</string>
     <string name="to" msgid="4392614766835725698">"Saaja"</string>
     <string name="cc" msgid="7017720927911078193">"Koopia"</string>
     <string name="bcc" msgid="3098643138241111579">"Pimekoopia"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Muuda"</string>
     <string name="forward" msgid="6822914459902983767">"Edasta"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Koosta"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Muuda silte"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Halda silte"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Sildid"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sünkroonimine ja teavitamine"</string>
@@ -103,8 +99,8 @@
     <string name="attachment_application_vnd_ms_powerpoint" msgid="861348289167216897">"Esitlus"</string>
     <string name="attachment_application_vnd_ms_excel" msgid="5861224590731578901">"Arvutustabel"</string>
     <string name="attachment_application_pdf" msgid="6922990425001131901">"PDF"</string>
-    <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> fail"</string>
-    <string name="search_hint" msgid="3625734263059221350">"Otsi meili hulgast"</string>
+    <string name="attachment_unknown" msgid="6005445955982153931">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-fail"</string>
+    <string name="search_hint" msgid="3625734263059221350">"Otsi e-posti hulgast"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Jagamine:"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Ava brauseris"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopeeri"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Tühista"</string>
     <string name="close" msgid="419945428844076406">"Sule"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Sellele kontole pole määratud ühtegi kausta."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ed59de6..07aa99e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"ارائه‌دهنده محتوای ساختگی"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"ارائه‌دهنده محتوای مکالمه"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"ارائه‌دهنده حافظه پنهان حساب"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"ارائه‌دهنده ساختگی Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"برنامه آزمایش"</string>
     <string name="app_name" msgid="8197930422134712215">"ایمیل یکپارچه"</string>
     <string name="to" msgid="4392614766835725698">"گیرنده"</string>
     <string name="cc" msgid="7017720927911078193">"گیرنده کپی"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"ویرایش"</string>
     <string name="forward" msgid="6822914459902983767">"باز ارسال"</string>
     <string name="menu_compose" msgid="6274193058224230645">"نوشتن نامه"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"تغییر برچسب‌ها"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"مدیریت برچسب‌ها"</string>
     <string name="label_list_title" msgid="7948730824763052410">"برچسب‌ها"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"همگام‌سازی و اعلان"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"لغو"</string>
     <string name="close" msgid="419945428844076406">"بستن"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"پوشه‌ای برای این حساب تنظیم نشده است."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c99158e..3de64d9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Mock-sisällöntarjoaja"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Keskustelun sisällöntarjoaja"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Tilin välimuistipalveluntarjoaja"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Dummy Gmail-palveluntarjoaja"</string>
-    <string name="test_application" msgid="5613907578447924035">"Testaa sovellus"</string>
     <string name="app_name" msgid="8197930422134712215">"Yhtenäinen sähköposti"</string>
     <string name="to" msgid="4392614766835725698">"Vastaanott."</string>
     <string name="cc" msgid="7017720927911078193">"Kopio"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Muokkaa"</string>
     <string name="forward" msgid="6822914459902983767">"Lähetä edelleen"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Viestin kirjoitus"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Muuta tunnisteita"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Hallinnoi tunnisteita"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Tunnisteet"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronoi ja ilmoita"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Peruuta"</string>
     <string name="close" msgid="419945428844076406">"Sulje"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Tälle tilille ei ole määritetty kansioita."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 16c0066..1c2257a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Fournisseur de contenu factice"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Fournisseur de contenu de conversation"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Fournisseur de cache de compte"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Fournisseur Gmail factice"</string>
-    <string name="test_application" msgid="5613907578447924035">"Tester l\'application"</string>
     <string name="app_name" msgid="8197930422134712215">"Application E-mail unifiée"</string>
     <string name="to" msgid="4392614766835725698">"À"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Modifier"</string>
     <string name="forward" msgid="6822914459902983767">"Transférer"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Nouveau message"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Modifier les libellés"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Gérer les libellés"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Libellés"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniser et signaler"</string>
@@ -192,8 +188,10 @@
     <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversation marquée comme non lue."</item>
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversations marquées comme non lues."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Dossier modifié."</item>
+    <item quantity="other" msgid="8918589141287976985">"Dossiers modifiés."</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Résultats"</string>
     <string name="searchMode" msgid="3329807422114758583">"Mode Recherche"</string>
     <string name="searchConversationMode" msgid="8015441927706455618">"Mode Rechercher dans la conversation"</string>
@@ -228,11 +226,41 @@
     <string name="cancel" msgid="8762981157252199115">"Annuler"</string>
     <string name="close" msgid="419945428844076406">"Fermer"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Aucun dossier n\'a été défini pour ce compte."</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Opération réussie."</item>
+    <item msgid="5037283655022689372">"Erreur de connexion."</item>
+    <item msgid="4252875340758600974">"Erreur d\'authentification."</item>
+    <item msgid="7611299631880179587">"Erreur liée à la sécurité."</item>
+    <item msgid="665244114363057627">"Erreur de stockage."</item>
+    <item msgid="9190542479647789762">"Erreur interne."</item>
+  </string-array>
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4fa13cd..2ab7a34 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"कृत्रिम सामग्री प्रदाता"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"बातचीत सामग्री प्रदाता"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"खाता संचय प्रदाता"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"डमी Gmail प्रदाता"</string>
-    <string name="test_application" msgid="5613907578447924035">"एप्‍लिकेशन का परीक्षण करें"</string>
     <string name="app_name" msgid="8197930422134712215">"एकीकृत ईमेल"</string>
     <string name="to" msgid="4392614766835725698">"प्रति"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"संपादित करें"</string>
     <string name="forward" msgid="6822914459902983767">"अग्रेषित करें"</string>
     <string name="menu_compose" msgid="6274193058224230645">"लिखें"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"लेबल बदलें"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"लेबल प्रबंधित करें"</string>
     <string name="label_list_title" msgid="7948730824763052410">"लेबल"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"समन्वयित करें और सूचित करें"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"रद्द करें"</string>
     <string name="close" msgid="419945428844076406">"बंद करें"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"इस खाते के लिए कोई फ़ोल्‍डर सेट नहीं किया गया है."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 974c5b6..bf0e4a1 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Davatelj omalovažavajućeg sadržaja"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Davatelj sadržaja razgovora"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Davatelj predmemorije računa"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Lažni davatelj Gmaila"</string>
-    <string name="test_application" msgid="5613907578447924035">"Isprobajte aplikaciju"</string>
     <string name="app_name" msgid="8197930422134712215">"Objedinjena e-pošta"</string>
     <string name="to" msgid="4392614766835725698">"Prima"</string>
     <string name="cc" msgid="7017720927911078193">"Kopija"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Uredi"</string>
     <string name="forward" msgid="6822914459902983767">"Dalje"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Nova poruka"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Promijeni oznake"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Upravljanje oznakama"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Oznake"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniziraj i obavijesti"</string>
@@ -157,8 +153,8 @@
     <item quantity="other" msgid="850868849811019745">"Čekanje na postupanje po <xliff:g id="COUNT">%1$d</xliff:g> razgovora."</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3197365771487542615">"Prigušeno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
-    <item quantity="other" msgid="1941193356069303587">"Prigušeno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="one" msgid="3197365771487542615">"Zanemareno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
+    <item quantity="other" msgid="1941193356069303587">"Zanemareno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
   </plurals>
   <plurals name="conversation_spammed">
     <item quantity="one" msgid="3060864972122279220">"Prijavljeno kao neželjeno: &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt;."</item>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Odustani"</string>
     <string name="close" msgid="419945428844076406">"Zatvori"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Za ovaj račun nisu postavljene mape."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index dd92b24..f7ec58d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Tartalomszolgáltató-utánzat"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Beszélgetés-tartalomszolgáltató"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Fiók gyorsítótár-szolgáltatója"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Dummy Gmail-szolgáltató"</string>
-    <string name="test_application" msgid="5613907578447924035">"Alkalmazás tesztelése"</string>
     <string name="app_name" msgid="8197930422134712215">"Egységes e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Címzett"</string>
     <string name="cc" msgid="7017720927911078193">"Másolatot kap"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Szerkesztés"</string>
     <string name="forward" msgid="6822914459902983767">"Továbbítás"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Levélírás"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Címkék módosítása"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Címkék kezelése"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Címkék"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Szinkronizálás és értesítés"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Mégse"</string>
     <string name="close" msgid="419945428844076406">"Bezárás"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Nincs beállítva mappa ehhez a fiókhoz."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2118f66..b121b97 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Penyedia Konten Palsu"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Penyedia Konten Percakapan"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Penyedia Tembolok Akun"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Penyedia Gmail Dumi"</string>
-    <string name="test_application" msgid="5613907578447924035">"Uji Aplikasi"</string>
     <string name="app_name" msgid="8197930422134712215">"Email Terpadu"</string>
     <string name="to" msgid="4392614766835725698">"Kepada"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edit"</string>
     <string name="forward" msgid="6822914459902983767">"Teruskan"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Tulis"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Ubah label"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Kelola label"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Label"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkronkan &amp; beri tahu"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Batal"</string>
     <string name="close" msgid="419945428844076406">"Tutup"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Tidak ada map yang disetel untuk akun ini."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ddc1096..fb13be6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,12 +18,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Fornitore contenuti fittizi"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Fornitore contenuti conversazione"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Fornitore cache account"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Fornitore Gmail fittizio"</string>
-    <string name="test_application" msgid="5613907578447924035">"Testa applicazione"</string>
-    <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
+    <string name="app_name" msgid="8197930422134712215">"Email unificata"</string>
     <string name="to" msgid="4392614766835725698">"A"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Ccn"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Modifica"</string>
     <string name="forward" msgid="6822914459902983767">"Inoltra"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Scrivi"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Cambia etichette"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Gestisci etichette"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etichette"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizza e notifica"</string>
@@ -192,8 +188,10 @@
     <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnata come da leggere."</item>
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; segnate come da leggere."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Cartella cambiata."</item>
+    <item quantity="other" msgid="8918589141287976985">"Cartelle cambiate."</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Risultati"</string>
     <string name="searchMode" msgid="3329807422114758583">"Modalità di ricerca"</string>
     <string name="searchConversationMode" msgid="8015441927706455618">"Modalità Ricerca conversazione"</string>
@@ -228,11 +226,41 @@
     <string name="cancel" msgid="8762981157252199115">"Annulla"</string>
     <string name="close" msgid="419945428844076406">"Chiudi"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Nessuna cartella impostata per questo account."</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Operazione riuscita"</item>
+    <item msgid="5037283655022689372">"Errore di connessione"</item>
+    <item msgid="4252875340758600974">"Errore di autenticazione"</item>
+    <item msgid="7611299631880179587">"Errore di sicurezza"</item>
+    <item msgid="665244114363057627">"Errore di archiviazione"</item>
+    <item msgid="9190542479647789762">"Errore interno"</item>
+  </string-array>
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a8d858c..2ba2d68 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"ספק תוכן מדומה"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"ספק של תוכן שיחה"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"ספק של קובץ שמור לחשבון"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"ספק מדומה של Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"בדוק את היישום"</string>
     <string name="app_name" msgid="8197930422134712215">"דוא\"ל מאוחד"</string>
     <string name="to" msgid="4392614766835725698">"אל"</string>
     <string name="cc" msgid="7017720927911078193">"עותק"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"ערוך"</string>
     <string name="forward" msgid="6822914459902983767">"העבר"</string>
     <string name="menu_compose" msgid="6274193058224230645">"כתוב"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"שנה תוויות"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"נהל תוויות"</string>
     <string name="label_list_title" msgid="7948730824763052410">"תוויות"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"סנכרן ושלח התראה"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"בטל"</string>
     <string name="close" msgid="419945428844076406">"סגור"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"לא הוגדרו תיקיות לחשבון זה."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 230f0a9..6feed67 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"モックコンテンツプロバイダ"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"スレッドコンテンツプロバイダ"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"アカウントキャッシュプロバイダ"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"ダミーGmailプロバイダ"</string>
-    <string name="test_application" msgid="5613907578447924035">"アプリのテスト"</string>
     <string name="app_name" msgid="8197930422134712215">"統合メール"</string>
     <string name="to" msgid="4392614766835725698">"To"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"編集"</string>
     <string name="forward" msgid="6822914459902983767">"転送"</string>
     <string name="menu_compose" msgid="6274193058224230645">"作成"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"ラベルを変更"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"ラベルを管理"</string>
     <string name="label_list_title" msgid="7948730824763052410">"ラベル"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"同期と通知"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"キャンセル"</string>
     <string name="close" msgid="419945428844076406">"閉じる"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"このアカウントに設定されているフォルダはありません。"</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d超"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d超"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b259ebc..06bef8f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"모의 콘텐츠 제공업체"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"대화 콘텐츠 제공업체"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"계정 캐시 제공업체"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"더미 Gmail 제공업체"</string>
-    <string name="test_application" msgid="5613907578447924035">"애플리케이션 테스트"</string>
     <string name="app_name" msgid="8197930422134712215">"통합 이메일"</string>
     <string name="to" msgid="4392614766835725698">"받는사람"</string>
     <string name="cc" msgid="7017720927911078193">"참조"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"수정"</string>
     <string name="forward" msgid="6822914459902983767">"전달"</string>
     <string name="menu_compose" msgid="6274193058224230645">"편지쓰기"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"라벨 변경"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"라벨 관리"</string>
     <string name="label_list_title" msgid="7948730824763052410">"라벨"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"동기화 및 알림"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"취소"</string>
     <string name="close" msgid="419945428844076406">"닫기"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"이 계정에 대한 폴더를 설정하지 않았습니다."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index cf24756..a7ae261 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Netikro turinio teikėjas"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Pokalbių turinio teikėjas"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Paskyros talpyklos teikėjas"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Papildomų „Gmail“ paskyrų teikėjas"</string>
-    <string name="test_application" msgid="5613907578447924035">"Išbandyti programą"</string>
     <string name="app_name" msgid="8197930422134712215">"Bendras el. laiškas"</string>
     <string name="to" msgid="4392614766835725698">"Kam:"</string>
     <string name="cc" msgid="7017720927911078193">"Kopija"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Redaguoti"</string>
     <string name="forward" msgid="6822914459902983767">"Persiųsti"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Sukurti"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Keisti etiketes"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Tvarkyti etiketes"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketės"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinchronizuoti ir pranešti"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Atšaukti"</string>
     <string name="close" msgid="419945428844076406">"Uždaryti"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Šiai paskyrai nenustatyti jokie aplankai."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 37afcea..bbd3d2c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Imitētā satura nodrošinātājs"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Sarunas satura nodrošinātājs"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Konta kešatmiņas nodrošinātājs"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Neīsta Gmail konta nodrošinātājs"</string>
-    <string name="test_application" msgid="5613907578447924035">"Izmēģinājuma lietojumprogramma"</string>
     <string name="app_name" msgid="8197930422134712215">"Vienots e-pasts"</string>
     <string name="to" msgid="4392614766835725698">"Kam:"</string>
     <string name="cc" msgid="7017720927911078193">"Kopija"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Rediģēt"</string>
     <string name="forward" msgid="6822914459902983767">"Pārsūtīt"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Rakstīt"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Mainīt iezīmes"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Pārvaldīt iezīmes"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Iezīmes"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhronizēšana un paziņojumi"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Atcelt"</string>
     <string name="close" msgid="419945428844076406">"Aizvērt"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Šajā kontā nav izveidota neviena mape."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 36d940e..bd3291c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Pembekal Kandungan Palsu"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Penyedia Kandungan Perbualan"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Penyedia Cache Akaun"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Penyedia Gmail Dami"</string>
-    <string name="test_application" msgid="5613907578447924035">"Uji Aplikasi"</string>
     <string name="app_name" msgid="8197930422134712215">"E-mel Disatukan"</string>
     <string name="to" msgid="4392614766835725698">"Kepada"</string>
     <string name="cc" msgid="7017720927911078193">"Sk"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edit"</string>
     <string name="forward" msgid="6822914459902983767">"Kirim semula"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Karang"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Tukar label"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Urus label"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Label"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Segerakkan &amp; beritahu"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Batal"</string>
     <string name="close" msgid="419945428844076406">"Tutup"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Tiada folder ditetapkan untuk akaun ini."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 16ea64e..9d8a98f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Simulert innholdsleverandør"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Innholdsleverandør for samtale"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Leverandør av kontobuffer"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Eksempel på Gmail-leverandør"</string>
-    <string name="test_application" msgid="5613907578447924035">"Test-app"</string>
     <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"Til"</string>
     <string name="cc" msgid="7017720927911078193">"Kopi"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Rediger"</string>
     <string name="forward" msgid="6822914459902983767">"Videresend"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv ny"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Endre etiketter"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Administrer etiketter"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketter"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronisering og varsling"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Avbryt"</string>
     <string name="close" msgid="419945428844076406">"Lukk"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Ingen mapper er angitt for denne kontoen."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 62cb3b8..d7c8679 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Provider van nepinhoud"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Provider van conversatie-inhoud"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Provider van accountcache"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Dummy Gmail-provider"</string>
-    <string name="test_application" msgid="5613907578447924035">"Testapp"</string>
     <string name="app_name" msgid="8197930422134712215">"Gecombineerde e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Aan"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Bewerken"</string>
     <string name="forward" msgid="6822914459902983767">"Doorsturen"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Opstellen"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Labels wijzigen"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Labels beheren"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Labels"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniseren en melden"</string>
@@ -192,8 +188,10 @@
     <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemarkeerd als ongelezen."</item>
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; gemarkeerd als ongelezen."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Map gewijzigd."</item>
+    <item quantity="other" msgid="8918589141287976985">"Mappen gewijzigd."</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultaten"</string>
     <string name="searchMode" msgid="3329807422114758583">"Zoekmodus"</string>
     <string name="searchConversationMode" msgid="8015441927706455618">"Modus voor zoeken naar conversaties"</string>
@@ -228,11 +226,41 @@
     <string name="cancel" msgid="8762981157252199115">"Annuleren"</string>
     <string name="close" msgid="419945428844076406">"Sluiten"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Er zijn geen mappen ingesteld voor dit account."</string>
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Geslaagd"</item>
+    <item msgid="5037283655022689372">"Verbindingsfout"</item>
+    <item msgid="4252875340758600974">"Verificatiefout"</item>
+    <item msgid="7611299631880179587">"Beveiligingsfout"</item>
+    <item msgid="665244114363057627">"Opslagfout"</item>
+    <item msgid="9190542479647789762">"Interne fout"</item>
+  </string-array>
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a7cfc22..89193d8 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Dostawca pozorowanej treści"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Dostawca treści wątku"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Dostawca pamięci podręcznej konta"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Dostawca testowego konta Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Testuj aplikację"</string>
     <string name="app_name" msgid="8197930422134712215">"Ujednolicony e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Do"</string>
     <string name="cc" msgid="7017720927911078193">"DW"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edytuj"</string>
     <string name="forward" msgid="6822914459902983767">"Przekaż dalej"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Utwórz"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Zmień etykiety"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Zarządzaj etykietami"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etykiety"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizuj i powiadamiaj"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Anuluj"</string>
     <string name="close" msgid="419945428844076406">"Zamknij"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Dla tego konta nie ustawiono żadnych folderów."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a9fa6fc..42caba1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Fornecedor de Conteúdo Fictício"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Fornecedor de Conteúdo de Conversas"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Fornecedor de Cache da Conta"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Fornecedor de Gmail de Teste"</string>
-    <string name="test_application" msgid="5613907578447924035">"Testar a Aplicação"</string>
     <string name="app_name" msgid="8197930422134712215">"E-mail Unificado"</string>
     <string name="to" msgid="4392614766835725698">"Para"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editar"</string>
     <string name="forward" msgid="6822914459902983767">"Encaminhar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Compor"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Alterar etiquetas"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Gerir etiquetas"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiquetas"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
     <string name="close" msgid="419945428844076406">"Fechar"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Não foram definidas pastas para esta conta."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f79fef2..de29312 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Provedor de conteúdo fictício"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Provedor de conteúdo da conversa"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Provedor de cache de conta"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Provedor falso do Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Aplicativo de teste"</string>
     <string name="app_name" msgid="8197930422134712215">"E-mail unificado"</string>
     <string name="to" msgid="4392614766835725698">"Para"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editar"</string>
     <string name="forward" msgid="6822914459902983767">"Encaminhar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Escrever"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Alterar marcadores"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Gerenciar marcadores"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Marcadores"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
     <string name="close" msgid="419945428844076406">"Fechar"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Nenhuma pasta foi definida para esta conta."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d3f8fc4..70f719d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Furnizor de conţinut fictiv"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Furnizor de conţinut pentru conversaţii"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Furnizor cache pentru cont"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Furnizor Gmail fictiv"</string>
-    <string name="test_application" msgid="5613907578447924035">"Testaţi aplicaţia"</string>
     <string name="app_name" msgid="8197930422134712215">"Cont de e-mail unificat"</string>
     <string name="to" msgid="4392614766835725698">"Către"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -40,7 +35,7 @@
     <item msgid="4085029907540221568">"Răsp. tuturor"</item>
     <item msgid="857480048798815437">"Redirecţionaţi"</item>
   </string-array>
-    <string name="reply_attribution" msgid="717207316577386788">"În data de <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> a scris:"</string>
+    <string name="reply_attribution" msgid="717207316577386788">"Pe <xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> a scris:"</string>
     <string name="forward_attribution" msgid="1498936339458535158">"---------- Mesaj redirecţionat ----------&lt;br&gt;De la: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Dată: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Subiect: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Către: <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">"Alegeţi tipul de ataşament"</string>
@@ -56,7 +51,7 @@
     <string name="send" msgid="8242003661397555986">"Trimiteţi"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marcaţi drept citită"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Marcaţi drept necitită"</string>
-    <string name="mute" msgid="1995954983688603977">"Dezactivaţi sunetul"</string>
+    <string name="mute" msgid="1995954983688603977">"Suprimaţi"</string>
     <string name="add_star" msgid="2866003744391266498">"Marcaţi cu stea"</string>
     <string name="remove_star" msgid="4372327933122106128">"Eliminaţi steaua"</string>
     <string name="archive" msgid="847250094775910499">"Arhivaţi"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editaţi"</string>
     <string name="forward" msgid="6822914459902983767">"Redirecţionaţi"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Scrieţi"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Modificaţi etichetele"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Gestionaţi etichetele"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etichete"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizare şi notificare"</string>
@@ -91,7 +87,7 @@
     <string name="help_and_info" msgid="7873089811705257882">"Ajutor"</string>
     <string name="quoted_text" msgid="7250749398672037355">"Includeţi textul citat"</string>
     <string name="quoted_text_label" msgid="541007446961960617">"Text citat"</string>
-    <string name="respond_inline" msgid="6797117334768201180">"Răspundeţi direct"</string>
+    <string name="respond_inline" msgid="6797117334768201180">"Răspundeţi inline"</string>
     <string name="bytes" msgid="8851050881674287386">"O"</string>
     <string name="kilobytes" msgid="8506546136898321025">"KO"</string>
     <string name="megabytes" msgid="1469217534120857347">"MO"</string>
@@ -157,8 +153,8 @@
     <item quantity="other" msgid="850868849811019745">"Se aşteaptă finalizarea unei operaţii pentru <xliff:g id="COUNT">%1$d</xliff:g> (de) conversaţii."</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3197365771487542615">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; cu sunetul dezactivat."</item>
-    <item quantity="other" msgid="1941193356069303587">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; cu sunetul dezactivat."</item>
+    <item quantity="one" msgid="3197365771487542615">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; suprimată."</item>
+    <item quantity="other" msgid="1941193356069303587">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; suprimate."</item>
   </plurals>
   <plurals name="conversation_spammed">
     <item quantity="one" msgid="3060864972122279220">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost raportată ca spam."</item>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Anulaţi"</string>
     <string name="close" msgid="419945428844076406">"Închideţi"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Pentru acest cont nu a fost setat niciun dosar."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fd84a36..3cedaf3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Mock Content Provider"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Провайдер контента для цепочек"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Провайдер кэша для аккаунта"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Dummy Gmail Provider"</string>
-    <string name="test_application" msgid="5613907578447924035">"Тестировать приложение"</string>
     <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"Кому"</string>
     <string name="cc" msgid="7017720927911078193">"Копия"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Изменить"</string>
     <string name="forward" msgid="6822914459902983767">"Переслать"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Написать"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Изменить ярлыки"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Управление ярлыками"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Ярлыки"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизация и уведомления"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Отмена"</string>
     <string name="close" msgid="419945428844076406">"Закрыть"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"В этом аккаунте нет папок."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index bc8ac06..c747d57 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Poskytovateľ simulovaného obsahu"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Poskytovateľ obsahu konverzácií"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Poskytovateľ vyrovnávacej pamäte účtu"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Poskytovateľ skúšobného účtu Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Testovať aplikáciu"</string>
     <string name="app_name" msgid="8197930422134712215">"Zjednotený e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Komu"</string>
     <string name="cc" msgid="7017720927911078193">"Kópia"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Upraviť"</string>
     <string name="forward" msgid="6822914459902983767">"Poslať ďalej"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Napísať správu"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Zmeniť menovky"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Spravovať menovky"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Menovky"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizovať a upozorniť"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Zrušiť"</string>
     <string name="close" msgid="419945428844076406">"Zavrieť"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Pre tento účet neboli nastavené žiadne priečinky."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 49dc04f..6c35c3b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Ponudnik lažne vsebine"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Ponudnik vsebine pogovorov"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Ponudnik predpomnilnika računa"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Ponudnik lažnega Gmaila"</string>
-    <string name="test_application" msgid="5613907578447924035">"Preskus programa"</string>
     <string name="app_name" msgid="8197930422134712215">"Poenotena e-pošta"</string>
     <string name="to" msgid="4392614766835725698">"Za"</string>
     <string name="cc" msgid="7017720927911078193">"Kp"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Uredi"</string>
     <string name="forward" msgid="6822914459902983767">"Posreduj"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Novo"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Spremeni oznake"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Upravljanje oznak"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Oznake"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhroniziraj in obvesti"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Prekliči"</string>
     <string name="close" msgid="419945428844076406">"Zapri"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Za ta račun ni nastavljenih map."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index cfa6252..ff40aa9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Добављач лажног садржаја"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Добављач садржаја преписки"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Добављач кеша налога"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Пример Gmail добављача"</string>
-    <string name="test_application" msgid="5613907578447924035">"Тестирај апликацију"</string>
     <string name="app_name" msgid="8197930422134712215">"Обједињена е-пошта"</string>
     <string name="to" msgid="4392614766835725698">"Коме"</string>
     <string name="cc" msgid="7017720927911078193">"Копија"</string>
@@ -42,7 +37,7 @@
   </string-array>
     <string name="reply_attribution" msgid="717207316577386788">"<xliff:g id="DATE">%s</xliff:g>, <xliff:g id="PERSON">%s</xliff:g> је написао/ла:"</string>
     <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">"Cc: <xliff:g id="CC">%1$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>
     <string name="too_large_to_attach" msgid="6355534239324333583">"Датотека је превелика за прилог."</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"Није могуће приложити датотеку."</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Измени"</string>
     <string name="forward" msgid="6822914459902983767">"Проследи"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Нова порука"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Промени ознаке"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Управљај ознакама"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Ознаке"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизовање и обавештавање"</string>
@@ -206,14 +202,14 @@
     <string name="recent_labels" msgid="5539494776429934547">"Недавне"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Прошири детаље о примаоцу"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Скупи детаље о примаоцу"</string>
-    <string name="contact_info_string" msgid="6911322458329265644">"Прикажи контакт информације за корисника <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="contact_info_string" msgid="6911322458329265644">"Прикажи контакт информације корисника <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Прикажи контакт информације"</string>
     <string name="expand_read_messages" msgid="7458927270492299063">"Прошири прочитане поруке"</string>
     <string name="show_messages_read" msgid="9132147830566909631">"Претходно прочитаних порука:"</string>
     <string name="date_heading" msgid="2414358582984879303">"Датум:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Одговор на:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Коме:"</string>
-    <string name="cc_heading" msgid="8116221732072085180">"Cc:"</string>
+    <string name="cc_heading" msgid="8116221732072085180">"Копија:"</string>
     <string name="bcc_heading" msgid="5528824453033598299">"Bcc:"</string>
     <string name="show_images" msgid="1875700481186331432">"Прикажи слике"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Увек приказуј слике овог пошиљаоца"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Откажи"</string>
     <string name="close" msgid="419945428844076406">"Затвори"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Нису подешени директоријуми за овај налог."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 28e04c6..bad25d8 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Imiterad innehållsleverantör (mock)"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Innehållsleverantör i konversation"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Leverantör av kontocache"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Dummy Gmail-leverantör"</string>
-    <string name="test_application" msgid="5613907578447924035">"Test av app"</string>
     <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"Till"</string>
     <string name="cc" msgid="7017720927911078193">"Kopia"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Redigera"</string>
     <string name="forward" msgid="6822914459902983767">"Vidarebefordra"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Ändra etiketter"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Hantera etiketter"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketter"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synka och meddela"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Avbryt"</string>
     <string name="close" msgid="419945428844076406">"Stäng"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Inga mappar har angetts för det här kontot."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 05d6834..9f90c63 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Mtoa Huduma wa Maudhui Mwigo"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Mtoa huduma wa Maudhui ya Mazungumzo"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Mtoa Huduma wa Kache ya Akaunti"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Mtoa Huduma wa Mwigo wa Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Programu la Jaribio"</string>
     <string name="app_name" msgid="8197930422134712215">"Barua pepe Iliyounganishwa"</string>
     <string name="to" msgid="4392614766835725698">"Kwa"</string>
     <string name="cc" msgid="7017720927911078193">"Nakala kwa"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Hariri"</string>
     <string name="forward" msgid="6822914459902983767">"Sambaza"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Tunga"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Badilisha lebo"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Dhibiti lebo"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Lebo"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Landanisha &amp; arifu"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Ghairi"</string>
     <string name="close" msgid="419945428844076406">"Funga"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Hakuna folda zilizowekwa za akaunti hii."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6f61f77..f60af8b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"ผู้ให้บริการเนื้อหาจำลอง"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"ผู้ให้บริการเนื้อหาการสนทนา"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"ผู้ให้บริการแคชของบัญชี"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"ผู้ให้บริการ Gmail จำลอง"</string>
-    <string name="test_application" msgid="5613907578447924035">"ทดสอบแอปพลิเคชัน"</string>
     <string name="app_name" msgid="8197930422134712215">"อีเมลเดียว"</string>
     <string name="to" msgid="4392614766835725698">"ถึง"</string>
     <string name="cc" msgid="7017720927911078193">"สำเนา"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"แก้ไข"</string>
     <string name="forward" msgid="6822914459902983767">"ส่งต่อ"</string>
     <string name="menu_compose" msgid="6274193058224230645">"เขียน"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"เปลี่ยนป้ายกำกับ"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"จัดการป้ายกำกับ"</string>
     <string name="label_list_title" msgid="7948730824763052410">"ป้ายกำกับ"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"ซิงค์และแจ้งเตือน"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"ยกเลิก"</string>
     <string name="close" msgid="419945428844076406">"ปิด"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"ไม่ได้กำหนดโฟลเดอร์ใดไว้สำหรับบัญชีนี้"</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e78cb54..d6d7d9f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Mock na Provider ng Nilalaman"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Provider ng Nilalaman ng Pag-uusap"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Provider ng Cache ng Account"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Provider ng Dummy na Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Pansubok na Application"</string>
     <string name="app_name" msgid="8197930422134712215">"Pinag-isang Email"</string>
     <string name="to" msgid="4392614766835725698">"Para kay"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"I-edit"</string>
     <string name="forward" msgid="6822914459902983767">"Ipasa"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Bumuo"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Baguhin ang mga label"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Pamahalaan ang mga label"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Mga Label"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"I-sync at i-notify"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Kanselahin"</string>
     <string name="close" msgid="419945428844076406">"Isara"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Walang mga folder na naitakda para sa account na ito."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d0406d5..d68a8be 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Taklit İçerik Sağlayıcı"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"İleti Dizisi İçerik Sağlayıcısı"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Hesap Önbellek Sağlayıcısı"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Model Gmail Sağlayıcı"</string>
-    <string name="test_application" msgid="5613907578447924035">"Uygulamayı test et"</string>
     <string name="app_name" msgid="8197930422134712215">"Birleştirilmiş E-posta"</string>
     <string name="to" msgid="4392614766835725698">"Alıcı:"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -34,7 +29,7 @@
     <string name="add_file_attachment" msgid="2203398371671979481">"Dosya ekleyin"</string>
     <string name="save_draft" msgid="5555744208032445632">"Taslağı kaydet"</string>
     <string name="discard" msgid="1714960202994370243">"Sil"</string>
-    <string name="compose" msgid="1473559896062432878">"Oluştur"</string>
+    <string name="compose" msgid="1473559896062432878">"E-posta yaz"</string>
   <string-array name="compose_modes">
     <item msgid="8631190144210933782">"Yanıt"</item>
     <item msgid="4085029907540221568">"Tümünü yanıtla"</item>
@@ -65,12 +60,13 @@
     <string name="next" msgid="4674401197968248302">"Daha eski"</string>
     <string name="previous" msgid="309943944831349924">"Daha yeni"</string>
     <string name="refresh" msgid="490989798005710951">"Yenile"</string>
-    <string name="reply" msgid="2032052598496088561">"Yanıt"</string>
+    <string name="reply" msgid="2032052598496088561">"Yanıtla"</string>
     <string name="reply_all" msgid="7257248094625487557">"Tümünü yanıtla"</string>
     <string name="resume_draft" msgid="6450150180834092146">"Düzenle"</string>
     <string name="forward" msgid="6822914459902983767">"Yönlendir"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Oluştur"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Etiketleri değiştir"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Etiketleri yönet"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketler"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Senkronize et ve bildir"</string>
@@ -129,7 +125,7 @@
     <item quantity="one" msgid="333591132893648383">"Taslak"</item>
     <item quantity="other" msgid="6961049507579977505">"Taslaklar"</item>
   </plurals>
-    <string name="sending" msgid="8214361929125649771">"Gönderiliyor ..."</string>
+    <string name="sending" msgid="8214361929125649771">"Gönderiliyor..."</string>
     <string name="send_failed" msgid="750908595144529579">"İleti gönderilmedi."</string>
     <string name="me" msgid="6480762904022198669">"ben"</string>
     <string name="labels" msgid="1519770547536283663">"Etiketler"</string>
@@ -153,12 +149,12 @@
     <item quantity="other" msgid="460057780793159215">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisinin yıldızı kaldırılıyor."</item>
   </plurals>
   <plurals name="conversation_unknown_operation">
-    <item quantity="one" msgid="235911194119829184">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisinde işlem yapmak için bekleniyor."</item>
-    <item quantity="other" msgid="850868849811019745">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisinde işlem yapmak için bekleniyor."</item>
+    <item quantity="one" msgid="235911194119829184">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisi üzerindeki işlemin tamamlanması bekleniyor."</item>
+    <item quantity="other" msgid="850868849811019745">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisi üzerindeki işlemin tamamlanması bekleniyor."</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3197365771487542615">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi kapatıldı."</item>
-    <item quantity="other" msgid="1941193356069303587">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi kapatıldı."</item>
+    <item quantity="one" msgid="3197365771487542615">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi yoksayıldı."</item>
+    <item quantity="other" msgid="1941193356069303587">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi yoksayıldı."</item>
   </plurals>
   <plurals name="conversation_spammed">
     <item quantity="one" msgid="3060864972122279220">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi spam olarak bildirildi."</item>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"İptal"</string>
     <string name="close" msgid="419945428844076406">"Kapat"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Bu hesap için hiçbir klasör ayarlanmamış."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c452b95..e4dade1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Постачальник фіктивного вмісту"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Постачальник вмісту бесід"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Постачальник кешу облікового запису"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Постачальник формальних облікових записів Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Тестувати програму"</string>
     <string name="app_name" msgid="8197930422134712215">"Об’єднана електронна пошта"</string>
     <string name="to" msgid="4392614766835725698">"Кому"</string>
     <string name="cc" msgid="7017720927911078193">"Копія"</string>
@@ -33,7 +28,7 @@
     <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Вкласти файл"</string>
     <string name="save_draft" msgid="5555744208032445632">"Зберегти як чернетку"</string>
-    <string name="discard" msgid="1714960202994370243">"Відхилити"</string>
+    <string name="discard" msgid="1714960202994370243">"Закрити"</string>
     <string name="compose" msgid="1473559896062432878">"Написати"</string>
   <string-array name="compose_modes">
     <item msgid="8631190144210933782">"Відповісти"</item>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Редагувати"</string>
     <string name="forward" msgid="6822914459902983767">"Переслати"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Написати"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Змінити мітки"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Керувати мітками"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Мітки"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронізація та сповіщення"</string>
@@ -138,23 +134,23 @@
     <string name="undo" msgid="6070869718469782251">"Відмінити"</string>
   <plurals name="conversation_marking_read">
     <item quantity="one" msgid="394911867474214874">"Позначення <xliff:g id="COUNT">%1$d</xliff:g> бесіди як прочитаної."</item>
-    <item quantity="other" msgid="247178462544083532">"Позначення <xliff:g id="COUNT">%1$d</xliff:g> бесід як прочитаних."</item>
+    <item quantity="other" msgid="247178462544083532">"Позначення бесід як прочитаних: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
   </plurals>
   <plurals name="conversation_marking_unread">
     <item quantity="one" msgid="2959859634779672558">"Позначення <xliff:g id="COUNT">%1$d</xliff:g> бесіди як непрочитаної."</item>
-    <item quantity="other" msgid="6577233770583912846">"Позначення <xliff:g id="COUNT">%1$d</xliff:g> бесід як непрочитаних."</item>
+    <item quantity="other" msgid="6577233770583912846">"Позначення бесід як прочитаних: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
   </plurals>
   <plurals name="conversation_starring">
     <item quantity="one" msgid="8780588287902503608">"Позначення <xliff:g id="COUNT">%1$d</xliff:g> бесіди зірочкою."</item>
-    <item quantity="other" msgid="44965256231544025">"Позначення <xliff:g id="COUNT">%1$d</xliff:g> бесід зірочкою."</item>
+    <item quantity="other" msgid="44965256231544025">"Позначення бесід зірочкою: <xliff:g id="COUNT">%1$d</xliff:g> ."</item>
   </plurals>
   <plurals name="conversation_unstarring">
     <item quantity="one" msgid="9149763486272528029">"Видалення зірочки з <xliff:g id="COUNT">%1$d</xliff:g> бесіди."</item>
-    <item quantity="other" msgid="460057780793159215">"Видалення зірочки з <xliff:g id="COUNT">%1$d</xliff:g> бесід."</item>
+    <item quantity="other" msgid="460057780793159215">"Видалення зірочки з бесід: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
   </plurals>
   <plurals name="conversation_unknown_operation">
     <item quantity="one" msgid="235911194119829184">"Очікування на дію над <xliff:g id="COUNT">%1$d</xliff:g> бесідою."</item>
-    <item quantity="other" msgid="850868849811019745">"Очікування на дію над <xliff:g id="COUNT">%1$d</xliff:g> бесідами."</item>
+    <item quantity="other" msgid="850868849811019745">"Очікування на дію з бесідами: <xliff:g id="COUNT">%1$d</xliff:g> ."</item>
   </plurals>
   <plurals name="conversation_muted">
     <item quantity="one" msgid="3197365771487542615">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; проігноровано."</item>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Скасувати"</string>
     <string name="close" msgid="419945428844076406">"Закрити"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Для цього облікового запису не визначено папок."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 280cf81..4570833 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Nhà cung cấp nội dung mô phỏng"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Nhà cung cấp nội dung cuộc hội thoại"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Nhà cung cấp bộ nhớ cache tài khoản"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Nhà cung cấp Gmail giả"</string>
-    <string name="test_application" msgid="5613907578447924035">"Kiểm tra ứng dụng"</string>
     <string name="app_name" msgid="8197930422134712215">"Email hợp nhất"</string>
     <string name="to" msgid="4392614766835725698">"Tới"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"Chỉnh sửa"</string>
     <string name="forward" msgid="6822914459902983767">"Chuyển tiếp"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Soạn thư"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Thay đổi nhãn"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Quản lý nhãn"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Nhãn"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Đ.bộ hóa &amp; t.báo"</string>
@@ -137,12 +133,12 @@
     <string name="no_conversations" msgid="35400008890372241">"Không có cuộc hội thoại nào."</string>
     <string name="undo" msgid="6070869718469782251">"Hoàn tác"</string>
   <plurals name="conversation_marking_read">
-    <item quantity="one" msgid="394911867474214874">"Đánh dấu <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại là đã đọc."</item>
-    <item quantity="other" msgid="247178462544083532">"Đánh dấu <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại là đã đọc."</item>
+    <item quantity="one" msgid="394911867474214874">"Đang đánh dấu <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại là đã đọc."</item>
+    <item quantity="other" msgid="247178462544083532">"Đang đánh dấu <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại là đã đọc."</item>
   </plurals>
   <plurals name="conversation_marking_unread">
-    <item quantity="one" msgid="2959859634779672558">"Đánh dấu <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại là chưa đọc."</item>
-    <item quantity="other" msgid="6577233770583912846">"Đánh dấu <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại là chưa đọc."</item>
+    <item quantity="one" msgid="2959859634779672558">"Đang đánh dấu <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại là chưa đọc."</item>
+    <item quantity="other" msgid="6577233770583912846">"Đang đánh dấu <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại là chưa đọc."</item>
   </plurals>
   <plurals name="conversation_starring">
     <item quantity="one" msgid="8780588287902503608">"Đang gắn dấu sao <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại."</item>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"Hủy"</string>
     <string name="close" msgid="419945428844076406">"Đóng"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Không có thư mục nào được đặt cho tài khoản này."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5d2bde2..7008255 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"模拟内容提供程序"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"会话内容提供程序"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"帐户缓存提供程序"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"虚拟 Gmail 提供程序"</string>
-    <string name="test_application" msgid="5613907578447924035">"测试应用程序"</string>
     <string name="app_name" msgid="8197930422134712215">"统一电子邮件"</string>
     <string name="to" msgid="4392614766835725698">"收件人"</string>
     <string name="cc" msgid="7017720927911078193">"抄送"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"修改"</string>
     <string name="forward" msgid="6822914459902983767">"转发"</string>
     <string name="menu_compose" msgid="6274193058224230645">"写邮件"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"更改标签"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"管理标签"</string>
     <string name="label_list_title" msgid="7948730824763052410">"标签"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"同步与通知"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"取消"</string>
     <string name="close" msgid="419945428844076406">"关闭"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"此帐户尚未设置文件夹。"</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 336c6a9..08ed448 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"模擬內容供應端"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"會話群組內容供應端"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"帳戶快取供應端"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"虛擬 Gmail 供應端"</string>
-    <string name="test_application" msgid="5613907578447924035">"測試應用程式"</string>
     <string name="app_name" msgid="8197930422134712215">"統一的電子郵件"</string>
     <string name="to" msgid="4392614766835725698">"收件者"</string>
     <string name="cc" msgid="7017720927911078193">"副本"</string>
@@ -70,7 +65,8 @@
     <string name="resume_draft" msgid="6450150180834092146">"編輯"</string>
     <string name="forward" msgid="6822914459902983767">"轉寄"</string>
     <string name="menu_compose" msgid="6274193058224230645">"撰寫"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"變更標籤"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"管理標籤"</string>
     <string name="label_list_title" msgid="7948730824763052410">"標籤"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"同步處理並通知"</string>
@@ -228,11 +224,39 @@
     <string name="cancel" msgid="8762981157252199115">"取消"</string>
     <string name="close" msgid="419945428844076406">"關閉"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"這個帳戶尚未設定資料夾。"</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 84a5495..95142ab 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -18,11 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="mock_content_provider" msgid="7444679250201027030">"Umhlinzekeli wokuqukethwe we-Mock"</string>
-    <string name="conversation_content_provider" msgid="3662935025292495273">"Umhlinzekeli wokuqukethwe kwengxoxo"</string>
-    <string name="account_cache_provider" msgid="3195603659417337226">"Umhlinzekeli nge-akhawunti ye-Cache"</string>
-    <string name="dummy_gmail_provider" msgid="2411244445674142698">"Umhlinzekeli we-Dummy Gmail"</string>
-    <string name="test_application" msgid="5613907578447924035">"Uhlelo kusebenza lokuhlola"</string>
     <string name="app_name" msgid="8197930422134712215">"I-imeyili ehlanganisiwe"</string>
     <string name="to" msgid="4392614766835725698">"Kuya"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
@@ -34,7 +29,7 @@
     <string name="add_file_attachment" msgid="2203398371671979481">"Namathisela ifayela"</string>
     <string name="save_draft" msgid="5555744208032445632">"Londoloza okusazolungiswa"</string>
     <string name="discard" msgid="1714960202994370243">"Lahla"</string>
-    <string name="compose" msgid="1473559896062432878">"Dala"</string>
+    <string name="compose" msgid="1473559896062432878">"Bhala"</string>
   <string-array name="compose_modes">
     <item msgid="8631190144210933782">"Phendula"</item>
     <item msgid="4085029907540221568">"Phendula konke"</item>
@@ -49,8 +44,8 @@
     <string name="recipient_needed" msgid="999037027358925655">"Ngeza okungenani umamukeli oyedwa."</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"Iphutha Lomamukeli"</string>
     <string name="confirm_send_title" msgid="5663602035452564062">"Thumela umlayezo?"</string>
-    <string name="confirm_send_message_with_no_subject" msgid="8900379985826988281">"Awukho umbhalo esihlokweni somyalezo."</string>
-    <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Awukho umbhalo kumyalezo"</string>
+    <string name="confirm_send_message_with_no_subject" msgid="8900379985826988281">"Awukho umbhalo esihlokweni somlayezo."</string>
+    <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Awukho umbhalo emzimbeni walomlayezo."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Thumela lo mlayezo?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Umlayezo ulahliwe."</string>
     <string name="send" msgid="8242003661397555986">"Thumela"</string>
@@ -61,7 +56,7 @@
     <string name="remove_star" msgid="4372327933122106128">"Susa inkanyezi"</string>
     <string name="archive" msgid="847250094775910499">"Ingobo yomlando"</string>
     <string name="report_spam" msgid="6467567747975393907">"Bika ugaxekile"</string>
-    <string name="delete" msgid="844871204175957681">"Sula"</string>
+    <string name="delete" msgid="844871204175957681">"Susa"</string>
     <string name="next" msgid="4674401197968248302">"Okudadlana"</string>
     <string name="previous" msgid="309943944831349924">"Okusha"</string>
     <string name="refresh" msgid="490989798005710951">"Qala kabusha"</string>
@@ -69,18 +64,19 @@
     <string name="reply_all" msgid="7257248094625487557">"Phendula konke"</string>
     <string name="resume_draft" msgid="6450150180834092146">"Hlela"</string>
     <string name="forward" msgid="6822914459902983767">"Dlulisela"</string>
-    <string name="menu_compose" msgid="6274193058224230645">"Dala"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Shintsha amalebuli"</string>
+    <string name="menu_compose" msgid="6274193058224230645">"Bhala"</string>
+    <!-- no translation found for menu_change_folders (1542713666608888717) -->
+    <skip />
     <string name="menu_manage_labels" msgid="8618788259638720538">"Phatha amalebuli"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Amalebuli"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Ukuvumelanisa nokuqaphelisa"</string>
+    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Ukuvumelanisa &amp; ukuqaphelisa"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Izilungiselelo zelebuli"</string>
     <string name="menu_done" msgid="5791134842152855128">"Kwenziwe"</string>
     <string name="menu_account_preferences" msgid="825820027931270435">"Izilungiselelo ze-akhawunti"</string>
     <string name="menu_preferences" msgid="8957431987536606063">"Izilungiselelo"</string>
     <string name="menu_search" msgid="5297197523031943248">"Sesha"</string>
     <string name="more" msgid="1238344647379009858">"Okuningi"</string>
-    <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> kuka-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> koku-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="newer" msgid="1007166236908596854">"Okusha"</string>
     <string name="older" msgid="6651690916337202936">"Okudadlana"</string>
     <string name="mark_important" msgid="6904096897104265870">"Maka njengokubalulekile"</string>
@@ -90,7 +86,7 @@
     <string name="feedback" msgid="79365993169715049">"Thumela impendulo"</string>
     <string name="help_and_info" msgid="7873089811705257882">"Usizo"</string>
     <string name="quoted_text" msgid="7250749398672037355">"Hlanganisa umbhalo ocashuniwe"</string>
-    <string name="quoted_text_label" msgid="541007446961960617">"umbhalo ocaphuniwe"</string>
+    <string name="quoted_text_label" msgid="541007446961960617">"Umbhalo ocaphuniwe"</string>
     <string name="respond_inline" msgid="6797117334768201180">"Phendula uxhumekile kwi-inthanethi"</string>
     <string name="bytes" msgid="8851050881674287386">"B"</string>
     <string name="kilobytes" msgid="8506546136898321025">"KB"</string>
@@ -108,13 +104,13 @@
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Abelana nge"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Vula kwisiphequluli"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Kopisha"</string>
-    <string name="contextmenu_copylink" msgid="3580131515400610839">"Kopisha isixhumanisi se-URL"</string>
+    <string name="contextmenu_copylink" msgid="3580131515400610839">"Kopisha i-URL yesixhumanisi"</string>
     <string name="contextmenu_dial_dot" msgid="9104426720103729453">"Iyadayela..."</string>
     <string name="contextmenu_sms_dot" msgid="6481040539501081547">"I-SMS…"</string>
     <string name="contextmenu_add_contact" msgid="8395100913366045250">"Faka oxhumana naye"</string>
     <string name="contextmenu_send_mail" msgid="8301941130009797208">"Thumela i-imeyili"</string>
     <string name="contextmenu_map" msgid="7721544518698532954">"Imephu"</string>
-    <string name="contextmenu_sharelink" msgid="6213520416250245200">"Yabelana ngesihlanganisi"</string>
+    <string name="contextmenu_sharelink" msgid="6213520416250245200">"Yabelana ngesixhumanisi"</string>
     <string name="contextmenu_help" msgid="4651718679842414097">"Usizo"</string>
     <string name="contextmenu_feedback" msgid="4429118420169571473">"Thumela impendulo"</string>
     <string name="num_selected" msgid="2943309946439316255">"Engu-<xliff:g id="NUMBER">%d</xliff:g> ekhethiwe"</string>
@@ -130,30 +126,30 @@
     <item quantity="other" msgid="6961049507579977505">"Okusalungiswa"</item>
   </plurals>
     <string name="sending" msgid="8214361929125649771">"Iyathumela..."</string>
-    <string name="send_failed" msgid="750908595144529579">"Umyalezo awuthunyelwanga."</string>
+    <string name="send_failed" msgid="750908595144529579">"Umlayezo awuthunyelwanga."</string>
     <string name="me" msgid="6480762904022198669">"mina"</string>
     <string name="labels" msgid="1519770547536283663">"Amalebuli"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Bonisa onke amafolda"</string>
     <string name="no_conversations" msgid="35400008890372241">"Azikho izingxoxo."</string>
-    <string name="undo" msgid="6070869718469782251">"Hoxisa"</string>
+    <string name="undo" msgid="6070869718469782251">"Hlehlisa"</string>
   <plurals name="conversation_marking_read">
-    <item quantity="one" msgid="394911867474214874">"Imaka ingxoxo engu-<xliff:g id="COUNT">%1$d</xliff:g> njengefundiwe."</item>
+    <item quantity="one" msgid="394911867474214874">"Imaka ingxoxo e-<xliff:g id="COUNT">%1$d</xliff:g> njengefundiwe."</item>
     <item quantity="other" msgid="247178462544083532">"Imaka izingxoxo ezingu-<xliff:g id="COUNT">%1$d</xliff:g> njengezifundiwe."</item>
   </plurals>
   <plurals name="conversation_marking_unread">
-    <item quantity="one" msgid="2959859634779672558">"Imaka ingxoxo engu-<xliff:g id="COUNT">%1$d</xliff:g> njengengafundiwe."</item>
+    <item quantity="one" msgid="2959859634779672558">"Imaka ingxoxo e-<xliff:g id="COUNT">%1$d</xliff:g> njengengafundiwe."</item>
     <item quantity="other" msgid="6577233770583912846">"Imaka izingxoxo ezingu-<xliff:g id="COUNT">%1$d</xliff:g> njengezingafundiwe."</item>
   </plurals>
   <plurals name="conversation_starring">
-    <item quantity="one" msgid="8780588287902503608">"Ifaka ingxoxo engu-<xliff:g id="COUNT">%1$d</xliff:g> inkanyezi."</item>
+    <item quantity="one" msgid="8780588287902503608">"Ifaka ingxoxo e-<xliff:g id="COUNT">%1$d</xliff:g> inkanyezi."</item>
     <item quantity="other" msgid="44965256231544025">"Ifaka izingxoxo ezingu-<xliff:g id="COUNT">%1$d</xliff:g> izinkanyezi."</item>
   </plurals>
   <plurals name="conversation_unstarring">
-    <item quantity="one" msgid="9149763486272528029">"Isusa izinkanyezi engxoxweni engu-<xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="one" msgid="9149763486272528029">"Isusa izinkanyezi engxoxweni e-<xliff:g id="COUNT">%1$d</xliff:g>."</item>
     <item quantity="other" msgid="460057780793159215">"Isusa izinkanyezi ezingxoxweni ezingu-<xliff:g id="COUNT">%1$d</xliff:g>."</item>
   </plurals>
   <plurals name="conversation_unknown_operation">
-    <item quantity="one" msgid="235911194119829184">"Ilinde umsebenzi engxoxweni engu-<xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="one" msgid="235911194119829184">"Ilinde umsebenzi engxoxweni e-<xliff:g id="COUNT">%1$d</xliff:g>."</item>
     <item quantity="other" msgid="850868849811019745">"Ilinde umsebenzi ezingxoxweni ezingu-<xliff:g id="COUNT">%1$d</xliff:g>."</item>
   </plurals>
   <plurals name="conversation_muted">
@@ -169,12 +165,12 @@
     <item quantity="other" msgid="3012054504370916482">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; kufakwe kungobo yomlando"</item>
   </plurals>
   <plurals name="conversation_moved_to_inbox">
-    <item quantity="one" msgid="8031416635831380071">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ithuthelwe ebhokisini lemiyalezo engenayo"</item>
-    <item quantity="other" msgid="395816799927580909">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ithuthelwe ebhokisini lemiyalezo engenayo"</item>
+    <item quantity="one" msgid="8031416635831380071">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ithuthelwe ebhokisini lemiyalezo engenayo."</item>
+    <item quantity="other" msgid="395816799927580909">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ithuthelwe ebhokisini lemiyalezo engenayo."</item>
   </plurals>
   <plurals name="conversation_deleted">
-    <item quantity="one" msgid="4398693029405479323">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; isusiwe"</item>
-    <item quantity="other" msgid="8630099095360065837">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; isusiwe"</item>
+    <item quantity="one" msgid="4398693029405479323">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; isusiwe."</item>
+    <item quantity="other" msgid="8630099095360065837">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; isusiwe."</item>
   </plurals>
   <plurals name="conversation_marked_important">
     <item quantity="one" msgid="2335171317119674993">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imakwe njengebalulekile."</item>
@@ -208,31 +204,59 @@
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Goqa imininingwane yomtholi"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Khombisa imininingwane yokuxhumana ka-<xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Bonisa ulwazi loxhumana naye"</string>
-    <string name="expand_read_messages" msgid="7458927270492299063">"Nweba ukufunda imyalezo"</string>
+    <string name="expand_read_messages" msgid="7458927270492299063">"Nweba ukufunda imilayezo"</string>
     <string name="show_messages_read" msgid="9132147830566909631">"Imilayezo efundwe ngaphambilini"</string>
     <string name="date_heading" msgid="2414358582984879303">"Usuku:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Phendula-ku:"</string>
-    <string name="to_heading" msgid="3219994961726691756">"To:"</string>
+    <string name="to_heading" msgid="3219994961726691756">"Kuya ku:"</string>
     <string name="cc_heading" msgid="8116221732072085180">"Cc:"</string>
     <string name="bcc_heading" msgid="5528824453033598299">"Bcc:"</string>
     <string name="show_images" msgid="1875700481186331432">"Bonisa izithombe"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Njalo bonisa izithombe eziphuma kulo mthumeli"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Izithombe eziphuma kulo mthumeli zizoboniswa ngokuzenzakalelayo."</string>
     <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> &lt;<xliff:g id="EMAIL">%2$s</xliff:g>&gt;"</string>
-    <string name="message_saved" msgid="7073947895562277576">"Umlayezo ulondolozwe njengokungaphelele."</string>
+    <string name="message_saved" msgid="7073947895562277576">"Umlayezo ulondolozwe njengokusalungiswa."</string>
     <string name="sending_message" msgid="1498583163419122128">"Ithumela umlayezo..."</string>
-    <string name="invalid_recipient" msgid="2161317422860961623">"Ikheli <xliff:g id="WRONGEMAIL">%s</xliff:g> alilungile."</string>
+    <string name="invalid_recipient" msgid="2161317422860961623">"Ikheli <xliff:g id="WRONGEMAIL">%s</xliff:g> alivumelekile."</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"KULUNGILE"</string>
     <string name="done" msgid="3079981801778027540">"Kwenziwe"</string>
     <string name="cancel" msgid="8762981157252199115">"Khansela"</string>
     <string name="close" msgid="419945428844076406">"Vala"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Awekho amafolda ahlelelwe le akhawunti."</string>
-    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <!-- no translation found for sync_status:0 (2446076619901049026) -->
     <!-- no translation found for sync_status:1 (5037283655022689372) -->
     <!-- no translation found for sync_status:2 (4252875340758600974) -->
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
+    <!-- no translation found for tap_to_configure (1181356242354390930) -->
+    <skip />
+    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
+    <skip />
+    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
+    <skip />
+    <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
+    <!-- no translation found for view_more_conversations (3151067626309674344) -->
+    <skip />
+    <!-- no translation found for loading_conversation (489160038366067983) -->
+    <skip />
+    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
+    <skip />
+    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
+    <skip />
+    <!-- no translation found for sync_all (1057043212338233359) -->
+    <skip />
+    <!-- no translation found for sync_recent:one (137489911893192702) -->
+    <!-- no translation found for sync_recent:other (6856940335775567991) -->
+    <!-- no translation found for sync_none (3581727068747471804) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
+    <skip />
+    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
+    <skip />
+    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
+    <skip />
 </resources>