diff --git a/res/values-af-sw600dp/strings.xml b/res/values-af-sw600dp/strings.xml
index 606b670..7f06fd9 100644
--- a/res/values-af-sw600dp/strings.xml
+++ b/res/values-af-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Bestuur vouers"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Gebruik as verstek vir antwoorde op boodskapkennisgewings"</string>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index baff994..7af1247 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Verander vouers"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Skuif na"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Vouerinstellings"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Stel outo-verandering van grootte terug"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Die oorspronklike weergawe van hierdie boodskap is gewysig om op hierdie skerm te kan pas.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Vouers"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Meer"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Boodskap is nie gestuur nie."</string>
     <string name="me" msgid="6480762904022198669">"ek"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Wys alle vouers"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Inkassie"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vee hierdie gesprek uit?"</item>
     <item quantity="other" msgid="930334208937121234">"Vee hierdie <xliff:g id="COUNT">%1$d</xliff:g> gesprekke uit?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Wys gespreklys nadat jy uitvee"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Wat\'s nuut"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Outopas boodskappe?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Krimp wye boodskappe om op jou skerm te pas en laat zoem toe. Om hierdie opsie af te skakel, gaan na Instellings &gt; Algemene instellings."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Antwoord"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Antwoord almal"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Argiveer"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Stil"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Verwyder handeling"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Argiveer gesprekke"</item>
+    <item msgid="1894624633891654411">"Vee gesprekke uit"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Argiveer gesprekke eerder as om uit te vee"</item>
+    <item msgid="6515786566522105643">"Vee gesprekke uit eerder as om te argiveer"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Verwyder handeling"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Antwoord almal"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gebruik as verstek vir antwoorde op boodskappe"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Sleep om te verwyder"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In gespreklys"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Trek af om te verfris"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kyk tans vir pos"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Maak asblik leeg"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Maak strooipos leeg"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Maak navigasielaai oop"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Maak navigasielaai toe"</string>
 </resources>
diff --git a/res/values-am-sw600dp/strings.xml b/res/values-am-sw600dp/strings.xml
index 56916ec..d0216b2 100644
--- a/res/values-am-sw600dp/strings.xml
+++ b/res/values-am-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ ካርቦን ቅጂ/ስውር ቅጂ"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ ስውር ቅጂ"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"አቃፊዎችን አስተዳድር"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"ለመልዕክት ማሳወቂያዎች ምላሾች እንደ ነባሪ ይጠቀሙ"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 75b2edb..ebc2b58 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"አቃፊዎችን ቀይር"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"አንቀሳቅስ ወደ"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"የአቃፊ ቅንብሮች"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"ራስ-መጠን መቀየርን አድህር"</string>
     <string name="message_modified" msgid="2564340197585393687">"(ይህ መልዕክት ከዚህ ማያ ገጽ ጋር እንዲመጣጠን ተብሎ ከመጀመሪያው ስሪት ተሻሽሏል።)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"አቃፊዎች"</string>
     <string name="folder_list_more" msgid="537172187223133825">"ተጨማሪ"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"መልዕክት አልተላከም።"</string>
     <string name="me" msgid="6480762904022198669">"እኔ"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"ሁሉንም አቃፊዎች አሳይ"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"ገቢ መልዕክት ሳጥን"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"ይሄ ውይይት ይሰረዝ?"</item>
     <item quantity="other" msgid="930334208937121234">"እነዚህ <xliff:g id="COUNT">%1$d</xliff:g> ውይይቶች ይሰረዙ?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"ከሰረዙ በኋላ የውይይት ዝርዝርን ያሳዩ"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"ምን አዲስ ነገር አለ"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"መልዕክቶች በራስ-ይመጣጠኑ?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"ሰፊ መልዕክቶች ከማያ ገጽዎ ጋር እንዲመጣጠኑ እና ማጉላትን ለማስቻል ያሳንሷቸው። ይህን አማራጭ ለማጥፋት ወደ &gt; አጠቃላይ ቅንብሮች ይሂዱ።"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"ምላሽ ይስጡ"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"ለሁሉም ምላሽ ይስጡ"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"በማህደር ያስቀምጡ"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"ፀጥታ"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"እርምጃ አስወግድ"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"ውይይቶችን በማህደር ያስቀምጡ"</item>
+    <item msgid="1894624633891654411">"ውይይቶችን ይሰርዙ"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"ውይይቶች ከመሰረዝ ይልቅ በማህደር አስቀመጥ"</item>
+    <item msgid="6515786566522105643">"ውይይቶች በማህደር ከማስቀመጥ ይልቅ ሰርዝ"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"እርምጃ አስወግድ"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"ለሁሉም ምላሽ ይስጡ"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"ለመልዕክት ምላሾች እንደ ነባሪ ይጠቀሙ"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"ለማስወገድ ያንሸራትቱ"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"በውይይት ዝርዝር ውስጥ"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"ለማደስ ወደ ታች ያንሸራትቱ"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"መልዕክት በማየት ላይ"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"መጣያውን አጽዳው"</string>
-    <string name="empty_spam" msgid="930744491746508050">"አይፈለጌ መልዕክትን አጽዳው"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"የአሰሳ መሣቢያውን ክፈት"</string>
     <string name="drawer_close" msgid="2764774620737876943">"የአሰሳ መሣቢያውን ዝጋ"</string>
 </resources>
diff --git a/res/values-ar-sw600dp/strings.xml b/res/values-ar-sw600dp/strings.xml
index 6f7ba9e..de37bbd 100644
--- a/res/values-ar-sw600dp/strings.xml
+++ b/res/values-ar-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ نسخة إلى/ مخفية"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ نسخة مخفية الوجهة"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"إدارة المجلدات"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"الاستخدام كافتراضي مع الردود على إشعارات الرسائل"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2fdebf4..bbcd0af 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"تغيير المجلدات"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"نقل إلى"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"إعدادات المجلدات"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"عودة إلى الحجم التلقائي"</string>
     <string name="message_modified" msgid="2564340197585393687">"(تم تعديل هذه الرسالة من إصدارها الأصلي لملاءمة هذه الشاشة.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"المجلدات"</string>
     <string name="folder_list_more" msgid="537172187223133825">"المزيد"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"لم يتم إرسال الرسالة."</string>
     <string name="me" msgid="6480762904022198669">"أنا"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"عرض جميع المجلدات"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"البريد الوارد"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"هل تريد حذف هذه المحادثة؟"</item>
     <item quantity="other" msgid="930334208937121234">"هل تريد حذف هذه المحادثات البالغ عددها <xliff:g id="COUNT">%1$d</xliff:g>؟"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"عرض قائمة المحادثات بعد الحذف"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"الميزات الجديدة"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"هل تريد الضبط التلقائي للرسائل؟"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"يمكنك تصغير الرسائل الكبيرة لتناسب شاشتك كما يمكنك السماح بالتكبير. لإيقاف هذا الخيار، انتقل إلى إعدادات &gt; إعدادات عامة."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"رد"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"الرد على الكل"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"وضع في الأرشيف"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"صامت"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"إجراء الإزالة"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"وضع المحادثات في الأرشيف"</item>
+    <item msgid="1894624633891654411">"حذف المحادثات"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"وضع المحادثات في الأرشيف بدلاً من حذفها"</item>
+    <item msgid="6515786566522105643">"حذف المحادثات بدلاً من وضعها في الأرشيف"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"إجراء الإزالة"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"الرد على الكل"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"الاستخدام كافتراضي مع ردود الرسائل"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"تمرير سريع للإزالة"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"في قائمة المحادثات"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"التمرير لأسفل للتحديث"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"التحقق من وجود بريد"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"إفراغ المهملات"</string>
-    <string name="empty_spam" msgid="930744491746508050">"إفراغ مجلد الرسائل غير المرغوب فيها"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"فتح ساحب التنقل"</string>
     <string name="drawer_close" msgid="2764774620737876943">"إغلاق ساحب التنقل"</string>
 </resources>
diff --git a/res/values-be-sw600dp/strings.xml b/res/values-be-sw600dp/strings.xml
index d649b15..3380ef4 100644
--- a/res/values-be-sw600dp/strings.xml
+++ b/res/values-be-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Копія/УК"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ схаваная копія"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Кiраванне тэчкамі"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Выкарыстоўваць у якасці адказу на паведамленні па змаўчанні"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 73e7e8e..0df0b1e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Змена тэчкі"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Перанесці ў"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Налады тэчкi"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Вярнуць аўтаматычнае змяненне памераў"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Гэтае паведамленне было змененае ў параўнанні з арыгіналам, каб адпавядаць гэтаму экрану.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Тэчкі"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Яшчэ"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Паведамленне не адпраўлена."</string>
     <string name="me" msgid="6480762904022198669">"я"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Паказаць усе тэчкі"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Уваходныя"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Выдаліць размову?"</item>
     <item quantity="other" msgid="930334208937121234">"Выдаліць ​​гэтыя размовы (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Паказаць спіс гутарак пасля выдалення"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Што новага"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Аўтападладзiць паведамленнi?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Звужвайце шырокiя паведамленнi ў адпаведнасці з вашым экранам і павелічвайце маштаб. Каб адключыць гэту опцыю, перайдзіце ў меню Налады &gt; Агульныя налады."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Адказаць"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Адказаць усім"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архіваваць"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Ціхі рэжым"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Выдаліць ​​дзеянне"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Размовы ў архiве"</item>
+    <item msgid="1894624633891654411">"Выдаліць размовы"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Архiваваць, а не выдаляць размовы"</item>
+    <item msgid="6515786566522105643">"Выдаляць, а не архіваваць размовы"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Выдаліць ​​дзеянне"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Адказаць усім"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Выкарыстоўваць у якасці адказу на паведамленні па змаўчанні"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Правядзіце, каб выдалiць"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"У спісе гутарак"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Правядзіце ўніз, каб абнавіць"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Праверка пошты"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Ачысціць кошык"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Пусты спам"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Адкрыць скрыню навігацыі"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Закрыць скрыню навігацыі"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f16ec2b..e327de2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Показване на списъка с кореспонденции след изтриване"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Новите неща"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Да се побират ли автоматично съобщенията?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Намалете голямата ширина на съобщенията, за да се поберат на екрана ви, и разрешете увеличаването на мащаба. За да изключите тази опция, отворете „Настройки“ &gt; „Общи настройки“."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Отговор"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Отговор до всички"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архивиране"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"В списък с кореспонденции"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Прекарайте пръст надолу, за да опресните"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверява се за поща"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Изчистване на кошчето"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Изчистване на нежеланата поща"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Отваряне на слоя за навигация"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Затваряне на чекмеджето за навигация"</string>
 </resources>
diff --git a/res/values-ca-sw600dp/strings.xml b/res/values-ca-sw600dp/strings.xml
index 1fa280e..cb21889 100644
--- a/res/values-ca-sw600dp/strings.xml
+++ b/res/values-ca-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cco"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Cco"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Gestiona les carpetes"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Fes servir com a predeterminat per a les respostes de les notificacions de missatge"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 44d350d..6e27d6b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Canvia les carpetes"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Mou a"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Configuració de la carpeta"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Reverteix a mida automàt."</string>
     <string name="message_modified" msgid="2564340197585393687">"(La versió original d\'aquest missatge s\'ha modificat perquè s\'adapti a la pantalla.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Carpetes"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Més"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"No s\'ha enviat el missatge."</string>
     <string name="me" msgid="6480762904022198669">"jo"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Mostra totes les carpetes"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Safata d\'entrada"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vols suprimir aquesta conversa?"</item>
     <item quantity="other" msgid="930334208937121234">"Vols suprimir aquestes <xliff:g id="COUNT">%1$d</xliff:g> converses?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Mostra la llista de converses després de suprimir"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Novetats"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Vols ajustar els missatges automàticament?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Canvia la mida dels missatges perquè s\'ajustin a la pantalla i permet ampliar-los. Per desactivar aquesta opció, vés a Configuració &gt; General."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Respon"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Respon a tots"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arxiva"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silenci"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Suprimeix l\'acció"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arxiva les converses"</item>
+    <item msgid="1894624633891654411">"Suprimeix les converses"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arxiva les converses en comptes de suprimir-les"</item>
+    <item msgid="6515786566522105643">"Suprimeix les converses en comptes d\'arxivar-les"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Suprimeix l\'acció"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Respon a tots"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilitza com a valor predeterminat per a les respostes a missatges"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Fes lliscar el dit per suprimir"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"A la llista de converses"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fes lliscar el dit cap avall per actualitzar."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"S\'està comprovant si hi ha correu."</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Buida la paperera"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Buida el correu brossa"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Buida la paperera"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Buida el correu brossa"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Vols buidar la paperera?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Vols buidar el correu brossa?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"Aquest missatge (<xliff:g id="COUNT">%1$d</xliff:g>) se suprimirà permanentment."</item>
+    <item quantity="other" msgid="2473439906075355840">"Aquests <xliff:g id="COUNT">%1$d</xliff:g> missatges se suprimiran permanentment."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Obre el calaix de navegació"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Tanca el calaix de navegació"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f627cda..3f9781a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Po smazání zobrazit seznam konverzací"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Novinky"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Automaticky přizpůsobit zprávy?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Zmenšit široké zprávy, aby se vešly na obrazovku, a umožnit přiblížení. Chcete-li povolit tuto možnost, přejděte na Nastavení &gt; Obecná nastavení."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odpovědět"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odpovědět všem"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivovat"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"V seznamu konverzací"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Seznam aktualizujete posunutím dolů."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Vysypat koš"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Vyprázdnit složku se spamem"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Otevřít navigační složku"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zavřít navigační složku"</string>
 </resources>
diff --git a/res/values-da-sw600dp/strings.xml b/res/values-da-sw600dp/strings.xml
index b22d390..26bbf84 100644
--- a/res/values-da-sw600dp/strings.xml
+++ b/res/values-da-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Administrer mapper"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Anvend som standard ved svar på underretninger om meddelelser"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0a9fee5..07ad570 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Skift mapper"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Flyt til"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Indstillinger for mapper"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Vis oprindelig størrelse"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Denne meddelelse er blevet ændret i forhold til originalversionen, så den passer til denne skærm)."</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mapper"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Flere"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Besked ikke sendt."</string>
     <string name="me" msgid="6480762904022198669">"mig"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Indbakke"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtale?"</item>
     <item quantity="other" msgid="930334208937121234">"Vil du slette disse <xliff:g id="COUNT">%1$d</xliff:g> samtaler?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Vis samtalelisten efter sletning"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Nyheder"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Skal meddelelser tilpasses automatisk?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Gør brede meddelelser mindre, så de passer til din skærm og for at gøre det muligt at zoome ind. Hvis du vil deaktivere denne indstilling, skal du gå til Indstillinger &gt; Generelle indstillinger."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Svar"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Svar alle"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkivér"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Lydløs"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Fjern handling"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arkivér samtaler"</item>
+    <item msgid="1894624633891654411">"Slet samtaler"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arkivér i stedet for at slette samtaler"</item>
+    <item msgid="6515786566522105643">"Slet i stedet for at arkivere samtaler"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Fjern handling"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Svar alle"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Brug som standardsvar på meddelelser"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Stryg med fingeren for at fjerne"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"På samtaleliste"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Stryg ned for at opdatere"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tjekker for e-mails"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Tøm papirkurv"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Tøm spammappe"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Tøm papirkurv"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Tøm spammappe"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Skal papirkurven tømmes?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Skal spammappen tømmes?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"Denne <xliff:g id="COUNT">%1$d</xliff:g> meddelelse vil blive slettet permanent."</item>
+    <item quantity="other" msgid="2473439906075355840">"Disse <xliff:g id="COUNT">%1$d</xliff:g> meddelelser vil blive slettet permanent."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Åbn navigationsskuffen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Luk navigationsskuffen"</string>
 </resources>
diff --git a/res/values-de-sw600dp/strings.xml b/res/values-de-sw600dp/strings.xml
index ef0f56a..f3b7ac2 100644
--- a/res/values-de-sw600dp/strings.xml
+++ b/res/values-de-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Ordner verwalten"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Als Standard für Antworten auf Benachrichtigungen verwenden"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1fe1bb7..127044f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Ordner ändern"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Verschieben nach"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Ordnereinstellungen"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Original wiederherstellen"</string>
     <string name="message_modified" msgid="2564340197585393687">"Die Originalversion dieser Nachricht wurde an den Bildschirm angepasst."</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Ordner"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Mehr"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Nicht gesendet"</string>
     <string name="me" msgid="6480762904022198669">"Mich"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Alle Ordner anzeigen"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Posteingang"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Diese Konversation löschen?"</item>
     <item quantity="other" msgid="930334208937121234">"Diese <xliff:g id="COUNT">%1$d</xliff:g> Konversationen löschen?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Nach dem Löschen Konversationsliste anzeigen"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Neue Funktionen"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Nachrichten automatisch anpassen?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Breite Nachrichten an Ihren Bildschirm anpassen und Heranzoomen ermöglichen. Um diese Option zu deaktivieren, rufen Sie \"Einstellungen\" &gt; \"Allgemeine Einstellungen\" auf."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Antworten"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Allen antworten"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivieren"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Lautlos"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Aktion entfernen"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Konversationen archivieren"</item>
+    <item msgid="1894624633891654411">"Konversationen löschen"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Konversationen archivieren statt löschen"</item>
+    <item msgid="6515786566522105643">"Konversationen löschen statt archivieren"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Entfernungsaktion"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Allen antworten"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Als Standard für Antworten verwenden"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Zum Entfernen wischen"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In einer Unterhaltungsliste"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Zum Aktualisieren nach unten wischen"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Nachrichten werden abgerufen..."</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Papierkorb leeren"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Spam-Ordner leeren"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Papierkorb leeren"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Spam-Ordner leeren"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Papierkorb leeren?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Spam-Ordner leeren?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"Diese <xliff:g id="COUNT">%1$d</xliff:g> Nachricht wird endgültig gelöscht."</item>
+    <item quantity="other" msgid="2473439906075355840">"Diese <xliff:g id="COUNT">%1$d</xliff:g> Nachrichten werden endgültig gelöscht."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Navigationsleiste öffnen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Navigationsleiste schließen"</string>
 </resources>
diff --git a/res/values-el-sw600dp/strings.xml b/res/values-el-sw600dp/strings.xml
index 78f9398..13f36be 100644
--- a/res/values-el-sw600dp/strings.xml
+++ b/res/values-el-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Κοιν./Κρ.κοιν."</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Κρυφή κοιν."</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Διαχείριση φακέλων"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Χρήση ως προεπιλογής για απαντήσεις σε ειδοποιήσεις μηνυμάτων"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3ba0078..c37c792 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Αλλαγή φακέλων"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Μετακίνηση σε"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Ρυθμίσεις φακέλων"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Επαναφορά αυτόμ. μεγέθους"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Αυτό το μήνυμα έχει τροποποιηθεί από την αρχική του έκδοση έτσι ώστε να προσαρμόζεται σε αυτήν την οθόνη.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Φάκελοι"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Περισσότερα"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Μήνυμα δεν εστάλη."</string>
     <string name="me" msgid="6480762904022198669">"εγώ"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Εμφάνιση όλων των φακέλων"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Εισερχόμενα"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Να διαγραφεί αυτή η συνομιλία;"</item>
     <item quantity="other" msgid="930334208937121234">"Να διαγραφούν αυτές οι <xliff:g id="COUNT">%1$d</xliff:g> συνομιλίες;"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Εμφάνιση λίστας συνομιλιών μετά τη διαγραφή"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Τι νέο υπάρχει"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Να γίνεται αυτόματη προσαρμογή μηνυμάτων;"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Συρρικνώστε τα μεγάλα μηνύματα για να χωράνε στην οθόνη και να είναι δυνατή η μεγέθυνσή τους. Για να απενεργοποιήσετε αυτήν την επιλογή, μεταβείτε στο μενού Ρυθμίσεις &gt; Γενικές ρυθμίσεις."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Απάντηση"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Απάντηση σε όλους"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Αρχειοθέτηση"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Σίγαση"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Κατάργηση ενέργειας"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Αρχειοθέτηση συνομιλιών"</item>
+    <item msgid="1894624633891654411">"Διαγραφή συνομιλιών"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Αρχειοθέτηση αντί για διαγραφή συνομιλιών"</item>
+    <item msgid="6515786566522105643">"Διαγραφή αντί για αρχειοθέτηση συνομιλιών"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Κατάργηση ενέργειας"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Απάντηση σε όλους"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Χρήση ως προεπιλογής για απαντήσεις μηνυμάτων"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Σύρετε για να καταργήσετε"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Στη λίστα συνομιλιών"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Σύρετε προς τα κάτω για ανανέωση"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Γίνεται έλεγχος για αλληλογραφία"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Άδειασμα κάδου απορριμάτων"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Άδειασμα ανεπιθύμητων"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Άδειασμα κάδου απορριμάτων"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Άδειασμα ανεπιθύμητων μηνυμάτων"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Άδειασμα κάδου απορριμάτων;"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Άδειασμα ανεπιθύμητων μηνυμάτων;"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"Αυτό το μήνυμα <xliff:g id="COUNT">%1$d</xliff:g> θα διαγραφεί οριστικά."</item>
+    <item quantity="other" msgid="2473439906075355840">"Αυτά τα μηνύματα <xliff:g id="COUNT">%1$d</xliff:g> θα διαγραφούν οριστικά."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Άνοιγμα συρταριού πλοήγησης"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Κλείσιμο συρταριού πλοήγησης"</string>
 </resources>
diff --git a/res/values-en-rGB-sw600dp/strings.xml b/res/values-en-rGB-sw600dp/strings.xml
index e3ef654..7b960e8 100644
--- a/res/values-en-rGB-sw600dp/strings.xml
+++ b/res/values-en-rGB-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Manage folders"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Use as default for replies to message notifications"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 58cf966..36d408d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Change folders"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Move to"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Folder settings"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Revert auto-sizing"</string>
     <string name="message_modified" msgid="2564340197585393687">"(This message has been modified from its original version to fit this screen.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Folders"</string>
     <string name="folder_list_more" msgid="537172187223133825">"More"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Message wasn\'t sent."</string>
     <string name="me" msgid="6480762904022198669">"me"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Show all folders"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Inbox"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Delete this conversation?"</item>
     <item quantity="other" msgid="930334208937121234">"Delete these <xliff:g id="COUNT">%1$d</xliff:g> conversations?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Show conversation list after you delete"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"What\'s new"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Auto-fit messages?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Shrink wide messages to fit your screen and allow zooming in. To turn off this option, go to Settings &gt; General settings."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Reply"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Reply all"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archive"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silent"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Remove action"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Archive conversations"</item>
+    <item msgid="1894624633891654411">"Delete conversations"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Archive rather than delete conversations"</item>
+    <item msgid="6515786566522105643">"Delete rather than archive conversations"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Remove action"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Reply all"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Use as default for message replies"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Swipe to remove"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In conversation list"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swipe down to refresh"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Checking for mail"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Empty trash"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Empty spam"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Empty Trash"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Empty Spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Empty Trash?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Empty Spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"This <xliff:g id="COUNT">%1$d</xliff:g> message will be permanently deleted."</item>
+    <item quantity="other" msgid="2473439906075355840">"These <xliff:g id="COUNT">%1$d</xliff:g> messages will be permanently deleted."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Open navigation drawer"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Close navigation drawer"</string>
 </resources>
diff --git a/res/values-es-rUS-sw600dp/strings.xml b/res/values-es-rUS-sw600dp/strings.xml
index af059cf..70e5214 100644
--- a/res/values-es-rUS-sw600dp/strings.xml
+++ b/res/values-es-rUS-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ CC/CCO"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ CCO"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Administrar carpetas"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Usar como opción predeterminada para responder notif. de mensajes"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a55e8f2..c926cd0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Cambiar carpetas"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Mover a"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Configuración de carpetas"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Volver a tamaño automát."</string>
     <string name="message_modified" msgid="2564340197585393687">"La versión original de este mensaje se modificó para que se ajuste a esta pantalla."</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Carpetas"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Más"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"No se envió el mensaje."</string>
     <string name="me" msgid="6480762904022198669">"yo"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Recibidos"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"¿Deseas eliminar esta conversación?"</item>
     <item quantity="other" msgid="930334208937121234">"¿Deseas eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Mostrar la lista de conversaciones luego de la eliminación"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Novedades"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"¿Deseas ajustar automáticamente los mensajes?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Reduce el tamaño de los mensajes más anchos para que se adapten a la pantalla y amplíalos para verlos más de cerca. Para desactivar esta opción, ve a Configuración &gt; Configuración general."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivar"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silencio"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Acción de eliminar"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Archivar conversaciones"</item>
+    <item msgid="1894624633891654411">"Eliminar conversaciones"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Archivar en lugar de eliminar conversaciones"</item>
+    <item msgid="6515786566522105643">"Eliminar en lugar de archivar conversaciones"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Acción de eliminar"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como opción predeterminada para responder mensajes"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar para eliminar"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"En lista de conversaciones"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Desliza el dedo hacia abajo para actualizar."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Comprobando si hay correo electrónico…"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Vaciar papelera"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Vaciar carpeta de spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Abrir panel de navegación"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Cerrar panel de navegación"</string>
 </resources>
diff --git a/res/values-es-sw600dp/strings.xml b/res/values-es-sw600dp/strings.xml
index 211f830..e29bde4 100644
--- a/res/values-es-sw600dp/strings.xml
+++ b/res/values-es-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cco"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Cco"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Administrar carpetas"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Usar como predeterminada para responder a notificaciones de mensajes"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 77c455d..5bca6b5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Cambiar carpetas"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Mover a"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Ajustes de carpeta"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Volver al tamaño original"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Se ha modificado la versión original de este mensaje para adaptarse a la pantalla)."</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Carpetas"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Más"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"No se ha enviado el mensaje."</string>
     <string name="me" msgid="6480762904022198669">"yo"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Bandeja de entrada"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"¿Eliminar esta conversación?"</item>
     <item quantity="other" msgid="930334208937121234">"¿Eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Mostrar lista de conversaciones después de eliminar"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Novedades"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"¿Ajustar automáticamente los mensajes?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Ajusta los mensajes grandes al tamaño de la pantalla y amplía la vista. Para desactivar esta opción, accede a Ajustes &gt; Ajustes generales."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivar"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silencio"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminar acción"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Archivar conversaciones"</item>
+    <item msgid="1894624633891654411">"Eliminar conversaciones"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Archivar las conversaciones en lugar de eliminarlas"</item>
+    <item msgid="6515786566522105643">"Eliminar las conversaciones en lugar de archivarlas"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Eliminar acción"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como opción predeterminada para responder mensajes"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar para eliminar"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"En la lista de conversaciones"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslizar hacia abajo para actualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Buscando correo electrónico..."</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Vaciar papelera"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Vaciar carpeta de spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Abrir control de navegación"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Cerrar control de navegación"</string>
 </resources>
diff --git a/res/values-et-sw600dp/strings.xml b/res/values-et-sw600dp/strings.xml
index ff8af25..6877308 100644
--- a/res/values-et-sw600dp/strings.xml
+++ b/res/values-et-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ koopia/pimekoopia"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ pimekoopia"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Halda kaustu"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Kasuta vaikeseadena sõnumi märguannetele vastamisel"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 7031420..bb93ebb 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Muuda kaustu"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Teisalda asukohta"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Kausta seaded"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Ennista automaatne suurus"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Sõnumi algset versiooni muudeti, et see mahuks ekraanile.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Kaustad"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Rohkem"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Sõnumit ei saadetud."</string>
     <string name="me" msgid="6480762904022198669">"mina"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Kuva kõik kaustad"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Postkast"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Kas kustutada see meilivestlus?"</item>
     <item quantity="other" msgid="930334208937121234">"Kas kustutada need <xliff:g id="COUNT">%1$d</xliff:g> meilivestlust?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Vestlusloendi näitamine pärast kustutamist"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Mis on uut?"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Kas kasutada sõnumite automaatset sobitamist?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Laiade sõnumite kahandamine, nii et need mahuksid ekraanile ja suurendamise lubamine. Valiku sisselülitamiseks valige Seaded &gt; Üldseaded."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Vasta"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Vasta kõigile"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhiveeri"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Hääletu"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eemalda toiming"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arhiveeri vestlused"</item>
+    <item msgid="1894624633891654411">"Kustuta vestlused"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Kustutamise asemel arhiivite vestlused"</item>
+    <item msgid="6515786566522105643">"Arhiivimise asemel kustutate vestlused"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Eemalda toiming"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Vasta kõigile"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Kasuta vaikeseadena sõnumitele vastamisel"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Pühkige eemaldamiseks"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Meilivestluste loendis"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Värskendamiseks pühkige alla"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"E-posti kontrollimine"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Tühjenda prügikast"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Tühjenda rämpspost"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Ava navigeerimissahtel"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Sule navigeerimissahtel"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2e20f6c..551163c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"بعد از حذف فهرست مکالمات را نشان می‌دهد"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"ویژگی جدید چیست"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"اندازه پیام‌ها بصورت خودکار تنظیم شود؟"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"پیام‌های گسترده را متناسب با صفحه شما کوچک می‌کند و امکان بزرگنمایی را بوجود می‌آورد. برای غیرفعال کردن این گزینه به تنظیمات &gt; تنظیمات عمومی بروید."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"پاسخ"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"پاسخ به همه"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"آرشیو"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"در لیست مکالمه"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"برای بازخوانی، صفحه را با انگشت به سمت پایین بکشید"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"در حال بررسی برای ایمیل"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"خالی کردن پوشه حذف‌شده‌ها"</string>
-    <string name="empty_spam" msgid="930744491746508050">"خالی کردن پوشه هرزنامه"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"باز کردن کشوی پیمایش"</string>
     <string name="drawer_close" msgid="2764774620737876943">"بستن کشوی پیمایش"</string>
 </resources>
diff --git a/res/values-fi-sw600dp/strings.xml b/res/values-fi-sw600dp/strings.xml
index a5e0659..60da2c7 100644
--- a/res/values-fi-sw600dp/strings.xml
+++ b/res/values-fi-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopio/piilokopio"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Piilokopio"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Hallinnoi kansioita"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Käytä oletuksena vastauksissa viesti-ilmoituksiin"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 54dd458..b1590d0 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Vaihda kansiota"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Siirrä kansioon"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Kansion asetukset"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Palauta autom. koko"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Tämä viesti on sovitettu alkuperäisversiosta tälle näytölle sopivaksi.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Kansiot"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Lisää"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Viestiä ei lähetetty."</string>
     <string name="me" msgid="6480762904022198669">"minä"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Näytä kaikki kansiot"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Postilaatikko"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Poistetaanko tämä keskustelu?"</item>
     <item quantity="other" msgid="930334208937121234">"Poistetaanko nämä <xliff:g id="COUNT">%1$d</xliff:g> keskustelua?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Näytä keskusteluluettelo poistamisen jälkeen"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Uutuudet"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Sovitetaanko viestit automaattisesti?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Kutista leveät viestit ruutuun sopiviksi ja salli zoomaus. Voit poistaa tämän asetuksen käytöstä kohdassa Asetukset &gt; Yleisasetukset."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Vastaa"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Vastaa kaikille"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkistoi"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Äänetön"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Poista toiminto"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arkistoi keskusteluja"</item>
+    <item msgid="1894624633891654411">"Poista keskusteluja"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arkistoi keskustelut poistamisen sijaan"</item>
+    <item msgid="6515786566522105643">"Poista keskustelut arkistoinnin sijaan"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Poistotoiminto"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Vastaa kaikille"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Käytä oletuksena vastauksissa"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Poista liu\'uttamalla sormea"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Keskusteluluettelossa"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Päivitä liu\'uttamalla alas"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tarkistetaan sähköposteja"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Tyhjennä roskakori"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Tyhjennä roskaposti"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Avaa navigointipalkki"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Sulje navigointipalkki"</string>
 </resources>
diff --git a/res/values-fr-sw600dp/strings.xml b/res/values-fr-sw600dp/strings.xml
index 8bdfa8c..dba5e0f 100644
--- a/res/values-fr-sw600dp/strings.xml
+++ b/res/values-fr-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cci"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Cci"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Gérer les dossiers"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Utiliser par défaut pour les réponses aux notifications de messages"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8d4e643..8e05721 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Modifier les dossiers"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Déplacer vers"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Paramètres des dossiers"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Annul. dimensionnement auto"</string>
     <string name="message_modified" msgid="2564340197585393687">"(La version originale de ce message a été modifiée afin de l\'adapter à cet écran.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Dossiers"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Plus"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Échec de l\'envoi."</string>
     <string name="me" msgid="6480762904022198669">"moi"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Afficher tous les dossiers"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Boîte de réception"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Supprimer cette conversation ?"</item>
     <item quantity="other" msgid="930334208937121234">"Supprimer ces <xliff:g id="COUNT">%1$d</xliff:g> conversations ?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Afficher la liste des conversations après suppression"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Nouveautés"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Ajuster automatiquement les messages ?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Réduisez la taille des messages les plus larges de sorte qu\'ils soient ajustés à votre écran et autorisez les zooms avant. Pour désactiver cette option, sélectionnez Paramètres &gt; Paramètres généraux."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Répondre"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Répondre à tous"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archiver"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g> : <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Mode silencieux"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Supprimer"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Archiver les conversations"</item>
+    <item msgid="1894624633891654411">"Supprimer les conversations"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Archiver les conversations au lieu de les supprimer"</item>
+    <item msgid="6515786566522105643">"Supprimer les conversations au lieu de les archiver"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Action de suppression"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Répondre à tous"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utiliser ce paramètre par défaut pour les réponses"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Faire glisser l\'élément pour le supprimer"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dans la liste des conversations"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Faire glisser le doigt vers le bas pour actualiser"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Vérification des e-mails en cours…"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Vider la corbeille"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Vider le dossier de spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Ouvrir le panneau de navigation"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Fermer le panneau de navigation"</string>
 </resources>
diff --git a/res/values-hi-sw600dp/strings.xml b/res/values-hi-sw600dp/strings.xml
index add56d0..844674a 100644
--- a/res/values-hi-sw600dp/strings.xml
+++ b/res/values-hi-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"Cc/Bcc जोड़ें"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"Bcc जोड़ें"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"फ़ोल्‍डर प्रबंधित करें"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"संदेश सूचनाओं के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e3a2a97..4b51103 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"फ़ोल्डर बदलें"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"इसमें ले जाएं"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"फ़ोल्डर सेटिंग"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"स्वत: आकार बदलें वापस लाएं"</string>
     <string name="message_modified" msgid="2564340197585393687">"(इस संदेश को इस स्क्रीन में फ़िट करने के लिए इसके मूल संस्करण में बदलाव किया गया है.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"फ़ोल्डर"</string>
     <string name="folder_list_more" msgid="537172187223133825">"अधिक"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"संदेश नहीं भेजा गया था."</string>
     <string name="me" msgid="6480762904022198669">"मुझे"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"सभी फ़ोल्‍डर दिखाएं"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"इनबॉक्स"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"इस बातचीत को हटाएं?"</item>
     <item quantity="other" msgid="930334208937121234">"ये <xliff:g id="COUNT">%1$d</xliff:g> बातचीत हटाएं?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"आपके द्वारा हटाए जाने के बाद वार्तालाप सूची दिखाएं"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"नया क्या है"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"संदेशों को स्वत: फ़िट करें?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"बड़े संदेशों को अपनी स्क्रीन में फ़िट करने के लिए उन्हें सिकोड़ें और ज़ूम इन करने दें. इस विकल्प को बंद करने के लिए, सेटिंग &gt; सामान्य सेटिंग पर जाएं."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"जवाब दें"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"सभी को जवाब दें"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"संग्रहीत करें"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"मौन"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"निकालने की कार्यवाही"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"बातचीत संगृहीत करें"</item>
+    <item msgid="1894624633891654411">"बातचीत हटाएं"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"बातचीतों को हटाने के बजाय संगृहीत करें"</item>
+    <item msgid="6515786566522105643">"बातचीतों को संगृहीत करने के बजाए हटाएं"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"निकालने की कार्यवाही"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"सभी को जवाब दें"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"संदेश के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"निकालने के लिए स्वाइप करें"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"बातचीत की सूची में"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"रीफ्रेश करने के लिए नीचे स्वाइप करें"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"मेल के लिए जांच की जा रही है"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"ट्रैश रिक्त करें"</string>
-    <string name="empty_spam" msgid="930744491746508050">"स्पैम रिक्त करें"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"नेविगेशन ड्रॉवर खोलें"</string>
     <string name="drawer_close" msgid="2764774620737876943">"नेविगेशन ड्रॉवर बंद करें"</string>
 </resources>
diff --git a/res/values-hr-sw600dp/strings.xml b/res/values-hr-sw600dp/strings.xml
index 91e479f..d0ccab1 100644
--- a/res/values-hr-sw600dp/strings.xml
+++ b/res/values-hr-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopija/skriv. kop."</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Skrivena kopija"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Upravljanje mapama"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Upotrijebi kao zadano za odgovore na obavijesti o porukama"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 92852b4..65e30c3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Promjena mapa"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Premjesti u/na"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Postavke mapa"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Vrati izvornu verziju"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Izvorna verzija ove poruke izmijenjena je kako bi se prilagodila zaslonu.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mape"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Više"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Poruka nije poslana."</string>
     <string name="me" msgid="6480762904022198669">"ja"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Prikaži sve mape"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Pristigla pošta"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Izbrisati ovaj razgovor?"</item>
     <item quantity="other" msgid="930334208937121234">"Izbrisati ove razgovore (ukupno <xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Prikaz popisa razgovora nakon brisanja"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Što je novo"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Automatski prilagoditi poruke?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Sažmite široke poruke kako bi se prilagodile zaslonu i omogućite povećavanje prikaza. Da biste isključili tu opciju, idite na Postavke &gt; Opće postavke."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odgovori"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odgovori svima"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhiva"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Bešumno"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Uklanjanje radnje"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arhiviranje razgovora"</item>
+    <item msgid="1894624633891654411">"Brisanje razgovora"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Umjesto brisanja razgovori se arhiviraju"</item>
+    <item msgid="6515786566522105643">"Umjesto arhiviranja razgovori se brišu"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Uklanjanje radnje"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Odgovori svima"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Upotrijebi kao zadano za odgovore na poruke"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Prijeđite prstom da biste uklonili"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na popisu razgovora"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Prijeđite prstom prema dolje za osvježivanje"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Provjeravanje pošte"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Pražnjenje otpada"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Pražnjenje neželjenih sadržaja"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Otvaranje pretinca za navigaciju"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zatvaranje pretinca za navigaciju"</string>
 </resources>
diff --git a/res/values-hu-sw600dp/strings.xml b/res/values-hu-sw600dp/strings.xml
index 445918d..a9641e8 100644
--- a/res/values-hu-sw600dp/strings.xml
+++ b/res/values-hu-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Másolatmezők"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Titkos másolat"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Mappák kezelése"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Használat alapértelmezettként értesítő üzenetekhez"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6780e56..1a15e37 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Mappaváltás"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Áthelyezés ide:"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Mappabeállítások"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Auto.méretezés visszaáll."</string>
     <string name="message_modified" msgid="2564340197585393687">"(Ez az üzenet az eredeti változat jelen képernyőhöz igazított verziója.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mappák"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Több"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Nincs elküldve"</string>
     <string name="me" msgid="6480762904022198669">"saját magam"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Összes mappa megjelenítése"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Beérkező levelek"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Törli ezt a beszélgetést?"</item>
     <item quantity="other" msgid="930334208937121234">"Törli ezt a(z) <xliff:g id="COUNT">%1$d</xliff:g> beszélgetést?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Törlés után a beszélgetéslista megjelenítése"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Újdonságok"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Automatikusan méretezi az üzeneteket?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Összenyomja a széles üzeneteket, és lehetővé teszi a  nagyítást. A funkció kikapcsolásához válassza a Beállítások &gt; Általános beállítások lehetőséget."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Válasz"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Válasz mindenkinek"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archiválás"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Néma"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eltávolítási művelet"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Beszélgetések archiválása"</item>
+    <item msgid="1894624633891654411">"Beszélgetések törlése"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"A beszélgetések archiválása törlés helyett"</item>
+    <item msgid="6515786566522105643">"A beszélgetések törlése archiválás helyett"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Eltávolítási művelet"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Válasz mindenkinek"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Használat alapértelmezettként válaszüzenetekhez"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Csúsztassa gyorsan az ujját az eltávolításhoz"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Beszélgetéslistában"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Frissítéshez húzza le"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"E-mail ellenőrzése"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Kuka ürítése"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Spam ürítése"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Navigációs fiók kinyitása"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Navigációs fiók bezárása"</string>
 </resources>
diff --git a/res/values-in-sw600dp/strings.xml b/res/values-in-sw600dp/strings.xml
index 9f7e66d..438df39 100644
--- a/res/values-in-sw600dp/strings.xml
+++ b/res/values-in-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Kelola folder"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Gunakan sebagai default untuk menjawab pemberitahuan pesan"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4e910c4..d789178 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Ganti folder"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Pindahkan ke"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Setelan folder"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Balikkan pengubahan ukuran otomatis"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Pesan ini telah diubah dari versi aslinya untuk menyesuaikan dengan layar.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Folder"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Lainnya"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Pesan tidak dikirim."</string>
     <string name="me" msgid="6480762904022198669">"saya"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Tampilkan semua folder"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Kotak Masuk"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Hapus percakapan ini?"</item>
     <item quantity="other" msgid="930334208937121234">"Hapus <xliff:g id="COUNT">%1$d</xliff:g> percakapan ini?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Tampilkan daftar percakapan setelah menghapus"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Yang baru"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Otomatis paskan pesan?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Mampatkan pesan yang lebar agar pas dengan layar Anda dan memungkinkan pembesaran. Untuk mematikan opsi ini, buka Setelan &gt; Setelan umum."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Balas"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Balas ke semua"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arsipkan"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tidak Berbunyi"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Tindakan penghapusan"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Mengarsipkan percakapan"</item>
+    <item msgid="1894624633891654411">"Hapus percakapan"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arsipkan, bukan hapus percakapan"</item>
+    <item msgid="6515786566522105643">"Hapus, bukan arsipkan percakapan"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Tindakan penghapusan"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Balas ke semua"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gunakan sebagai default untuk balasan pesan"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Gesek untuk menghapus"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam daftar percakapan"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Gesek ke bawah untuk menyegarkan"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Memeriksa email"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Kosongkan sampah"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Kosongkan spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
 </resources>
diff --git a/res/values-it-sw600dp/strings.xml b/res/values-it-sw600dp/strings.xml
index 184b872..3300e51 100644
--- a/res/values-it-sw600dp/strings.xml
+++ b/res/values-it-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Ccn"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Ccn"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Gestisci cartelle"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Usa come predefinito per le risposte alle notifiche"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index aeb5cbf..54ad535 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Cambia cartelle"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Sposta in"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Impostazioni cartella"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Ripristina ridim. autom."</string>
     <string name="message_modified" msgid="2564340197585393687">"(La versione originale di questo messaggio è stata modificata per essere adattata allo schermo.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Cartelle"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Altre"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Messaggio non inviato."</string>
     <string name="me" msgid="6480762904022198669">"me"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Visualizza tutte le cartelle"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Posta in arrivo"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Eliminare questa conversazione?"</item>
     <item quantity="other" msgid="930334208937121234">"Eliminare queste <xliff:g id="COUNT">%1$d</xliff:g> conversazioni?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Mostra elenco conversazioni dopo eliminazione"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Novità"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Adattare automaticamente i messaggi?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Restringi i messaggi larghi per adattarli allo schermo e consenti lo zoom in avanti. Per disattivare questa opzione, vai a Impostazioni &gt; Impostazioni generali."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Rispondi"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Rispondi a tutti"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivia"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silenzioso"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Azione rimozione"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Archivia conversazioni"</item>
+    <item msgid="1894624633891654411">"Elimina conversazioni"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Archivia anziché eliminare le conversazioni"</item>
+    <item msgid="6515786566522105643">"Elimina anziché archiviare le conversazioni"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Azione rimozione"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Rispondi a tutti"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usa come predefinito per le risposte ai messaggi"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Fai scorrere per rimuovere"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In elenco di conversazioni"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fai scorrere verso il basso per aggiornare"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Controllo della posta"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Cestino vuoto"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Cartella spam vuota"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Cestino vuoto"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Cartella spam vuota"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Svuotare il cestino?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Svuotare la cartella spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"Il messaggio <xliff:g id="COUNT">%1$d</xliff:g> verrà eliminato definitivamente."</item>
+    <item quantity="other" msgid="2473439906075355840">"I messaggi <xliff:g id="COUNT">%1$d</xliff:g> verranno eliminati definitivamente."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Apri riquadro di navigazione"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Chiudi riquadro di navigazione"</string>
 </resources>
diff --git a/res/values-iw-sw600dp/strings.xml b/res/values-iw-sw600dp/strings.xml
index 002b67a..4fe2ee4 100644
--- a/res/values-iw-sw600dp/strings.xml
+++ b/res/values-iw-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ עותק/עותק מוסתר"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ עותק מוסתר"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"ניהול תיקיות"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"השתמש כברירת מחדל עבור תשובה להתראות על הודעות"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 52598a2..8f5cde3 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"שנה תיקיות"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"העבר אל"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"הגדרות תיקיה"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"בטל קביעת גודל אוטומטית"</string>
     <string name="message_modified" msgid="2564340197585393687">"(ההודעה הזו שונתה מגרסתה המקורית כדי שתתאים למסך הזה.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"תיקיות"</string>
     <string name="folder_list_more" msgid="537172187223133825">"עוד"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"ההודעה לא נשלחה."</string>
     <string name="me" msgid="6480762904022198669">"אני"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"הצג את כל התיקיות"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"תיבת דואר נכנס"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"האם למחוק שיחה זו?"</item>
     <item quantity="other" msgid="930334208937121234">"האם למחוק <xliff:g id="COUNT">%1$d</xliff:g> שיחות אלה?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"הצג רשימת שיחות לאחר ביצוע מחיקה"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"מה חדש"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"האם להתאים אוטומטית גודל של הודעות?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"כווץ הודעות רחבות כדי שיתאימו למסך וכדי לאפשר שינוי של מרחק התצוגה. כדי לכבות אפשרות זו, עבור אל \'הגדרות\' &gt; \'הגדרות כלליות\'."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"השב"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"השב לכולם"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"שלח לארכיון"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>‏: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"שקט"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"פעולת הסרה"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"העבר שיחות לארכיון"</item>
+    <item msgid="1894624633891654411">"מחק שיחות"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"העבר הודעות לארכיון במקום למחוק אותן"</item>
+    <item msgid="6515786566522105643">"מחק הודעות במקום להעביר אותן לארכיון"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"פעולת הסרה"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"השב לכולם"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"השתמש כברירת מחדל עבור תשובה להודעות"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"החלק כדי להסיר"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"ברשימת השיחות"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"החלק מטה לביצוע רענון"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"בודק אם יש דואר"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"רוקן את האשפה"</string>
-    <string name="empty_spam" msgid="930744491746508050">"רוקן את הספאם"</string>
+    <string name="empty_trash" msgid="652435297593538512">"רוקן את האשפה"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"רוקן את דואר הזבל"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"האם לרוקן את האשפה?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"האם לרוקן את דואר הזבל?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"הודעה <xliff:g id="COUNT">%1$d</xliff:g> זו תימחק לצמיתות."</item>
+    <item quantity="other" msgid="2473439906075355840">"<xliff:g id="COUNT">%1$d</xliff:g> ההודעות האלה יימחקו לצמיתות."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"פתח את חלונית הניווט"</string>
     <string name="drawer_close" msgid="2764774620737876943">"סגור את חלונית הניווט"</string>
 </resources>
diff --git a/res/values-ja-sw600dp/strings.xml b/res/values-ja-sw600dp/strings.xml
index 6c71bcf..4ba17e7 100644
--- a/res/values-ja-sw600dp/strings.xml
+++ b/res/values-ja-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"Cc/Bccを追加"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"Bccを追加"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"フォルダを管理"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"メッセージ通知への返信時のデフォルトとして使用する"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b564128..6d25b43 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"フォルダを変更"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"移動"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"フォルダの設定"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"自動サイズ変更を元に戻す"</string>
     <string name="message_modified" msgid="2564340197585393687">"（このメッセージは、画面に合わせて元のバージョンから変更されています。）"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"フォルダ"</string>
     <string name="folder_list_more" msgid="537172187223133825">"その他"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"送信に失敗しました。"</string>
     <string name="me" msgid="6480762904022198669">"自分"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"すべてのフォルダを表示"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"受信ボックス"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"このスレッドを削除しますか？"</item>
     <item quantity="other" msgid="930334208937121234">"<xliff:g id="COUNT">%1$d</xliff:g>件のスレッドを削除しますか？"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"削除後にスレッドリストを表示する"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"新機能"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"メッセージの自動サイズ調整"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"横長のメッセージが画面に合わせて自動で調整され、拡大することもできます。このオプションをオフにするには、[設定] &gt; [全般設定]を選択します。"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"返信"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"全員に返信"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"アーカイブ"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"マナーモード"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"削除操作"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"スレッドをアーカイブする"</item>
+    <item msgid="1894624633891654411">"スレッドを削除する"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"スレッドを削除せずにアーカイブする"</item>
+    <item msgid="6515786566522105643">"スレッドをアーカイブせずに削除する"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"削除操作"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"全員に返信"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"返信時のデフォルトとして使用する"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"スワイプして削除"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"スレッドリスト内"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下にスワイプして更新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"メールを確認しています"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"ゴミ箱を空にする"</string>
-    <string name="empty_spam" msgid="930744491746508050">"迷惑メールフォルダを空にする"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"ナビゲーションドロワーを開く"</string>
     <string name="drawer_close" msgid="2764774620737876943">"ナビゲーションドロワーを閉じる"</string>
 </resources>
diff --git a/res/values-ko-sw600dp/strings.xml b/res/values-ko-sw600dp/strings.xml
index bc64231..5fafa24 100644
--- a/res/values-ko-sw600dp/strings.xml
+++ b/res/values-ko-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ 참조/숨은참조"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ 숨은참조"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"폴더 관리"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"메일 알림에 답장 시 기본값으로 사용"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0ddae9e..22e22eb 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"폴더 변경"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"이동"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"폴더 설정"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"자동 크기 조정 되돌리기"</string>
     <string name="message_modified" msgid="2564340197585393687">"(이 메일은 원본 버전을 화면에 맞게 수정한 것입니다.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"폴더"</string>
     <string name="folder_list_more" msgid="537172187223133825">"더보기"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"메일이 전송되지 않았습니다."</string>
     <string name="me" msgid="6480762904022198669">"나"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"모든 폴더 표시"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"받은편지함"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"대화를 삭제하시겠습니까?"</item>
     <item quantity="other" msgid="930334208937121234">"대화 <xliff:g id="COUNT">%1$d</xliff:g>개를 삭제하시겠습니까?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"삭제 후 대화 목록 표시"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"새로운 기능"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"메일을 자동 맞춤하시겠습니까?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"메일의 너비가 화면에 맞도록 크기를 축소하고, 확대 기능을 지원합니다. 이 옵션을 사용 중지하려면 설정 &gt; 일반 설정으로 이동합니다."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"답장"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"전체답장"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"보관처리"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"무음"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"삭제 작업"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"대화 보관처리"</item>
+    <item msgid="1894624633891654411">"대화 삭제"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"대화를 삭제하지 않고 보관처리"</item>
+    <item msgid="6515786566522105643">"대화를 보관처리하지 않고 삭제"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"작업 삭제"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"전체답장"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"메일 답장 시 기본값으로 사용"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"스와이프하여 삭제"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"대화 목록"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"아래로 스와이프하여 새로고침"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"메일 확인 중"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"휴지통 비우기"</string>
-    <string name="empty_spam" msgid="930744491746508050">"스팸 비우기"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"내비게이션 폴더 열기"</string>
     <string name="drawer_close" msgid="2764774620737876943">"내비게이션 폴더 닫기"</string>
 </resources>
diff --git a/res/values-lt-sw600dp/strings.xml b/res/values-lt-sw600dp/strings.xml
index 841014f..befd87d 100644
--- a/res/values-lt-sw600dp/strings.xml
+++ b/res/values-lt-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ kop. / nemat. kop."</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ nematomoji kopija"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Tvarkyti aplankus"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Naudoti kaip numatytąjį atsakant į pranešimus"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4f61034..c7b252a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Keisti aplankus"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Perkelti į"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Aplankų nustatymai"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Grąžinti automatinį dydžio nustatymą"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Pranešimo originalas pakeistas, kad tilptų į ekraną.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Aplankai"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Daugiau"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Pranešimas neišsiųstas."</string>
     <string name="me" msgid="6480762904022198669">"man"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Rodyti visus aplankus"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Gautieji"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Ištrinti šį pokalbį?"</item>
     <item quantity="other" msgid="930334208937121234">"Ištrinti šiuos <xliff:g id="COUNT">%1$d</xliff:g> pokalb.?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Ištrynus rodyti pokalbių sąrašą"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Kas naujo?"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Priderinti pranešimus automatiškai?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Sumažinkite plačius pranešimus, kad jie tilptų jūsų ekrane, ir įgalinkite mastelio keitimą. Jei norite išjungti šią parinktį, eikite į „Nustatymai“ &gt; „Bendrieji nustatymai“."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Atsakyti"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Atsakyti visiems"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archyvuoti"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tylus"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Pašalinti veiksmą"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Archyvuoti pokalbius"</item>
+    <item msgid="1894624633891654411">"Ištrinti pokalbius"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Pokalbius archyvuoti, o ne ištrinti"</item>
+    <item msgid="6515786566522105643">"Pokalbius ištrinti, o ne archyvuoti"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Pašalinti veiksmą"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Atsakyti visiems"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Naudoti kaip numatytąjį atsakant į pranešimus"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Jei norite pašalinti, perbraukite"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Pokalbių sąraše"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Perbraukite žemyn, kad atnaujintumėte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ieškoma laiškų"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Išvalyti šiukšliadėžę"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Išvalyti šlamšto aplanką"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Atidaryti naršymo juostą"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Uždaryti naršymo juostą"</string>
 </resources>
diff --git a/res/values-lv-sw600dp/strings.xml b/res/values-lv-sw600dp/strings.xml
index 477137a..7147f21 100644
--- a/res/values-lv-sw600dp/strings.xml
+++ b/res/values-lv-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopija/diskr. kop."</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Diskrētā kopija"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Pārvaldīt mapes"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Izmantot kā noklusējumu, atbildot uz paziņojumiem"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 8f42a03..9e18528 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Mainīt mapes"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Pārvietot uz:"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Mapju iestatījumi"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Atj. aut. liel. noteikš."</string>
     <string name="message_modified" msgid="2564340197585393687">"(Šī ziņojuma sākotnējā versija tika pārveidota, lai tas ietilptu šajā ekrānā.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mapes"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Vairāk"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Ziņoj. nav nosūtīts."</string>
     <string name="me" msgid="6480762904022198669">"man"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Rādīt visas mapes"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Iesūtne"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vai dzēst šo sarunu?"</item>
     <item quantity="other" msgid="930334208937121234">"Vai dzēst šīs sarunas (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Rādīt sarunu sarakstu pēc dzēšanas"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Jaunumi"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Vai automātiski ietilpināt ziņojumus?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Samaziniet ziņojumu lielumu, lai ietilpinātu tos ekrānā, un atļaujiet tuvināšanu. Lai izslēgtu šo opciju, dodieties uz izvēlni Iestatījumi &gt; Vispārīgi iestatījumi."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Atbildēt"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Atbildēt visiem"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhivēt"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Klusums"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Noņemšanas darbība"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arhivēt sarunas"</item>
+    <item msgid="1894624633891654411">"Dzēst sarunas"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arhivēt, nevis dzēst sarunas"</item>
+    <item msgid="6515786566522105643">"Dzēst, nevis arhivēt sarunas"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Noņemšanas darbība"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Atbildēt visiem"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Izmantot kā noklusējumu, atbildot uz ziņojumiem"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Vilkt, lai noņemtu"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Sarunu sarakstā"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Lai atsvaidzinātu, velciet uz leju."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Notiek e-pasta pārbaude"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Iztukšot atkritni"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Iztukšot mēstuļu mapi"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Atvērt navigācijas paneli"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Aizvērt navigācijas paneli"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 70857fb..82cc922 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -78,7 +78,7 @@
     <string name="menu_manage_folders" msgid="6755623004628177492">"Tetapan folder"</string>
     <!-- no translation found for menu_show_original (4227060689700765828) -->
     <skip />
-    <string name="message_modified" msgid="2564340197585393687">"(Mesej ini telah diubah suai dari versi asal agar muat dalam skrin ini.)"</string>
+    <string name="message_modified" msgid="2564340197585393687">"(Mesej ini telah diubah suai daripada versi asal agar muat dalam skrin ini.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Folder"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Lagi"</string>
     <string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Lagi akaun"</string>
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Tunjukkan senarai perbualan selepas memadamkan"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Apa yang baharu"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Automuat mesej?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Mengecutkan mesej lebar agar muat pada skrin anda dan membenarkan zum masuk. Untuk mematikan pilihan ini sila pergi ke Tetapan &gt; Tetapan umum."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Balas"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Balas kepada semua"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkib"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam senarai perbualan"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Leret ke bawah untuk memuat semula"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Menyemak mel"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Kosongkan tong sampah"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Kosongkan spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
 </resources>
diff --git a/res/values-nb-sw600dp/strings.xml b/res/values-nb-sw600dp/strings.xml
index 8f12052..bc7d035 100644
--- a/res/values-nb-sw600dp/strings.xml
+++ b/res/values-nb-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopi/blindkopi"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Blindkopi"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Administrer mapper"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Bruk som standard for e-postsvar"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e1b094b..eba505f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Endre mapper"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Flytt til"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Mappeinnstillinger"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Tilbakestill autostr."</string>
     <string name="message_modified" msgid="2564340197585393687">"(Denne e-posten har blitt endret fra den opprinnelige versjonen slik at den passer denne skjermen.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mapper"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Mer"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"E-post ikke sendt."</string>
     <string name="me" msgid="6480762904022198669">"meg"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Innboks"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtalen?"</item>
     <item quantity="other" msgid="930334208937121234">"Vil du slette disse <xliff:g id="COUNT">%1$d</xliff:g> samtalene?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Vis samtaleliste etter du har slettet"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Dette er nytt"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Vil du automatisk tilpasse e-poster?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Krymp brede e-poster slik at de tilpasses skjermen din og tillat zooming. Gå til Innstillinger &gt; Generelle innstillinger for å deaktivere dette alternativet."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Svar"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Svar alle"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkivér"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Stille"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Handling for fjerning"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arkivér samtaler"</item>
+    <item msgid="1894624633891654411">"Slett samtaler"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arkivér samtaler i stedet for å slette dem"</item>
+    <item msgid="6515786566522105643">"Slett samtaler i stedet for å arkivere dem"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Handling for fjerning"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Svar alle"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Bruk som standard for e-postsvar"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Sveip for å fjerne"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"I samtalelister"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Sveip ned for å laste inn på nytt"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ser etter e-post"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Tøm papirkurven"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Tøm nettsøppel"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Tøm papirkurven"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Fjern nettsøppel"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Vil du tømme papirkurven?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Vil du fjerne nettsøppelet?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"<xliff:g id="COUNT">%1$d</xliff:g> melding slettes permanent."</item>
+    <item quantity="other" msgid="2473439906075355840">"Disse <xliff:g id="COUNT">%1$d</xliff:g> meldingene slettes permanent."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Åpne navigasjonsskuffen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Lukk navigasjonsskuffen"</string>
 </resources>
diff --git a/res/values-nl-sw600dp/strings.xml b/res/values-nl-sw600dp/strings.xml
index 7f7634f..a9991f1 100644
--- a/res/values-nl-sw600dp/strings.xml
+++ b/res/values-nl-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Mappen beheren"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Gebruiken als standaard voor antwoorden op berichtmeldingen"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9a9302f..2e48a50 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Mappen wijzigen"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Verplaatsen naar"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Mapinstellingen"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Autom. formaat terugzttn"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Dit bericht is een aangepaste versie van het oorspronkelijke bericht, zodat het op het scherm past.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mappen"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Meer"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Niet verzonden."</string>
     <string name="me" msgid="6480762904022198669">"ik"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Alle mappen weergeven"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Postvak IN"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Deze conversatie verwijderen?"</item>
     <item quantity="other" msgid="930334208937121234">"Deze <xliff:g id="COUNT">%1$d</xliff:g> conversaties verwijderen?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Conversatielijst weergeven na het verwijderen"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Wat is er nieuw"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Berichten aanpassen aan scherm?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Verklein brede berichten tot ze op uw scherm passen en sta inzoomen toe. Als u deze optie wilt uitschakelen, gaat u naar \'Instellingen &gt; Algemene instellingen\'."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Beantwoorden"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Allen beantwoorden"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archiveren"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Stil"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Verwijderen"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Conversaties archiveren"</item>
+    <item msgid="1894624633891654411">"Conversaties verwijderen"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Conversaties archiveren in plaats van deze te verwijderen"</item>
+    <item msgid="6515786566522105643">"Conversaties verwijderen in plaats van deze te archiveren"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Actie voor verwijderen"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Allen beantwoorden"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gebruiken als standaard voor beantwoorden"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Vegen om te verwijderen"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In conversatielijst"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Veeg omlaag om te vernieuwen"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Controleren op e-mail"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Prullenbak leegmaken"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Spammap leegmaken"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Prullenbak leegmaken"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Spammap leegmaken"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Prullenbak leegmaken?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Spammap leegmaken?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"Dit <xliff:g id="COUNT">%1$d</xliff:g> bericht wordt permanent verwijderd."</item>
+    <item quantity="other" msgid="2473439906075355840">"Deze <xliff:g id="COUNT">%1$d</xliff:g> berichten worden permanent verwijderd."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Navigatielade openen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Navigatielade sluiten"</string>
 </resources>
diff --git a/res/values-pl-sw600dp/strings.xml b/res/values-pl-sw600dp/strings.xml
index 25937f0..5407220 100644
--- a/res/values-pl-sw600dp/strings.xml
+++ b/res/values-pl-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ DW/UDW"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ UDW"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Zarządzaj folderami"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Używaj domyślnie dla odpowiedzi na powiadomienia o wiadomościach"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index faba254..63477f9 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Zmień foldery"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Przenieś do"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Ustawienia folderów"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Przywróć automatyczne wymiary"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Ta wiadomość została dopasowana do ekranu i wygląda inaczej niż w wersji oryginalnej)."</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Foldery"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Więcej"</string>
@@ -170,8 +169,7 @@
     <string name="send_failed" msgid="750908595144529579">"Wiadomość nie została wysłana."</string>
     <string name="me" msgid="6480762904022198669">"ja"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Pokaż wszystkie foldery"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Odebrane"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Usunąć wątek?"</item>
     <item quantity="other" msgid="930334208937121234">"Usunąć wątki (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -363,8 +361,6 @@
     <item msgid="2189929276292165301">"Pokazuj listę konwersacji po usunięciu"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Co nowego"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Automatycznie dopasować wiadomości?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Zmniejsz wiadomości zajmujące dużo miejsca w poziomie, by pasowały do ekranu, i zezwól na powiększanie. Aby wyłączyć tę opcję, wybierz kolejno Ustawienia &gt; Ustawienia ogólne."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odpowiedz"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odpowiedz wszystkim"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archiwizuj"</string>
@@ -382,22 +378,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Cichy"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Usuń czynność"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Archiwizowanie wątków"</item>
+    <item msgid="1894624633891654411">"Usuń wątki"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Archiwizuj wątki, zamiast je usuwać"</item>
+    <item msgid="6515786566522105643">"Usuwaj wątki, zamiast je archiwizować"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Usuń czynność"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Odpowiedz wszystkim"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Używaj domyślnie podczas odpowiadania na wiadomości"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Przesuń palcem, by usunąć"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na liście wątków"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Przesuń w dół, by odświeżyć"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Sprawdzam pocztę"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Opróżnij kosz"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Opróżnij spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Otwórz szufladę nawigacji"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zamknij szufladę nawigacji"</string>
 </resources>
diff --git a/res/values-pt-rPT-sw600dp/strings.xml b/res/values-pt-rPT-sw600dp/strings.xml
index 97cd49c..b26141b 100644
--- a/res/values-pt-rPT-sw600dp/strings.xml
+++ b/res/values-pt-rPT-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Gerir pastas"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Utilizar como predefinição para respostas a notificações de mensagens"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 34d603a..acd0f4a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Alterar pastas"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Mover para"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Definições da pasta"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Reverter dimension. auto."</string>
     <string name="message_modified" msgid="2564340197585393687">"(Esta mensagem foi modificada a partir da sua versão original para ser ajustada a este ecrã.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Pastas"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Mais"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Mensagem não enviada."</string>
     <string name="me" msgid="6480762904022198669">"utilizador"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas as pastas"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Caixa de Entrada"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Eliminar esta conversa?"</item>
     <item quantity="other" msgid="930334208937121234">"Eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Mostrar lista de conversas após eliminar"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Novidades"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Ajustar automaticamente as mensagens?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Encolha mensagens compridas para que se ajustem ao ecrã e possa ampliá-las. Para desligar esta opção, aceda a Definições &gt; Definições gerais."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arquivo"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silencioso"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Remover ação"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arquivar conversas"</item>
+    <item msgid="1894624633891654411">"Eliminar conversas"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arquivar conversas em vez de as eliminar"</item>
+    <item msgid="6515786566522105643">"Eliminar conversas em vez de as arquivar"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Remover ação"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilizar como predefinição para respostas a mensagens"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar rapidamente para remover"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize rapidamente para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"A verificar a existência de correio"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Esvaziar caixote do lixo"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Esvaziar spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Abrir separador de navegação"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Fechar separador de navegação"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d6a5b58..5abb5e7 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Exibir a lista de conversas depois de excluir"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"O que há de novo"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Ajustar mensagens automaticamente?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Reduz mensagens largas para que caibam na tela e permite aumentar zoom. Para desativar esta opção, vá para \"Configurações\" &gt; \"Configurações gerais\"."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arquivar"</string>
@@ -398,8 +396,14 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Verificando e-mail"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Esvaziar lixeira"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Spam vazio"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Esvaziar lixeira"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Esvaziar spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Esvaziar a lixeira?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Esvaziar o spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"<xliff:g id="COUNT">%1$d</xliff:g> mensagem será excluída permanentemente."</item>
+    <item quantity="other" msgid="2473439906075355840">"Estas <xliff:g id="COUNT">%1$d</xliff:g> mensagens serão excluídas permanentemente."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Abrir gaveta de navegação"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Fechar gaveta de navegação"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 91ed74a..0aeb0d4 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -564,10 +564,6 @@
     <!-- no translation found for prefSummaries_autoAdvance:2 (2189929276292165301) -->
     <!-- no translation found for whats_new_dialog_title (4230806739326698666) -->
     <skip />
-    <!-- no translation found for auto_fit_messages_dialog_title (2759387078807832659) -->
-    <skip />
-    <!-- no translation found for auto_fit_messages_dialog_message (4039164951892949801) -->
-    <skip />
     <!-- no translation found for notification_action_reply (6015299134424685297) -->
     <skip />
     <!-- no translation found for notification_action_reply_all (20020468410400912) -->
@@ -616,10 +612,16 @@
     <skip />
     <!-- no translation found for checking_for_mail (2301797903350897130) -->
     <skip />
-    <!-- no translation found for empty_trash (5042310780353359729) -->
+    <!-- no translation found for empty_trash (652435297593538512) -->
     <skip />
-    <!-- no translation found for empty_spam (930744491746508050) -->
+    <!-- no translation found for empty_spam (6064497180615519589) -->
     <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <!-- no translation found for drawer_open (6074646853178471940) -->
     <skip />
     <!-- no translation found for drawer_close (2764774620737876943) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 404231b..7067773 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Afişaţi lista de conversaţii după ce ştergeţi"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Ce este nou"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Potriviţi mesajele automat?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Micşoraţi dimensiunea mesajelor late pentru ca acestea să încapă pe ecran şi să le puteţi mări. Pentru a dezactiva această opţiune, accesaţi Setări &gt; Setări generale."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Răspundeți"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Răspundeți tuturor"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhivați"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"În lista de conversații"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Glisați în jos pentru actualizare"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Se verifică e-mailurile"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Goliți coșul de gunoi"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Ștergeți mesajele spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Deschideți panoul de navigare"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Închideți panoul de navigare"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e6355ed..e937284 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Показывать список цепочек после удаления текущей цепочки"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Что нового"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Масштабировать сообщения автоматически?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Окно просмотра писем меняется в соответствии с размером экрана. Чтобы отключить функцию, перейдите в раздел \"Общие настройки\"."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Ответить"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Ответить всем"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архивировать"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"В списке цепочек"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Пролистните вниз, чтобы обновить"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверка почты…"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Очистить корзину"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Удалить спам"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Открыть панель навигации"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Закрыть панель навигации"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0a3b2f3..9512d6d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Po odstránení zobraziť zoznam konverzácií"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Novinky"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Automaticky prispôsobiť správy?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Zmenšite široké správy, aby sa vošli na obrazovku, a umožnite približovanie. Ak chcete povoliť túto možnosť, prejdite na možnosť Nastavenia &gt; Všeobecné nastavenia."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odpovedať"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odpovedať všetkým"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivovať"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"V zozname konverzácií"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Potiahnutím nadol obnovte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Vyprázdniť kôš"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Vyprázdniť priečinok s nevyžiadanou poštou"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Otvoriť priečinok s navigáciou"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zavrieť priečinok s navigáciou"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2ee97e0..69f2c9a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Po izbrisu pokaži seznam pogovorov"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Kaj je novega?"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Želite samodejno prilagoditi velikost sporočil?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Skrčite dolga sporočila, da se prilegajo zaslonu, in dovolite povečavo. To možnost lahko izklopite v Nastavitve &gt; Splošne nastavitve."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odgovori"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odgovori vsem"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhiviraj"</string>
@@ -398,8 +396,14 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na seznamu pogovorov"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Za osvežitev povlecite navzdol"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Preverjanje pošte"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Izprazni smetnjak"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Izprazni mapo z vsiljeno pošto"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Izprazni smetnjak"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Izprazni mapo z vsiljeno pošto"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Želite izprazniti smetnjak?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Želite izprazniti mapo z vsiljeno pošto?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"Št. sporočil, ki bodo trajno izbrisana: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="other" msgid="2473439906075355840">"Št. sporočil, ki bodo trajno izbrisana: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Odpri predal za navigacijo"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zapri predal za navigacijo"</string>
 </resources>
diff --git a/res/values-sr-sw600dp/strings.xml b/res/values-sr-sw600dp/strings.xml
index f15015f..a3e07dd 100644
--- a/res/values-sr-sw600dp/strings.xml
+++ b/res/values-sr-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Управљај директоријумима"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Коришћење опције као подразумеване за одговоре на обавештења о порук."</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e3a5c80..4340dea 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Промени директоријуме"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Премести у"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Подешавања директоријума"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Пониш. аутом. одређ. вел."</string>
     <string name="message_modified" msgid="2564340197585393687">"(Оригинална верзија ове поруке је измењена да би се уклопила на овај екран.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Директоријуми"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Још"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Порука није послата."</string>
     <string name="me" msgid="6480762904022198669">"мени"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Прикажи све директоријуме"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Примљене"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Желите ли да избришете ову преписку?"</item>
     <item quantity="other" msgid="930334208937121234">"Желите ли да избришете ове преписке (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Приказ листе преписки након брисања"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Шта је ново"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Желите ли да аутоматски уклопите поруке?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Смањите широке поруке да би се уклопиле у екран и омогућите увећавање. Да бисте искључили ову опцију, идите на Подешавања &gt; Општа подешавања."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Одговори"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Одговори свима"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архивирај"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Нечујно"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Радња уклањања"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Архивирај преписке"</item>
+    <item msgid="1894624633891654411">"Избриши преписке"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Архивирање уместо брисања преписки"</item>
+    <item msgid="6515786566522105643">"Брисање уместо архивирања преписки"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Радња уклањања"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Одговори свима"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Коришћење ове опције као подразумеване за одговоре на поруке"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Превуците да бисте уклонили"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"На листи преписки"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Листајте надоле да бисте освежили"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверавање поште"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Пражњење директоријума за отпад"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Пражњење директоријума са непожељним порукама"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Отвори фиоку за навигацију"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Затвори фиоку за навигацију"</string>
 </resources>
diff --git a/res/values-sv-sw600dp/strings.xml b/res/values-sv-sw600dp/strings.xml
index ded8271..cb8e6fc 100644
--- a/res/values-sv-sw600dp/strings.xml
+++ b/res/values-sv-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+kopia/heml kop"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Hemlig kopia"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Hantera mappar"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Använd som standard för svar på meddelanden"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 17398a3..4c8be07 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Byt mapp"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Flytta till"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Mappinställningar"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Visa ursprunglig version"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Det här meddelandet har ändrats jämfört med originalversionen så att det passar skärmen.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mappar"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Fler"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"E-post skickades ej."</string>
     <string name="me" msgid="6480762904022198669">"jag"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Visa alla mappar"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Inkorg"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vill du ta bort konversationen?"</item>
     <item quantity="other" msgid="930334208937121234">"Vill du ta bort de här <xliff:g id="COUNT">%1$d</xliff:g> konversationerna?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Visa konversationslistan efter borttagning"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Nyheter"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Vill du att meddelanden ska anpassas automatiskt?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Gör stora meddelanden mindre så att de får plats på skärmen och möjliggör inzoomning. Om du vill stänga av det här alternativet öppnar du Inställningar &gt; Allmänna inställningar."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Svara"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Svara alla"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkivera"</string>
@@ -384,22 +380,29 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tyst"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ta bort åtgärd"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arkivera konversationer"</item>
+    <item msgid="1894624633891654411">"Ta bort konversationer"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Ta bort i stället för att arkivera samtal"</item>
+    <item msgid="6515786566522105643">"Ta bort i stället för att arkivera samtal"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Ta bort åtgärd"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Svara alla"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Använd som standard för svar på meddelanden"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Ta bort genom att dra"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"I konversationslista"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Dra nedåt om du vill uppdatera"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Söker efter e-post"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Töm papperskorgen"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Töm skräppostmappen"</string>
+    <string name="empty_trash" msgid="652435297593538512">"Töm papperskorgen"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Töm spammappen"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Vill du tömma papperskorgen?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Vill du tömma spammappen?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="462609766565707217">"Det här meddelandet (<xliff:g id="COUNT">%1$d</xliff:g>) tas bort permanent"</item>
+    <item quantity="other" msgid="2473439906075355840">"Dessa <xliff:g id="COUNT">%1$d</xliff:g> meddelanden tas bort permanent."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Öppna navigeringsmenyn"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Stäng navigeringsmenyn"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 92ae0c3..a1be449 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -296,8 +296,8 @@
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Ili kuona mazungumzo, sawazisha folda hii."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sawazisha Folda"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <string name="actionbar_unread_messages" msgid="3805594795629836031">"Zisizosomwa<xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Zisizosomwa <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
+    <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> ambazo hazijasomwa"</string>
+    <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Zaidi ya <xliff:g id="COUNT">%1$d</xliff:g> ambazo hazijasomwa"</string>
     <string name="view_more_conversations" msgid="3151067626309674344">"Ona mazungumzo zaidi"</string>
     <string name="loading_conversation" msgid="489160038366067983">"Inapakia…"</string>
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Chagua akaunti"</string>
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Onyesha orodha ya mazungumzo baada ya kufuta"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Nini kipya"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Pimisha ujumbe kiotomatiki?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Kunja ujumbe mpana ili utoshee kwenye skrini yako na uruhusu ukuzaji karibu. Ili kuzima chaguo hili, nenda kwenye Mipangilio &gt; mipagilio ya Jumla."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Jibu"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Jibu wote"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Kumbukumbu"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Katika orodha ya mazungumzo"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Papasa kwa kasi kwenda chini ili kuonyesha upya"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Inaangalia barua pepe"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Safisha tupio"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Safisha barua taka"</string>
-    <string name="drawer_open" msgid="6074646853178471940">"Fungua menyu ya kichoraji"</string>
-    <string name="drawer_close" msgid="2764774620737876943">"Funga menyu ya kichoraji"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="drawer_open" msgid="6074646853178471940">"Fungua menyu"</string>
+    <string name="drawer_close" msgid="2764774620737876943">"Funga menyu"</string>
 </resources>
diff --git a/res/values-th-sw600dp/strings.xml b/res/values-th-sw600dp/strings.xml
index 471a3a4..82f6f27 100644
--- a/res/values-th-sw600dp/strings.xml
+++ b/res/values-th-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ สำเนา/สำเนาลับ"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ สำเนาลับ"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"จัดการโฟลเดอร์"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"ใช้เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความแจ้งเตือน"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8556d8b..0751342 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"เปลี่ยนโฟลเดอร์"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"ย้ายไปที่"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"การตั้งค่าโฟลเดอร์"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"เปลี่ยนกลับการปรับขนาด"</string>
     <string name="message_modified" msgid="2564340197585393687">"(ข้อความนี้ได้รับการแก้ไขจากเวอร์ชันต้นฉบับเพื่อให้พอดีกับหน้าจอนี้)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"โฟลเดอร์"</string>
     <string name="folder_list_more" msgid="537172187223133825">"เพิ่มเติม"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"ไม่ได้ส่งข้อความ"</string>
     <string name="me" msgid="6480762904022198669">"ฉัน"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"แสดงโฟลเดอร์ทั้งหมด"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"กล่องจดหมาย"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"ลบการสนทนานี้หรือไม่"</item>
     <item quantity="other" msgid="930334208937121234">"ลบการสนทนาทั้ง <xliff:g id="COUNT">%1$d</xliff:g> รายการนี้หรือไม่"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"แสดงรายการสนทนาหลังจากลบ"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"มีอะไรใหม่"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"ปรับข้อความให้พอดีโดยอัตโนมัติหรือไม่"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"หดข้อความที่ยาวให้พอดีกับหน้าจอของคุณและอนุญาตให้ขยายได้ หากต้องการปิดตัวเลือกนี้ ให้ไปที่การตั้งค่า &gt; การตั้งค่าทั่วไป"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"ตอบ"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"ตอบทั้งหมด"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"เก็บถาวร"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"เงียบ"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"ลบการทำงาน"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"เก็บการสนทนา"</item>
+    <item msgid="1894624633891654411">"ลบการสนทนา"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"เก็บถาวรการสนทนาแทนการลบ"</item>
+    <item msgid="6515786566522105643">"ลบการสนทนาแทนการเก็บถาวร"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"ลบการทำงาน"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"ตอบทั้งหมด"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"ใช้เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"กวาดนิ้วเพื่อนำออก"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"ในรายการการสนทนา"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"กวาดลงเพื่อรีเฟรช"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"กำลังตรวจดูจดหมาย"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"ลบทุกอย่างในถังขยะ"</string>
-    <string name="empty_spam" msgid="930744491746508050">"ลบทุกอย่างในสแปม"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"เปิดช่องการนำทาง"</string>
     <string name="drawer_close" msgid="2764774620737876943">"ปิดช่องการนำทาง"</string>
 </resources>
diff --git a/res/values-tl-sw600dp/strings.xml b/res/values-tl-sw600dp/strings.xml
index 2a95d52..046c36d 100644
--- a/res/values-tl-sw600dp/strings.xml
+++ b/res/values-tl-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Pamahalaan ang mga folder"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Gamitin bilang default para sa mga tugon sa notification ng mensahe"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1bd1e5c..cba94fb 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Baguhin ang mga folder"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Ilipat sa"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Mga setting ng folder"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"I-revert ang auto-sizing"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Binago ang mensaheng ito mula sa orihinal nitong bersyon upang magkasya sa screen na ito.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mga Folder"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Higit pa"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Di pinadala mensahe."</string>
     <string name="me" msgid="6480762904022198669">"ako"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Ipakita ang lahat ng folder"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Inbox"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Tanggalin ang pag-uusap na ito?"</item>
     <item quantity="other" msgid="930334208937121234">"Tanggalin ang <xliff:g id="COUNT">%1$d</xliff:g> (na) pag-uusap na ito?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Ipakita ang listahan ng pag-uusap pagkatapos mong magtanggal"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Ano\'ng bago"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"I-auto-fit ang mga mensahe?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Paliitin ang malalapad na mensahe upang magkasya sa iyong screen at payagan ang pag-zoom in. Upang i-off ang pagpipiliang ito, pumunta sa Mga Setting &gt; Mga pangkalahatang setting."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Tumugon"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Tumugon sa lahat"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"I-archive"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Naka-silent"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Alisin ang pagkilos"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Mag-archive ng mga pag-uusap"</item>
+    <item msgid="1894624633891654411">"Tanggalin ang mga pag-uusap"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"I-archive sa halip na tanggalin ang mga pag-uusap"</item>
+    <item msgid="6515786566522105643">"Tanggalin sa halip na i-archive ang mga pag-uusap"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Alisin ang pagkilos"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Tumugon sa lahat"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gamitin bilang default para sa mga tugon sa mensahe"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Mag-swipe upang alisin"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Sa listahan ng pag-uusap"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Mag-swipe pababa upang mag-refresh"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tumitingin ng mail"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Alisan ng laman ang basurahan"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Alisan ng laman ang spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Buksan ang drawer ng nabigasyon"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Isara ang drawer ng nabigasyon"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0117980..a481965 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Sildikten sonra ileti dizisi listesini göster"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Yenilikler"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"İletiler otomatik sığdırılsın mı?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Uzun iletileri ekranınıza sığdırmak için küçültün ve yakınlaştırmaya izin verin. Bu seçeneği kapatmak için Ayarlar &gt; Genel ayarlar seçeneğine gidin."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Yanıtla"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Tümünü yanıtla"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arşivle"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"İleti dizisi listesinde"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Yenilemek için aşağı hızlıca kaydırın"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Posta kontrol ediliyor"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Çöp kutusunu boşalt"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Spam klasörünü boşalt"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Gezinme menüsünü aç"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Gezinme menüsünü kapat"</string>
 </resources>
diff --git a/res/values-uk-sw600dp/strings.xml b/res/values-uk-sw600dp/strings.xml
index c80e798..2423ed8 100644
--- a/res/values-uk-sw600dp/strings.xml
+++ b/res/values-uk-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Копія/прихована"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Прихована копія"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Керувати папками"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Використ. за умовчанням для відповідей на сповіщення про повідомлення"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 92d4d9f..bfa9aa7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Змінити папки"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Перемістити в"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Налаштування папки"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Не змінювати розмір"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Вигляд цього повідомлення змінено відповідно до розміру екрана.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Інші"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Повідомл. не надісл."</string>
     <string name="me" msgid="6480762904022198669">"я"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Показати всі папки"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Вхідні"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Видалити цю бесіду?"</item>
     <item quantity="other" msgid="930334208937121234">"Видалити ці бесіди (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Показувати список бесід після видалення"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Новинки"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Змінювати розмір повідомлень автоматично?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Великі повідомлення змінюються відповідно до розміру екрана, а також їх можна наближати. Щоб вимкнути цей параметр, перейдіть у Налаштування &gt; Загальні налаштування."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Відповісти"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Відповісти всім"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архівувати"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Без звуку"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Вилучити дію"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Архівувати бесіди"</item>
+    <item msgid="1894624633891654411">"Видаляти бесіди"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Архівувати, а не видаляти бесіди"</item>
+    <item msgid="6515786566522105643">"Видаляти, а не архівувати бесіди"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Вилучити дію"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Відповісти всім"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Використовувати за умовчанням для відповідей на повідомлення"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Проведіть пальцем, щоб вилучити"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"У списку бесід"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Проведіть пальцем униз, щоб оновити"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Перевірка пошти"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Очистити кошик"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Очистити папку для спаму"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Висунути навігаційну панель"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Сховати навігаційну панель"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8f60c8a..a652909 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -365,8 +365,6 @@
     <item msgid="2189929276292165301">"Hiển thị danh sách cuộc hội thoại sau khi bạn xóa"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Tính năng mới"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Tự động chỉnh kích thước thư?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Co tin nhắn rộng cho vừa với màn hình và cho phép phóng to. Để tắt tùy chọn này, đi tới Cài đặt &gt; Cài đặt chung."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Trả lời"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Trả lời tất cả"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Lưu trữ"</string>
@@ -398,8 +396,16 @@
     <string name="preference_swipe_description" msgid="5132683510510041028">"Trong danh sách cuộc hội thoại"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Vuốt xuống để làm mới"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Đang kiểm tra thư"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Làm rỗng thùng rác"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Làm rỗng Spam"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Mở ngăn kéo điều hướng"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Đóng ngăn kéo điều hướng"</string>
 </resources>
diff --git a/res/values-zh-rCN-sw600dp/strings.xml b/res/values-zh-rCN-sw600dp/strings.xml
index e78dbb7..5abe33e 100644
--- a/res/values-zh-rCN-sw600dp/strings.xml
+++ b/res/values-zh-rCN-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ 抄送/密送"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ 密送"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"管理文件夹"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"用作默认的邮件通知回复方式"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index eb30bb3..a444938 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"更改文件夹"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"移至"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"文件夹设置"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"撤消自动重设大小"</string>
     <string name="message_modified" msgid="2564340197585393687">"（系统对此邮件进行了调整，使其适合此屏幕的大小。）"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"文件夹"</string>
     <string name="folder_list_more" msgid="537172187223133825">"更多"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"邮件发送失败。"</string>
     <string name="me" msgid="6480762904022198669">"我"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"显示所有文件夹"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"收件箱"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"要删除此会话吗？"</item>
     <item quantity="other" msgid="930334208937121234">"要删除这 <xliff:g id="COUNT">%1$d</xliff:g> 个会话吗？"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"在您执行删除操作后显示会话列表"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"新功能"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"是否自动调整邮件内容缩放比例？"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"缩小过宽的邮件内容，使其适应屏幕大小。您还可以自行放大邮件内容以使其更易阅读。要关闭此选项，请转到“设置”&gt;“常规设置”。"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"回复"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"全部回复"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"归档"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"静音"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"删除操作"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"归档会话"</item>
+    <item msgid="1894624633891654411">"删除会话"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"归档会话（而不是删除）"</item>
+    <item msgid="6515786566522105643">"删除会话（而不是归档）"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"删除操作"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"全部回复"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"用作默认的邮件回复方式"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"滑动即可删除"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"在会话列表中"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下拉即可刷新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在检查邮件"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"清空已删除邮件"</string>
-    <string name="empty_spam" msgid="930744491746508050">"清空垃圾邮件"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"打开抽屉式导航栏"</string>
     <string name="drawer_close" msgid="2764774620737876943">"关闭抽屉式导航栏"</string>
 </resources>
diff --git a/res/values-zh-rTW-sw600dp/strings.xml b/res/values-zh-rTW-sw600dp/strings.xml
index 402b6c8..03786dc 100644
--- a/res/values-zh-rTW-sw600dp/strings.xml
+++ b/res/values-zh-rTW-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"新增副本/密件副本"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"新增密件副本"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"管理資料夾"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"設為預設的訊息通知回覆方式"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 310942d..7eacb5d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"變更資料夾"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"移至"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"資料夾設定"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"取消自動調整大小"</string>
     <string name="message_modified" msgid="2564340197585393687">"(這封郵件的原始版本已經過修改，調整為符合這個畫面的版本。)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"資料夾"</string>
     <string name="folder_list_more" msgid="537172187223133825">"更多"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"郵件未傳送。"</string>
     <string name="me" msgid="6480762904022198669">"我"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"顯示所有資料夾"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"收件匣"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"刪除這個會話群組？"</item>
     <item quantity="other" msgid="930334208937121234">"刪除這 <xliff:g id="COUNT">%1$d</xliff:g> 個會話群組？"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"在刪除動作完成後顯示會話群組清單"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"新功能"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"自動調整郵件？"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"根據螢幕大小縮小寬版郵件，並可讓您放大畫面。如要關閉這個選項，請前往 [設定] &gt; [一般設定]。"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"回覆"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"回覆所有人"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"封存"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"靜音"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"移除動作"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"封存會話群組"</item>
+    <item msgid="1894624633891654411">"刪除會話群組"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"封存會話群組，而不要進行刪除"</item>
+    <item msgid="6515786566522105643">"刪除會話群組，而不要進行封存"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"移除動作"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"回覆所有人"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"設為預設回信方式"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"滑動即可移除"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"在會話群組清單中"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"向下滑動即可重新整理"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在檢查郵件"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"清空垃圾筒"</string>
-    <string name="empty_spam" msgid="930744491746508050">"清空垃圾郵件"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"開啟導覽匣"</string>
     <string name="drawer_close" msgid="2764774620737876943">"關閉導覽匣"</string>
 </resources>
diff --git a/res/values-zu-sw600dp/strings.xml b/res/values-zu-sw600dp/strings.xml
index 9c6eb1a..a286a59 100644
--- a/res/values-zu-sw600dp/strings.xml
+++ b/res/values-zu-sw600dp/strings.xml
@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Phatha amafolda"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Sebenzisa njengokuzenzakalelayo kuzimpendulo zezaziso zomlayezo"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1a90b7a..ae3877c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Shintsha amafolda"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Hambisa ku-"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Izilungiselelo zefolda"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Buyela kusayizi ozenzakalelayo"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Lo mlayezo ulungisiwe kusukela kunguqulo wayo wangempela ukuze ulingane nalesi sikrini)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Amafolda"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Okuningi"</string>
@@ -172,8 +171,7 @@
     <string name="send_failed" msgid="750908595144529579">"Umlayezo awuthunyelwanga."</string>
     <string name="me" msgid="6480762904022198669">"mina"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Bonisa onke amafolda"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Ibhokisi lokungenayo"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Susa le ngxoxo?"</item>
     <item quantity="other" msgid="930334208937121234">"Susa lezi zingxoxo ezingu-<xliff:g id="COUNT">%1$d</xliff:g>?"</item>
@@ -365,8 +363,6 @@
     <item msgid="2189929276292165301">"Bonisa uhlu lwengxoxo ngemuva kokususa"</item>
   </string-array>
     <string name="whats_new_dialog_title" msgid="4230806739326698666">"Yini entsha"</string>
-    <string name="auto_fit_messages_dialog_title" msgid="2759387078807832659">"Linganisa ngokuzenzakalela imilayezo?"</string>
-    <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Shwabanisa imilayezo ebanzi ukuze ilingane isikrini sakho futhi ivumele ukusondezwa kwesithombe. Ukuze uvale lokhu kukhetha hamba kuzilungiselelo &gt; izilungiselelo ezijwayelekile."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Phendula"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Phendula konke"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Faka kungobo yomlando"</string>
@@ -384,22 +380,31 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Thulile"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Susa isenzo"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Faka kungobo yomlando izingxoxo"</item>
+    <item msgid="1894624633891654411">"Susa izingxoxo"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Faka kungobo yomlando kunokuthi ususe izingxoxo"</item>
+    <item msgid="6515786566522105643">"Susa kunokuthi ufake kungobo yomlando izingxoxo"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Susa isenzo"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Phendula konke"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Sebenzisa njengokuzenzakalelayo kuzimpendulo zomlayezo"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Swayipha ukuze ususe"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Ohlwini lengxoxo"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swayiphela phansi ukuze uqale kabusha"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ihlolela imeyili"</string>
-    <string name="empty_trash" msgid="5042310780353359729">"Udoti ongenalutho"</string>
-    <string name="empty_spam" msgid="930744491746508050">"Ugaxekile ongenalutho"</string>
+    <!-- no translation found for empty_trash (652435297593538512) -->
+    <skip />
+    <!-- no translation found for empty_spam (6064497180615519589) -->
+    <skip />
+    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
+    <skip />
+    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
+    <skip />
+    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
     <string name="drawer_open" msgid="6074646853178471940">"Vula ukuzulazula kwekhabethe"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Vala ukuzulazula kwekhabethe"</string>
 </resources>