Import translations. DO NOT MERGE

Change-Id: Ie101da20102ec253afaf386044e2e6bf2d81c2bc
Auto-generated-cl: translation import

56 files changed, 1755 insertions, 190 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5e08ad141..b0e775070 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle vouers"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Onlangse vouers"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Boodskapbesonderhede"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Outovoortgaan"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Kies watter skerm moet wys nadat jy \'n boodskap uitvee"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Stel outovoortgang-voorkeure\n(nadat jy uitvee, ens.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Jonger"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Wys ouer gesprek nadat jy uitvee"</item>
     <item msgid="2189929276292165301">"Wys gespreklys nadat jy uitvee"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Vee prentgoedkeurings uit"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vee prentgoedkeurings uit?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Hou op om inlynprente vanaf afsenders wat jy voorheen toegelaat het, te wys."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskappe"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"Argiveer- en uitvee-handelinge"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, laat ek na jou terugkom"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 901c2ba57..0d115fe92 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"ሁሉም አቃፊዎች"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"የቅርብ ጊዜ አቃፊዎች"</string>
     <string name="message_details_title" msgid="2183394728494962332">"የመልዕክት ዝርዝሮች"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"ራስ-አልቅ"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"አንድ መልዕክት ከሰረዙ በኋላ የትኛው ማያ ገጽ እንዲታይ እንደሚፈልጉ ይምረጡ።"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"ራስ-ቀጥል"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"የራስ-አልቅ ምርጫዎችን ያዋቅሩ\n(ከሰረዙ በኋላ፣ ወዘተ.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"ይበልጥ አዲስ"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"ከሰረዙ በኋላ ይበልጥ የቆዩ ውይይትን ያሳዩ"</item>
     <item msgid="2189929276292165301">"ከሰረዙ በኋላ የውይይት ዝርዝርን ያሳዩ"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"ይቀጥሉ ወደ"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"የስዕል ጽድቆችን አጽዳ"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"የስዕል ጽድቆች ይጽዱ?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"ከዚህ ቀደም ከፈቀዱላቸው ላኪዎች የሚመጡ የውስጠ-መስመር ምስሎችን ማሳየት ይቁም።"</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክቶች"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክት"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክቶች"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"በማህደር የማስቀመጥ እና የመሰረዝ እርምጃዎች"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"እሺ፣ በኋላ ወደ እርስዎ ልመለስ"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"የእርምጃ ማረጋገጫዎች"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"ከመሰረዝዎ በፊት ያረጋግጡ"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"ከምዝገባ በፊት ያረጋግጡ"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"ከመላክዎ በፊት ያረጋግጡ"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"መልዕክቶችን በራስ-አመጣጥን"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"መልዕክቶች ከማያ ገጹ ጋር እንዲመጣጠኑ ያሳንሷቸው"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"የመልዕክት እርምጃዎች"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"ሁልጊዜ የመልዕክት ድርጊቶችን ከማያ በላይ አሳይ"</item>
+    <item msgid="1197074110597228768">"በቁመት ስታሽከረክር ከማያው ላይ የመልዕክት እርምጃዎችን ብቻ አሳይ።"</item>
+    <item msgid="8496844279095098067">"የመልዕክት እርምጃዎችን ከመልዕክት ራስጌ ውጪ አታሳይ"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"ሁልጊዜ አሳይ"</item>
+    <item msgid="8546075502478857367">"በቁምሁነታ ብቻ አሳይ"</item>
+    <item msgid="863690009910739926">"አታሳይ"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"የፍለጋ ታሪክ አጽዳ"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"የፍለጋ ታሪክ ተጸድቷል።"</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"የፍለጋ ታሪክ ይጽዳ?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"ከዚህ ቀደም ያከናወኗቸው ፍለጋዎች ሁሉ ይወገዳሉ።"</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"መለያዎችን ያቀናብሩ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 622a4921f..26116fc32 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"جميع المجلدات"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"المجلدات الحديثة"</string>
     <string name="message_details_title" msgid="2183394728494962332">"تفاصيل الرسالة"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"التقدم التلقائي"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"اختيار الشاشة التي تظهر بعد حذف رسالة"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"التقدم التلقائي"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"تعيين تفضيل التقدم التلقائي\n(بعد الحذف وما إلى ذلك)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"أحدث"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"عرض المحادثة الأقدم بعد الحذف"</item>
     <item msgid="2189929276292165301">"عرض قائمة المحادثات بعد الحذف"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"التقدّم إلى"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"محو الموافقات على الصور"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"هل تريد محو الموافقات على الصور؟"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"إيقاف عرض الصور المضمنة من المرسلين الذين سبق أن سمحت لهم."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> من الرسائل الجديدة"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"رسالة جديدة (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
+    <item quantity="other" msgid="6295442146249725952">"عدد الرسائل الجديدة: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"إجراءات الأرشيف والحذف"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"حسنًا، سأعود إليك"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"تأكيدات الإجراءات"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"التأكيد قبل الحذف"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"التأكيد قبل الوضع في الأرشيف"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"التأكيد قبل الإرسال"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"الضبط التلقائي للرسائل"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"تقليص الرسائل لتناسب الشاشة"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"إجراءات الرسائل"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"عرض إجراءات الرسائل أعلى الشاشة دومًا"</item>
+    <item msgid="1197074110597228768">"عرض إجراءات الرسائل أعلى الشاشة عند التدوير إلى الوضع العمودي فقط"</item>
+    <item msgid="8496844279095098067">"عدم عرض إجراءات الرسائل خارج رأس الرسالة"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"إظهار بشكل دائم"</item>
+    <item msgid="8546075502478857367">"عرض في الوضع عمودي فقط"</item>
+    <item msgid="863690009910739926">"عدم العرض"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"محو سجلّ البحث"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"تم محو سجل البحث."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"هل تريد محو سجل البحث؟"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"ستتم إزالة جميع عمليات البحث التي سبق أن أجريتها."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"إدارة الحسابات"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3bd65e7ab..90d92b8db 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Всички папки"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Скорошни папки"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Подробности за съобщението"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Автоматично преминаване"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Изберете екран, който да се показва след изтриване на съобщение"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Автоматично преминаване"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Задаване на предпочитание за авт. напредък\n(след изтриване и др.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"По-нова"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Показване на по-старата кореспонденция след изтриване"</item>
     <item msgid="2189929276292165301">"Показване на списъка с кореспонденции след изтриване"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Напред до"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Изчистване на одобренията за снимки"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Да се изчистят ли одобренията за снимки?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Спиране на показването на вградени изображения от по-рано разрешени от вас податели."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> нови съобщения"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> ново съобщение"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> нови съобщения"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Действия за архивиране и изтриване"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, ще се свържа с теб"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Потвърждения на действията"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Потвърждаване преди изтриване"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Потвърждаване преди архивиране"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Потвърждаване преди изпращане"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Автом. побиране на съобщенията"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Свиване на съобщенията, за да се поберат на екрана"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Действия със съобщението"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Действията със съобщението да се показват винаги в горната част на екрана"</item>
+    <item msgid="1197074110597228768">"Действията със съобщението да се показват в горната част на екрана само при завъртане във вертикална ориентация"</item>
+    <item msgid="8496844279095098067">"Действията със съобщението да не се показват извън заглавката му"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Винаги да се показва"</item>
+    <item msgid="8546075502478857367">"Да се показва само във вертикална ориентация"</item>
+    <item msgid="863690009910739926">"Да не се показва"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Изчистване на историята на търсенията"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Историята на търсенията е изчистена."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Да се изчисти ли историята на търсенията?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Всички извършени по-рано от вас търсения ще бъдат премахнати."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Управление на профилите"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d47a0c097..5b5f21dfd 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Totes les carpetes"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetes recents"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Detalls del missatge"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Avançament automàtic"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Selecciona la pantalla que es mostrarà en suprimir un missatge"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Avança automàticament"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Avançament automàtic\n(després de suprimir, etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Més recent"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Mostra una conversa més antiga després de suprimir"</item>
     <item msgid="2189929276292165301">"Mostra la llista de converses després de suprimir"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Avançament a"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Esborra les aprovacions d\'imatges"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vols esborrar les aprovacions d\'imatges?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Ja no es mostraran imatges de remitents que s\'hagin permès anteriorment."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> missatges nous"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> missatge nou"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> missatges nous"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Accions d\'arxivament i de supressió"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"D\'acord, ja contactaré amb tu."</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Confirmacions d\'accions"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Confirma abans de suprimir"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Confirma abans d\'arxivar"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Confirma abans d\'enviar"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Ajustament de missatges"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Adapta els missatges a la mida de la pantalla"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Accions de missatges"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Mostra sempre les accions de missatges a la part superior de la pantalla"</item>
+    <item msgid="1197074110597228768">"Mostra només accions de missatges a la part superior de la pantalla en mode vertical"</item>
+    <item msgid="8496844279095098067">"No mostris accions de missatges fora de la capçalera del missatge"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Mostra sempre"</item>
+    <item msgid="8546075502478857367">"Mostra només en vertical"</item>
+    <item msgid="863690009910739926">"No mostris"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Esborra l\'historial de cerca"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"S\'ha buidat l\'historial de cerca."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Vols esborrar l\'historial de cerca?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Se suprimiran totes les cerques que hagis fet."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Gestiona els comptes"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6c6b4fb71..d385112bc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Všechny složky"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Poslední složky"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Podrobnosti zprávy"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automatický přechod"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Vyberte, kterou obrazovku chcete zobrazit po smazání zprávy."</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Automatický přechod"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Nastavit volbu automatického přechodu\n(po archivaci, smazání atd.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Novější"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Po smazání zobrazit starší konverzaci"</item>
     <item msgid="2189929276292165301">"Po smazání zobrazit seznam konverzací"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Pokračovat do"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Zrušit schválení obrázků"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Zrušit schválení obrázků?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Přestat zobrazovat vložené obrázky od odesílatelů, u kterých jste to dříve povolili."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Nové zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> nová zpráva"</item>
+    <item quantity="other" msgid="6295442146249725952">"Nové zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <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">"Tichý režim"</string>
     <string name="preference_removal_action_title" msgid="6585232628422090835">"Akce archivace a smazání"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, ozvu se později."</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Potvrzení akce"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Před smazáním potvrdit"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Před archivací potvrdit"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Před odesláním potvrdit"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Automaticky přizpůsobit zprávy"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Zprávy se zmenší, a přizpůsobí se tak velikosti obrazovky"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Akce zpráv"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Vždy zobrazovat akce zpráv v horní části obrazovky"</item>
+    <item msgid="1197074110597228768">"Zobrazovat akce zpráv v horní části obrazovky jen v případě, kdy je natočena na výšku"</item>
+    <item msgid="8496844279095098067">"Nezobrazovat akce zpráv mimo záhlaví zprávy"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Vždy zobrazovat"</item>
+    <item msgid="8546075502478857367">"Zobrazit pouze v režimu na výšku"</item>
+    <item msgid="863690009910739926">"Nezobrazovat"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Vymazat historii vyhledávání"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Historie vyhledávání vymazána."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Vymazat historii vyhledávání?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Všechna vyhledávání, která jste provedli, budou odstraněna."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Spravovat účty"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d0a47a876..c1497b2cc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle mapper"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Seneste mapper"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Meddelelsesinfo"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Efterfølgende skærm"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Vælg, hvilken skærm der skal vises, når du har slettet en meddelelse"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Efterfølgende skærm"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Angiv efterfølgende skærm\n(efter sletning osv.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Nyere"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Vis ældre samtale efter sletning"</item>
     <item msgid="2189929276292165301">"Vis samtalelisten efter sletning"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Gå frem til"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Ryd billedtilladelser"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vil du rydde billedtilladelserne?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Stop visning af indlejrede billeder i tekst fra afsendere, du tidligere har tilladt."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nye meddelelser"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> ny meddelelse"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> nye meddelelser"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Handlinger for arkivering og sletning"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, jeg vender tilbage til dig"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Bekræftelse af handlinger"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Bekræft før sletning"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Bekræft før arkivering"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Bekræft før afsendelse"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Tilpas meddelelser automatisk"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Formindsk meddelelser, så de passer til skærmen"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Beskedhandlinger"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Vis altid beskedhandlinger øverst på skærmen"</item>
+    <item msgid="1197074110597228768">"Vis kun beskedhandlinger øverst på skærmen i portrættilstand"</item>
+    <item msgid="8496844279095098067">"Vis ikke beskedhandlinger uden for meddelelsens sidehoved"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Vis altid"</item>
+    <item msgid="8546075502478857367">"Vis kun i portræt"</item>
+    <item msgid="863690009910739926">"Vis ikke"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Ryd søgehistorikken"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Søgehistorikken er ryddet."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Vil du rydde søgehistorikken?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Alle de søgninger, som du har udført, fjernes."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Administrer konti"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ed1a7dde3..5a47375e8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle Ordner"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Letzte Ordner"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Nachrichtendetails"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automatisch fortfahren"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Was soll nach dem Löschen einer Nachricht angezeigt werden?"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Automatisch fortfahren"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"\"Automatisch fortfahren\" einrichten\n(nach dem Löschen usw.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Neuer"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Nach dem Löschen ältere Konversation anzeigen"</item>
     <item msgid="2189929276292165301">"Nach dem Löschen Konversationsliste anzeigen"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Weiter zu"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Bildgenehmigungen löschen"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Bildgenehmigungen löschen?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Keine Inline-Bilder mehr von zuvor zugelassenen Absendern anzeigen"</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachrichten"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachricht"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachrichten"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Aktionen \"Archivieren\" und \"Löschen\""</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, ich werde mich melden."</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Aktionsbestätigungen"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Vor dem Löschen bestätigen"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Vor dem Archivieren bestätigen"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Vor dem Senden bestätigen"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Nachrichten autom. anpassen"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Nachrichten für die Anzeige auf dem Bildschirm verkleinern"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"E-Mail-Aktionen"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"E-Mail-Aktionen immer oben auf dem Bildschirm anzeigen"</item>
+    <item msgid="1197074110597228768">"E-Mail-Aktionen nur im Hochformat oben auf dem Bildschirm anzeigen"</item>
+    <item msgid="8496844279095098067">"E-Mail-Aktionen nicht außerhalb der Kopfzeile anzeigen"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Immer anzeigen"</item>
+    <item msgid="8546075502478857367">"Nur im Hochformat anzeigen"</item>
+    <item msgid="863690009910739926">"Nicht anzeigen"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Suchverlauf löschen"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Suchverlauf gelöscht"</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Suchverlauf löschen?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Alle Ihre bisherigen Suchanfragen werden entfernt."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Konten verwalten"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 54fedf446..921c4022a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Όλοι οι φάκελοι"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Πρόσφατοι φάκελοι"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Λεπτομέρειες μηνύματος"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Αυτόματη συνέχιση"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Επιλογή οθόνης που εμφανίζεται μετά τη διαγραφή ενός μηνύματος"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Αυτόματη προώθηση"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Ορισμός προτίμησης αυτόματης προώθησης\n(μετά τη διαγραφή, κ.λπ.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Νεότερες"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Εμφάνιση παλαιότερης συνομιλίας μετά τη διαγραφή"</item>
     <item msgid="2189929276292165301">"Εμφάνιση λίστας συνομιλιών μετά τη διαγραφή"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Συνέχιση σε"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Διαγραφή εγκρίσεων εικόνας"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Να διαγραφούν οι εγκρίσεις εικόνας;"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Διακόψτε την εμφάνιση ενσωματωμένων εικόνων από αποστολείς που έχετε προηγουμένως επιτρέψει."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> νέα μηνύματα"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> νέο μήνυμα"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> νέα μηνύματα"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Ενέργειες αρχειοθέτησης και διαγραφής"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, θα επικοινωνήσω μαζί σας"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Επιβεβαιώσεις ενεργειών"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Επιβεβαίωση πριν από τη διαγραφή"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Επιβεβαίωση πριν από την αρχειοθέτηση"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Επιβεβαίωση πριν από την αποστολή"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Αυτόματη προσαρμογή μηνυμάτων"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Συρρίκνωση μηνυμάτων έτσι ώστε να προσαρμόζονται στην οθόνη"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Ενέργειες μηνύματος"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Οι ενέργειες του μηνύματος εμφανίζονται πάντα στην κορυφή της οθόνης"</item>
+    <item msgid="1197074110597228768">"Να εμφανίζονται μόνο ενέργειες μηνύματος στην κορυφή της οθόνης όταν ο προσανατολισμός είναι κατακόρυφος"</item>
+    <item msgid="8496844279095098067">"Να μην εμφανίζονται ενέργειες μηνύματος εκτός της κεφαλίδας μηνύματος"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Να εμφανίζεται πάντα"</item>
+    <item msgid="8546075502478857367">"Μόνο στην κατακόρυφη προβολή"</item>
+    <item msgid="863690009910739926">"Να μην εμφανίζονται"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Διαγραφή ιστορικού αναζήτησης"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Έγινε εκκαθάριση ιστορικού αναζήτησης."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Να διαγραφεί το ιστορικό αναζήτησης;"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Θα καταργηθούν όλες οι αναζητήσεις που έχετε πραγματοποιήσει."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Διαχείριση λογαριασμών"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5bb901f4a..223b27508 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"All folders"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Recent folders"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Message details"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Auto-advance"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Choose which screen to show after you delete a message"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Auto-advance"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Set auto-advance preference\n(after you delete, etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Newer"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Show older conversation after you delete"</item>
     <item msgid="2189929276292165301">"Show conversation list after you delete"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Advance to"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Clear picture approvals"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Clear picture approvals?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Stop displaying inline images from senders that you previously allowed."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> new message"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Archive &amp; delete actions"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, let me get back to you"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Action Confirmations"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Confirm before deleting"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Confirm before archiving"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Confirm before sending"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Auto-fit messages"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Shrink messages to fit the screen"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Message actions"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Always show message actions at the top of the screen"</item>
+    <item msgid="1197074110597228768">"Only show message actions at the top of the screen when rotated to portrait"</item>
+    <item msgid="8496844279095098067">"Don\'t show message actions outside the message header"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Always show"</item>
+    <item msgid="8546075502478857367">"Only show in portrait"</item>
+    <item msgid="863690009910739926">"Don\'t show"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Clear search history"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Search history cleared."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Clear search history?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"All the searches that you\'ve previously performed will be removed."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Manage Accounts"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 5bb901f4a..223b27508 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"All folders"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Recent folders"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Message details"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Auto-advance"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Choose which screen to show after you delete a message"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Auto-advance"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Set auto-advance preference\n(after you delete, etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Newer"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Show older conversation after you delete"</item>
     <item msgid="2189929276292165301">"Show conversation list after you delete"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Advance to"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Clear picture approvals"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Clear picture approvals?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Stop displaying inline images from senders that you previously allowed."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> new message"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Archive &amp; delete actions"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, let me get back to you"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Action Confirmations"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Confirm before deleting"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Confirm before archiving"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Confirm before sending"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Auto-fit messages"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Shrink messages to fit the screen"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Message actions"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Always show message actions at the top of the screen"</item>
+    <item msgid="1197074110597228768">"Only show message actions at the top of the screen when rotated to portrait"</item>
+    <item msgid="8496844279095098067">"Don\'t show message actions outside the message header"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Always show"</item>
+    <item msgid="8546075502478857367">"Only show in portrait"</item>
+    <item msgid="863690009910739926">"Don\'t show"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Clear search history"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Search history cleared."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Clear search history?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"All the searches that you\'ve previously performed will be removed."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Manage Accounts"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ca967a374..0a42fae8f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Todas las carpetas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetas recientes"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Detalles del mensaje"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Avance automático"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Elegir la pantalla que deseas ver luego de eliminar un mensaje"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Preferencia de avance automático\n(luego de eliminar, etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Más reciente"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Mostrar la conversación más antigua luego de la eliminación"</item>
     <item msgid="2189929276292165301">"Mostrar la lista de conversaciones luego de la eliminación"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Borrar aprobaciones de imágenes"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"¿Borrar aprobaciones de imágenes?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Dejar de mostrar imágenes intercaladas de remitentes que permitiste anteriormente"</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"Acciones de archivar y eliminar"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"De acuerdo, luego te llamo."</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d09776908..ad283f281 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Todas las carpetas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Carpetas recientes"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Detalles del mensaje"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Avance automático"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Seleccionar la pantalla que se mostrará después de eliminar un mensaje"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Avance automático"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Avance automático\n(después de eliminar, etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Más reciente"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Mostrar conversación más antigua después de eliminar"</item>
     <item msgid="2189929276292165301">"Mostrar lista de conversaciones después de eliminar"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Ir a"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Borrar aprobaciones de imágenes"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"¿Borrar aprobaciones de imágenes?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Ya no se mostrarán imágenes de remitentes que se hayan permitido anteriormente."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje nuevo"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Archivar y eliminar"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Vale, te llamo luego"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Confirmaciones de acciones"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Confirmar antes de eliminar"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Confirmar antes de archivar"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Confirmar antes de enviar"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Ajuste mensajes automático"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Adaptar mensajes al tamaño de la pantalla"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Acciones de mensajes"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Mostrar siempre acciones de mensajes en la parte superior de la pantalla"</item>
+    <item msgid="1197074110597228768">"Mostrar solo acciones de mensajes en la parte superior de la pantalla en modo vertical"</item>
+    <item msgid="8496844279095098067">"No mostrar acciones de mensajes fuera del encabezado del mensaje"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Mostrar siempre"</item>
+    <item msgid="8546075502478857367">"Mostrar solo en modo vertical"</item>
+    <item msgid="863690009910739926">"No mostrar"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Borrar historial de búsqueda"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Se ha borrado el historial de búsqueda."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"¿Borrar historial de búsqueda?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Se eliminarán todas las búsquedas que hayas hecho."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Administrar cuentas"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 6c4af9911..aacd621b1 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Kõik kaustad"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Hiljutised kaustad"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Sõnumi üksikasjad"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automaatne edasiminek"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Valige, millist ekraani pärast sõnumi kustutamist kuvada"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Automaatne edenemine"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Automaatse edasimineku eelistuse määramine\n(pärast kustutamist jne)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Uuemad"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Vanema vestluse näitamine pärast kustutamist"</item>
     <item msgid="2189929276292165301">"Vestlusloendi näitamine pärast kustutamist"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Edenemine"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Pildilubade kustutamine"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Kas kustutada pildiload?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Varasemalt lubatud saatjate tekstisiseste piltide kuvamise peatamine."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> uut sõnumit"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> uus sõnum"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> uut sõnumit"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Arhiveerimise ja kustutamise toimingud"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, vastan sulle peagi"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Toimingute kinnitused"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Kinnitamine enne kustutamist"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Kinnitamine enne arhiivimist"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Kinnitamine enne saatmist"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Sõnumite automaatne sobitamine"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Kahandage sõnumeid, et need mahuksid ekraanile"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Sõnumitoimingud"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Kuva alati sõnumitoimingud ekraani ülaosas"</item>
+    <item msgid="1197074110597228768">"Kuva vertikaalpaigutuse korral ekraani ülaosas ainult sõnumitoimingud"</item>
+    <item msgid="8496844279095098067">"Ära kuva sõnumitoiminguid väljaspool sõnumi päist"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Kuva alati"</item>
+    <item msgid="8546075502478857367">"Kuva ainult vertikaalpaigutuses"</item>
+    <item msgid="863690009910739926">"Ära kuva"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Otsinguajaloo kustutamine"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Otsinguajalugu on kustutatud."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Kas tühjendada otsinguajalugu?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Kõik eelnevad otsingud eemaldatakse."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Kontode haldamine"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 9c963076b..39e071592 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"همه پوشه‌ها"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"پوشه‌های اخیر"</string>
     <string name="message_details_title" msgid="2183394728494962332">"جزئیات پیام"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"پیشرفت خودکار"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"انتخاب کنید بعد از حذف یک پیام، چه صفحه‌ای نشان داده شود"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"پیشرفت خودکار"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"تنظیم اولویت پیشروی خودکار\n(بعد از اینکه موردی را حذف کردید)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"جدیدتر"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"بعد از حذف مکالمه قدیمی‌تر را نشان می‌دهد"</item>
     <item msgid="2189929276292165301">"بعد از حذف فهرست مکالمات را نشان می‌دهد"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"پیشرفت به"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"پاک کردن تأییدیه‌های مربوط به عکس"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"تأییدیه‌های مربوط به عکس پاک شود؟"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"توقف نمایش تصاویر درون برنامه‌ای از فرستندگانی که قبلاً اجازه داده‌ بودید."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"عملکردهای بایگانی و حذف"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"بسیار خوب، در تماس خواهم بود"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"تأییدهای عملکرد"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"تأیید قبل از حذف"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"تأیید قبل از بایگانی"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"تأیید قبل از ارسال"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"تنظیم خودکار اندازه پیام‌ها"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"پیام‌ها متناسب با صفحه کوچک شوند"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"عملکردهای پیام"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"عملکردهای پیام همیشه در بالای صفحه نشان داده شود"</item>
+    <item msgid="1197074110597228768">"عملکردهای پیام فقط وقتی در بالای صفحه نشان داده شود که به حالت پرتره چرخانده می‌شود"</item>
+    <item msgid="8496844279095098067">"عملکردهای پیام خارج از سرصفحه پیام نشان داده نشود"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"همیشه نشان داده شود"</item>
+    <item msgid="8546075502478857367">"فقط در حالت پرتره نشان داده شود"</item>
+    <item msgid="863690009910739926">"نشان داده نشود"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"پاک کردن سابقه جستجو"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"سابقه جستجو پاک شد."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"سابقه جستجو پاک شود؟"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"همه جستجوهایی که قبلاً انجام داده‌اید، حذف خواهد شد."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"مدیریت حساب‌ها"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 15db92874..3129cb4e5 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Kaikki kansiot"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Viimeaikaiset kansiot"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Viestin tiedot"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automaattinen siirtyminen"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Valitse, mikä ruutu näytetään viestin poistamisen jälkeen"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Määritä automaattisen siirtymisen asetus\n(poistamisen jne. jälkeen)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Uudemmat"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Näytä vanhempi keskustelu poistamisen jälkeen"</item>
     <item msgid="2189929276292165301">"Näytä keskusteluluettelo poistamisen jälkeen"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Tyhjennä kuvien näyttöluvat"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Tyhjennetäänkö kuvien näyttöluvat?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Lopeta upotettujen kuvien näyttäminen aiemmin sallituilta lähettäjiltä."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> uutta viestiä"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"Arkistointi- ja poistotoiminnot"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, palaan asiaan"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 4903901bf..2ca92686b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Tous les dossiers"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Dossiers récents"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Détails du message"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Avance automatique"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Sélectionnez l\'écran à afficher après la suppression d\'un message."</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Définir les préférences d\'avance automatique\n(après suppression, etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Plus récente"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Afficher les conversations plus anciennes après suppression"</item>
     <item msgid="2189929276292165301">"Afficher la liste des conversations après suppression, etc."</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Sup. autori. liées aux images"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Supprimer les autorisations liées aux images?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Les images intégrées ne seront plus affichées pour les expéditeurs que vous aviez autorisés."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g> : <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"Actions d\'archivage et de suppression"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, je te réponds plus tard."</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 38f44cb29..7007974b0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Tous les dossiers"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Dossiers récents"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Détails du message"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Avance automatique"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Choisissez l\'écran à afficher après la suppression d\'un message."</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Avancer automatiquement"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Définir les préférences d\'avance automatique\n(après suppression, etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Conversation précédente"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Afficher les conversations plus anciennes après suppression"</item>
     <item msgid="2189929276292165301">"Afficher la liste des conversations après suppression"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Afficher"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Supprimer autorisations pour images"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Supprimer les autorisations liées aux images ?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Les images intégrées ne seront plus affichées pour les expéditeurs que vous aviez autorisés."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g> : <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> nouveau message"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Actions d\'archivage et de suppression"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, je te réponds plus tard."</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Confirmations des actions"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Confirmer avant la suppression"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Confirmer avant l\'archivage"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Confirmer avant l\'envoi"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Ajustement auto des messages"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Ajuster la taille des messages à celle de l\'écran"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Actions relatives aux messages"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Toujours afficher les actions relatives aux messages en haut de l\'écran"</item>
+    <item msgid="1197074110597228768">"Afficher les actions relatives aux messages en haut de l\'écran uniquement en mode Portrait"</item>
+    <item msgid="8496844279095098067">"Ne pas afficher les actions relatives aux messages en dehors de l\'en-tête des messages"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Toujours afficher"</item>
+    <item msgid="8546075502478857367">"Afficher uniquement en mode Portrait"</item>
+    <item msgid="863690009910739926">"Ne pas afficher"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Effacer l\'historique des recherches"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Historique des recherches effacé."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Effacer l\'historique des recherches ?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Toutes les recherches que vous avez effectuées auparavant seront supprimées."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Gérer les comptes"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 60c107eec..6dfbb955b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -37,7 +37,7 @@
     <string name="forward_attribution" msgid="1498936339458535158">"---------- अग्रेषित संदेश ----------&lt;br&gt;प्रेषक: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;दिनांक: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;विषय: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;प्रति: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="forward_attribution_no_headers" msgid="3239825787227110752">"---------- अग्रेषित संदेश ----------"</string>
     <string name="cc_attribution" msgid="374493748526504562">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
-    <string name="select_attachment_type" msgid="4711524151968942082">"अनुलग्नक का प्रकार चुनें"</string>
+    <string name="select_attachment_type" msgid="4711524151968942082">"अटैचमेंट का प्रकार चुनें"</string>
     <string name="too_large_to_attach_single" msgid="2996733972478212136">"<xliff:g id="MAXSIZE">%1$s</xliff:g> से बड़ी फ़ाइल संलग्न नहीं कर सकते."</string>
     <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"एक या अधिक फ़ाइलें संलग्न नहीं हुईं. सीमा <xliff:g id="MAXSIZE">%1$s</xliff:g> की है."</string>
     <string name="too_large_to_attach_additional" msgid="3366607594339390249">"फ़ाइल संलग्न नहीं हुई. <xliff:g id="MAXSIZE">%1$s</xliff:g> सीमा पूरी हो गई."</string>
@@ -105,12 +105,12 @@
     <string name="install_attachment" msgid="2803531650273683382">"इंस्‍टॉल"</string>
     <string name="download_again" msgid="7418568915429156518">"पुनः डाउनलोड करें"</string>
     <string name="more_info_attachment" msgid="717244337981816703">"जानकारी"</string>
-    <string name="no_application_found" msgid="1945184804521392093">"कोई भी ऐप्स  इस अनुलग्नक को देखने के लिए नहीं खोल सकता."</string>
+    <string name="no_application_found" msgid="1945184804521392093">"कोई भी ऐप्स  इस अटैचमेंट को देखने के लिए नहीं खोल सकता."</string>
     <string name="fetching_attachment" msgid="2599763030649526179">"अनुलग्‍नक फ़ेच कर रहा है"</string>
     <string name="please_wait" msgid="8797634225088247121">"कृपया प्रतीक्षा करें…"</string>
     <string name="saved" msgid="6660844285730790469">"सहेजा गया, <xliff:g id="SIZE">%s</xliff:g>"</string>
     <string name="download_failed" msgid="442019281547315527">"डाउनलोड नहीं हो सका. पुनर्प्रयास हेतु स्पर्श करें."</string>
-    <string name="attachments_header" msgid="6459475590011460229">"अनुलग्नक"</string>
+    <string name="attachments_header" msgid="6459475590011460229">"अटैचमेंट"</string>
     <string name="menu_photo_save_all" msgid="4295226099481995348">"सभी सहेजें"</string>
     <string name="menu_photo_share" msgid="2214772815165829079">"साझा करें"</string>
     <string name="menu_photo_share_all" msgid="4577299400844129078">"सभी साझा करें"</string>
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"सभी फ़ोल्डर"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"हाल ही के फ़ोल्‍डर"</string>
     <string name="message_details_title" msgid="2183394728494962332">"संदेश विवरण"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"स्वत: आगे"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"आपके द्वारा संदेश हटाने के बाद दिखाई जाने वाली स्‍क्रीन चुनें"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"स्वत: आगे"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"स्वत: उन्नत प्राथमिकता सेट करें\n(आपके द्वारा हटाए जाने के बाद, आदि)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"नया"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"आपके द्वारा हटाए जाने के बाद पुराना वार्तालाप दिखाएं"</item>
     <item msgid="2189929276292165301">"आपके द्वारा हटाए जाने के बाद वार्तालाप सूची दिखाएं"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"इससे आगे"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"चित्र स्वीकृतियां साफ़ करें"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"चित्र स्वीकृतियां साफ़ करें?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"आपने जिन प्रेषकों को पहले अनुमति दे रखी है, उनके इनलाइन चित्रों का प्रदर्शन रोकें."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> नए संदेश"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> नया संदेश"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> नए संदेश"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"संगृहीत करें और हटाएं कार्यवाही"</string>
@@ -416,8 +419,8 @@
     <string name="draft_heading" msgid="4654861166951306093">"ड्राफ़्ट"</string>
     <string name="quoted_text_hidden_print" msgid="8572207101897331252">"उद्धृत पाठ छिपा दिया गया है"</string>
   <plurals name="num_attachments">
-    <item quantity="one" msgid="3344123914734915029">"<xliff:g id="COUNT">%1$d</xliff:g> अनुलग्नक"</item>
-    <item quantity="other" msgid="3556482119464721042">"<xliff:g id="COUNT">%1$d</xliff:g> अनुलग्नक"</item>
+    <item quantity="one" msgid="3344123914734915029">"<xliff:g id="COUNT">%1$d</xliff:g> अटैचमेंट"</item>
+    <item quantity="other" msgid="3556482119464721042">"<xliff:g id="COUNT">%1$d</xliff:g> अटैचमेंट"</item>
   </plurals>
     <string name="no_subject" msgid="7823949839148118599">"(कोई विषय नहीं)"</string>
     <string name="vacation_responder" msgid="145292667520371875">"अवकाश प्रतिसाददाता"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"ठीक है, मैं आपसे संपर्क करूंगा/करूंगा"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"कार्रवाई पुष्टिकरण"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"हटाने से पहले पुष्टि करें"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"संग्रहण से पहले पुष्टि करें"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"भेजने से पहले पुष्टि करें"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"संदेशों को स्वत: फ़िट करें"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"स्क्रीन पर फ़िट होने के लिए संदेशों को सिकोड़ें"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"संदेश कार्रवाइयां"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"स्‍क्रीन में ऊपर हमेशा संदेश कार्रवाइयां दिखाएं"</item>
+    <item msgid="1197074110597228768">"जब पोट्रेट पर घुमाया जाए, केवल तब ही स्‍क्रीन में ऊपर संदेश कार्रवाइयां दिखाएं"</item>
+    <item msgid="8496844279095098067">"संदेश शीर्षलेख के बाहर संदेश कार्यवाहियां न दिखाएं"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"हमेशा दिखाएं"</item>
+    <item msgid="8546075502478857367">"केवल पोट्रेट में दिखाएं"</item>
+    <item msgid="863690009910739926">"न दिखाएं"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"खोज इतिहास साफ़ करें"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"खोज इतिहास साफ़ किया गया."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"खोज इतिहास साफ़ करें?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"आपके द्वारा पहले की गई सभी खोजों को निकाल दिया जाएगा."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"खाते प्रबंधित करें"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 51b8d835f..65acbc7e8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Sve mape"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nedavne mape"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Pojedinosti poruke"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automatski prijeđi na sljedeće"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Odaberite koji će se zaslon prikazati nakon brisanja poruke"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Automatski prijeđi na sljedeće"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Postavljanje automatskog prijelaza na sljedeće\n(nakon brisanja itd.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Novije"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Prikaz starijeg razgovora nakon brisanja"</item>
     <item msgid="2189929276292165301">"Prikaz popisa razgovora nakon brisanja"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Prijeđi na"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Brisanje odobrenja za slike"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Želite li izbrisati odobrenja za slike?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Prestani prikazivati slike u tekstu od pošiljatelja koji su prethodno bili dopušteni."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Novih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> nova poruka"</item>
+    <item quantity="other" msgid="6295442146249725952">"Novih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Radnje arhiviranja i brisanja"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"U redu, javit ću se"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Potvrđivanja radnji"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Potvrdite prije brisanja"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Potvrdite prije arhiviranja"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Potvrdite prije slanja"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Automatski prilagodi poruke"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Smanji poruke tako da stanu na zaslon"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Radnje poruka"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Uvijek prikaži radnje poruka pri vrhu zaslona"</item>
+    <item msgid="1197074110597228768">"Prikazuj radnje poruka pri vrhu zaslona samo kada je orijentacija okomita"</item>
+    <item msgid="8496844279095098067">"Nemoj prikazivati radnje poruka izvan zaglavlja poruke"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Uvijek prikaži"</item>
+    <item msgid="8546075502478857367">"Prikaži samo u okomitom prikazu"</item>
+    <item msgid="863690009910739926">"Ne prikazuj"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Izbriši povijest pretraživanja"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Povijest pretraživanja izbrisana je."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Želite li izbrisati povijest pretraživanja?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Uklonit će se sva vaša prethodna pretraživanja."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Upravljanje računima"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index aa286ebde..9fa37b641 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Összes mappa"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Legutóbbi mappák"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Üzenet részletei"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automatikus léptetés"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Válassza ki, melyik képernyő jelenjen meg üzenet törlése után."</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Automatikus továbblépés"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Automatikus léptetés beállítása\n(törlés, archiválás stb. után)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Újabb"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Törlés után a korábbi beszélgetés megjelenítése"</item>
     <item msgid="2189929276292165301">"Törlés után a beszélgetéslista megjelenítése"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Továbblépés ide:"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Képengedélyek törlése"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Törli a képengedélyeket?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Ne jelenítsen meg beágyazott képeket olyan feladóktól, akiktől ezt korábban engedélyezte."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Műveletek archiválás és törlése"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, térjünk vissza rá később"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Műveletekkel kapcsolatos megerősítések"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Megerősítés kérése törlés előtt"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Megerősítés kérése archiválás előtt"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Megerősítés kérése küldés előtt"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Üzenet automatikus méretezése"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Üzenetek kicsinyítése, hogy elférjenek a képernyőn."</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Üzenetműveletek"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Az üzenetműveletek mindig a képernyő tetején jelenjenek meg"</item>
+    <item msgid="1197074110597228768">"A műveletek csak álló tájolásnál jelenjenek meg a képernyő tetején"</item>
+    <item msgid="8496844279095098067">"Ne jelenjenek meg az üzenetműveletek az üzenet fejlécén kívül"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Mindig látszik"</item>
+    <item msgid="8546075502478857367">"Megjelenítés csak álló tájolásban"</item>
+    <item msgid="863690009910739926">"Ne jelenjen meg"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Keresési előzmények törlése"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"A keresési előzmények törölve."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Törli a keresési előzményeket?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Valamennyi végrehajtott keresés eltávolításra kerül."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Fiókok kezelése"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 041c0a947..a1a64f994 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Բոլոր թղթապանակները"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Վերջին թղթապանակները"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Հաղորդագրության մանրամասները"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Ինքնալրացում"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Ընտրել, թե որ էկրանը ցուցադրվի հաղորդագրություն ջնջելուց հետո"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Սահմանել ինքնալրացվող նախապատվությունը\n(ջնջելուց հետո և այլն)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Ավելի նոր"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Ցուցադրել ավելի վաղ խոսակցությունը ջնջելուց հետո"</item>
     <item msgid="2189929276292165301">"Ցուցադրել խոսակցությունների ցանկը ջնջելուց հետո"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Մաքրել նկարների հաստատումները"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Մաքրե՞լ նկարների հաստատումները:"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Դադարեցրեք ձեր կողմից նախկինում թույլատրված ուղարկողների ներտող պատկերների ցուցադրումը:"</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> նոր հաղորդագրություն"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"Արխիվացնել &amp; ջնջել գործողությունները"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Լավ, թույլ տվեք միանալ ձեզ"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 408f568e3..c4cf68658 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Semua folder"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Folder terbaru"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Detail pesan"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Maju otomatis"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Pilih layar yang akan ditampilkan setelah Anda menghapus pesan"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Maju otomatis"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Setel preferensi maju otomatis\n(setelah menghapus, dll.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Lebih baru"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Tampilkan percakapan lama setelah menghapus"</item>
     <item msgid="2189929276292165301">"Tampilkan daftar percakapan setelah menghapus"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Maju ke"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Hapus persetujuan gambar"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Hapus persetujuan gambar?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Berhenti menampilkan gambar sebaris dari pengirim yang sebelumnya Anda izinkan."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Tindakan mengarsipkan dan &amp; menghapus"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Saya akan menghubungi Anda"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Konfirmasi Tindakan"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Konfirmasi sebelum menghapus"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Konfirmasi sebelum mengarsipkan"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Konfirmasi sebelum mengirim"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Otomatis paskan pesan"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Susutkan pesan agar pas dengan layar"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Tindakan pesan"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Selalu tampilkan tindakan pesan di bagian atas layar"</item>
+    <item msgid="1197074110597228768">"Hanya tampilkan tindakan pesan di atas layar saat diputar ke orientasi potret"</item>
+    <item msgid="8496844279095098067">"Jangan tampilkan tindakan pesan di judul pesan"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Selalu tampilkan"</item>
+    <item msgid="8546075502478857367">"Hanya tampilkan dalam orientasi potret"</item>
+    <item msgid="863690009910739926">"Jangan tampilkan"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Hapus riwayat penelusuran"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Riwayat penelusuran dihapus."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Hapus riwayat penelusuran?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Semua penelusuran yang sebelumnya Anda lakukan akan dibuang."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Kelola Akun"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ca949b72d..b3e337179 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Tutte le cartelle"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Cartelle recenti"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Dettagli messaggio"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Avanzamento automatico"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Seleziona schermata da visualizzare dopo eliminazione messaggio"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Avanzamento automatico"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Imposta preferenza avanzamento automatico\n(dopo eliminazione ecc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Più recente"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Mostra conversazione meno recente dopo eliminazione"</item>
     <item msgid="2189929276292165301">"Mostra elenco conversazioni dopo eliminazione"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Passa a"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Cancella approvazioni immagini"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Cancellare le approvazioni per le immagini?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Non mostrare più le immagini incorporate nei messaggi di mittenti in precedenza autorizzati."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nuovi messaggi"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> nuovo messaggio"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> nuovi messaggi"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Azioni Archivia ed Elimina"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, ti ricontatto più tardi"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Conferme azioni"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Conferma prima di eliminare"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Conferma prima di archiviare"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Conferma prima di inviare"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Ridimensiona messaggi"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Consente di ridurre i messaggi in modo da adattarli allo schermo"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Azioni sui messaggi"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Mostra sempre le azioni sui messaggi nella parte superiore dello schermo"</item>
+    <item msgid="1197074110597228768">"Mostra le azioni sui messaggi nella parte superiore dello schermo solo quando ruotato in verticale"</item>
+    <item msgid="8496844279095098067">"Non mostrare le azioni sui messaggi all\'esterno dell\'intestazione del messaggio"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Mostra sempre"</item>
+    <item msgid="8546075502478857367">"Mostra solo in verticale"</item>
+    <item msgid="863690009910739926">"Non mostrare"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Cancella cronologia ricerche"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Cronologia delle ricerche cancellata."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Cancellare la cronologia delle ricerche?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Tutte le ricerche effettuate in precedenza verranno rimosse."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Gestisci account"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 17b1e9079..177f4c257 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"כל התיקיות"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"תיקיות אחרונות"</string>
     <string name="message_details_title" msgid="2183394728494962332">"פרטי הודעה"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"התקדמות אוטומטית"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"בחר איזה מסך יוצג לאחר מחיקת הודעה"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"התקדמות אוטומטית"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"הגדר העדפה להתקדמות אוטומטית\n(לאחר ביצוע מחיקה וכדומה)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"חדש יותר"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"הצג שיחה ישנה יותר לאחר ביצוע מחיקה"</item>
     <item msgid="2189929276292165301">"הצג רשימת שיחות לאחר ביצוע מחיקה"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"התקדם אל"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"ניקוי של אישורי תמונות"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"האם לנקות אישורי תמונות?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"הפסק להציג תמונות מוטבעות משולחים שהתרת זאת עבורם בעבר."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>‏: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות חדשות"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"הודעה חדשה <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות חדשות"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"פעולות העברה לארכיון ומחיקה"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"אוקיי, נדבר מאוחר יותר"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"אישורי פעולות"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"אשר לפני מחיקה"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"אשר לפני העברה לארכיון"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"אשר לפני שליחה"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"התאם אוטומטית גודל  הודעות"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"כווץ הודעות כך שיתאימו למסך"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"פעולות הודעה"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"הצג תמיד פעולות הודעה בראש המסך"</item>
+    <item msgid="1197074110597228768">"הצג פעולות הודעה רק בראש המסך בעת סיבוב לתצוגה לאורך"</item>
+    <item msgid="8496844279095098067">"אל תציג פעולות הודעה מחוץ לכותרת ההודעה"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"הצג תמיד"</item>
+    <item msgid="8546075502478857367">"הצג לאורך בלבד"</item>
+    <item msgid="863690009910739926">"אל תציג"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"נקה את היסטוריית החיפושים"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"היסטוריית החיפושים נוקתה."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"האם לנקות את היסטוריית החיפושים?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"כל החיפושים שביצעת בעבר יוסרו."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"נהל חשבונות"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fe2dd40d5..ccdf3a2a6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"すべてのフォルダ"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"最近開いたフォルダ"</string>
     <string name="message_details_title" msgid="2183394728494962332">"メッセージの詳細"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"自動表示"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"メッセージを削除した後に表示する画面を選択する"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"自動表示の設定\n（削除などの後）"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"前"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"削除後に古いスレッドを表示する"</item>
     <item msgid="2189929276292165301">"削除後にスレッドリストを表示する"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"画像の許可の取り消し"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"画像表示の許可を取り消しますか？"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"以前許可した送信者からのインライン画像の表示を停止します。"</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"アーカイブ/削除操作"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"折り返し連絡します"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 2bc182a16..db11bfa8d 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"ყველა საქაღალდე"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"ახლახანს ნანახი საქაღალდეები"</string>
     <string name="message_details_title" msgid="2183394728494962332">"შეტყობინების მონაცემები"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"ავტომატური გადასვლა"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"აირჩიეთ, რომელი ეკრანი გამოჩნდეს შეტყობინების წაშლის შემდეგ"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"ავტომატური გადასცლის პარამეტრების დაყენება\n(მას შემდეგ რაც წაშლით და ა.შ.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"უფრო ახალი"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"წაშლის შემდეგ უფრო ძველი მიმოწერის ჩვენება"</item>
     <item msgid="2189929276292165301">"წაშლის შემდეგ მიმოწერების სიის ჩვენება"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"სურათის ნებართვების გაუქმება"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"გაუქმდეს ადრეული ნებართვები?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"ადრე ნებადართული გამომგზავნებისგან ჩართული სურათების ჩვენების შეჩერება."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> ახალი შეტყობინება"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"დაარქივების და წაშლის მოქმედებები"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"კარგი, შეგეხმიანები"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index ac1ae7268..ef44c2c47 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -90,7 +90,7 @@
     <string name="kilobytes" msgid="9191949758901349712">"<xliff:g id="COUNT">%s</xliff:g> គីឡូបៃ"</string>
     <string name="megabytes" msgid="130431176022837380">"<xliff:g id="COUNT">%s</xliff:g> មេកាបៃ"</string>
     <string name="attachment_image" msgid="3832985223906528449">"រូបភាព"</string>
-    <string name="attachment_video" msgid="7526134752988603154">"វីដេអូ​"</string>
+    <string name="attachment_video" msgid="7526134752988603154">"វីដេអូ"</string>
     <string name="attachment_audio" msgid="135527133955622936">"សំឡេង"</string>
     <string name="attachment_text" msgid="5544874374971562759">"អត្ថបទ"</string>
     <string name="attachment_application_msword" msgid="2326909450865637910">"ឯកសារ"</string>
@@ -100,7 +100,7 @@
     <string name="attachment_unknown" msgid="6005445955982153931">"ឯកសារ <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="preview_attachment" msgid="6934911143603455393">"មើល​ជាមុន"</string>
     <string name="save_attachment" msgid="5360128849867863132">"រក្សាទុក"</string>
-    <string name="cancel_attachment" msgid="4651201258272223650">"បោះ​បង់​"</string>
+    <string name="cancel_attachment" msgid="4651201258272223650">"បោះ​បង់"</string>
     <string name="open_attachment" msgid="975940478986626705">"បើក"</string>
     <string name="install_attachment" msgid="2803531650273683382">"ដំឡើង"</string>
     <string name="download_again" msgid="7418568915429156518">"ទាញ​យក​ម្ដងទៀត"</string>
@@ -112,7 +112,7 @@
     <string name="download_failed" msgid="442019281547315527">"មិន​អាច​ទាញ​យក​។ ប៉ះ​ដើម្បី​ព្យាយាម​ម្ដង​ទៀត​។"</string>
     <string name="attachments_header" msgid="6459475590011460229">"ឯកសារ​ភ្ជាប់"</string>
     <string name="menu_photo_save_all" msgid="4295226099481995348">"រក្សា​ទុក​ទាំងអស់"</string>
-    <string name="menu_photo_share" msgid="2214772815165829079">"ចែករំលែក​"</string>
+    <string name="menu_photo_share" msgid="2214772815165829079">"ចែករំលែក"</string>
     <string name="menu_photo_share_all" msgid="4577299400844129078">"ចែក​រំលែក​ទាំងអស់"</string>
     <string name="menu_photo_print" msgid="1751063711206436775">"បោះពុម្ព"</string>
     <string name="saving" msgid="925514721138014677">"កំពុង​រក្សាទុក..."</string>
@@ -252,9 +252,9 @@
     <string name="message_invite_decline" msgid="4524135969656266758">"ទេ"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="send_anyway" msgid="426079691638238572">"អញ្ចឹង​ផ្ញើ​​តែម្ដង"</string>
-    <string name="ok" msgid="8339355733816891026">"យល់​ព្រម​"</string>
+    <string name="ok" msgid="8339355733816891026">"យល់​ព្រម"</string>
     <string name="done" msgid="3079981801778027540">"ធ្វើ​រួច"</string>
-    <string name="cancel" msgid="8762981157252199115">"បោះ​បង់​"</string>
+    <string name="cancel" msgid="8762981157252199115">"បោះ​បង់"</string>
     <string name="clear" msgid="3184687982186479442">"សម្អាត"</string>
   <string-array name="sync_status">
     <item msgid="2446076619901049026">"ជោគជ័យ"</item>
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"ថត​ទាំងអស់"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"ថត​ថ្មីៗ"</string>
     <string name="message_details_title" msgid="2183394728494962332">"ព័ត៌មាន​លម្អិត​សារ"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"ទៅមុខ​​ស្វ័យ​ប្រវត្តិ"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"ជ្រើស​អេក្រង់​ត្រូវ​បង្ហាញ​បន្ទាប់​ពី​អ្នក​លុប​សារ"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"កំណត់​ចំណូល​ចិត្ត​​ស្វ័យ​ប្រវត្តិ \n (បន្ទាប់​ពី​អ្នក​លុប ។ល។)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"ថ្មី​ជាង"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"បង្ហាញ​ការ​សន្ទនា​ចាស់​ជាង​បន្ទាប់​ពី​អ្នក​លុប"</item>
     <item msgid="2189929276292165301">"បង្ហាញ​បញ្ជី​​ការ​សន្ទនា​​បន្ទាប់​ពី​អ្នក​លុប"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"សម្អាត​ករ​អនុញ្ញាត​រូបភាព?"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"សម្អាត​ការ​អនុញ្ញាត​រូបភាព?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"បញ្ឈប់​ការ​បង្ហាញ​រូបភាព​ក្នុង​តួ​ពី​អ្នក​ផ្ញើ​ដែល​អ្នក​​បាន​អនុញ្ញាត​ពី​មុន​។"</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"សារ​ថ្មី <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"ប័ណ្ណសារ &amp; សកម្មភាព​លុប"</string>
@@ -384,9 +387,9 @@
     <item quantity="other" msgid="2182899395748020953">"សារ <xliff:g id="COUNT">%1$d</xliff:g> ​នឹង​ត្រូវ​បាន​លុប​ជា​​អចិន្ត្រៃយ៍។"</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"បើក​កា​រ​រុករក​​ថត"</string>
-    <string name="drawer_close" msgid="2764774620737876943">"បិទ​ការ​រុករក​ថត​"</string>
+    <string name="drawer_close" msgid="2764774620737876943">"បិទ​ការ​រុករក​ថត"</string>
     <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"ប៉ះ​រូបភាព​របស់​អ្នក​ផ្ញើ ​ដើម្បី​ជ្រើស​ការ​សន្ទនា​នោះ​។"</string>
-    <string name="long_press_to_select_tip" msgid="9205666839837250150">"ប៉ះ &amp; សង្កត់ ដើម្បី​ជ្រើស​ការ​សន្ទនា​មួយ បន្ទាប់​មក​ប៉ះ​ដើម្បី​ជ្រើស​ការ​សន្ទនា​ច្រើន​ទៀត។​"</string>
+    <string name="long_press_to_select_tip" msgid="9205666839837250150">"ប៉ះ &amp; សង្កត់ ដើម្បី​ជ្រើស​ការ​សន្ទនា​មួយ បន្ទាប់​មក​ប៉ះ​ដើម្បី​ជ្រើស​ការ​សន្ទនា​ច្រើន​ទៀត។"</string>
     <string name="folder_icon_desc" msgid="1500547397347480618">"រូប​តំណាង​ថត"</string>
     <string name="add_account" msgid="2162808366829269770">"បន្ថែម​គណនី"</string>
     <string name="attached_message" msgid="4267189489654642035">"សារ​ដែល​បាន​ភ្ជាប់"</string>
@@ -432,8 +435,8 @@
     <string name="custom_date" msgid="7566383722092597487">"តាម​បំណង"</string>
     <string name="date_none" msgid="1033448683454519235">"គ្មាន"</string>
     <string name="discard_changes" msgid="57677638191085556">"បោះបង់​ការ​ផ្លាស់ប្ដូរ?"</string>
-    <string name="vacation_responder_changes_saved" msgid="7996997204497945275">"បាន​រក្សាទុក​ការ​ផ្លាស់ប្ដូរ​ការ​ឆ្លើយតប​ពេល​វិស្សមកាល​"</string>
-    <string name="vacation_responder_changes_discarded" msgid="5699324320463227712">"​បាន​បោះបង់​ការ​ឆ្លើយតប​ពេល​​វិស្សមកាល​"</string>
+    <string name="vacation_responder_changes_saved" msgid="7996997204497945275">"បាន​រក្សាទុក​ការ​ផ្លាស់ប្ដូរ​ការ​ឆ្លើយតប​ពេល​វិស្សមកាល"</string>
+    <string name="vacation_responder_changes_discarded" msgid="5699324320463227712">"​បាន​បោះបង់​ការ​ឆ្លើយតប​ពេល​​វិស្សមកាល"</string>
     <string name="vacation_responder_off" msgid="3502054743467746285">"បិទ"</string>
     <string name="vacation_responder_on" msgid="5242690599331655563">"បើក ពី<xliff:g id="DATE">%1$s</xliff:g>"</string>
     <string name="vacation_responder_on_with_end_date" msgid="8198920866703798811">"បើក​ ពី <xliff:g id="START_DATE">%1$s</xliff:g> ដល់ <xliff:g id="END_DATE">%2$s</xliff:g>"</string>
@@ -447,17 +450,47 @@
     <string name="view_app_page" msgid="5320196120982618014"></string>
     <string name="print_dialog" msgid="8754985880654139587">"បោះពុម្ព..."</string>
     <string name="copyright_information" msgid="1673715390305905781">"ព័ត៌មាន​រក្សាសិទ្ធិ"</string>
-    <string name="privacy_policy" msgid="2072093492013385609">"គោលនយោបាយ​ភាព​​ឯកជន​"</string>
+    <string name="privacy_policy" msgid="2072093492013385609">"គោលនយោបាយ​ភាព​​ឯកជន"</string>
     <string name="open_source_licenses" msgid="6831573769505612579">"អាជ្ញាប័ណ្ណកម្មវិធីកូដចំហ"</string>
     <string name="reply_choice_yes" msgid="5279400403860280271">"បាទ/ចាស"</string>
     <string name="reply_choice_no" msgid="1626377088683186268">"ទេ"</string>
-    <string name="reply_choice_ok" msgid="5138061449166345173">"យល់ព្រម​"</string>
+    <string name="reply_choice_ok" msgid="5138061449166345173">"យល់ព្រម"</string>
     <string name="reply_choice_hehe" msgid="7883585007161871893">"ហេហេ"</string>
     <string name="reply_choice_thanks" msgid="8365439191962120322">"អរគុណ"</string>
     <string name="reply_choice_i_agree" msgid="24980061720212740">"ខ្ញុំ​យល់​ស្រប"</string>
     <string name="reply_choice_nice" msgid="7472107121354003424">"ល្អ"</string>
-    <string name="reply_on_my_way" msgid="8200386879475660650">"នៅ​តាម​ផ្លូវ​"</string>
+    <string name="reply_on_my_way" msgid="8200386879475660650">"នៅ​តាម​ផ្លូវ"</string>
     <string name="reply_choice_later" msgid="6294535370720117768">"យល់ព្រម ខ្ញុំនឹងទាក់ទងអ្នកវិញ"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 579b3546b..2d989a5ec 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"모든 폴더"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"최근 폴더"</string>
     <string name="message_details_title" msgid="2183394728494962332">"메시지 세부정보"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"삭제 후 표시 화면"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"메일을 삭제한 다음 표시할 화면 선택"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"메일 삭제 후\n표시할 화면"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"최신"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"삭제 후 이전 대화 표시"</item>
     <item msgid="2189929276292165301">"삭제 후 대화 목록 표시"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"이미지 승인 취소"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"이미지 승인을 취소하시겠습니까?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"이전에 이미지 표시를 허용했던 발신자가 보낸 이메일의 이미지를 표시하지 않습니다."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"새 메시지 <xliff:g id="COUNT">%1$d</xliff:g>개"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"보관처리 및 삭제 작업"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"나중에 연락드리겠습니다."</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 85e08b687..b41a6ca6d 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -120,7 +120,7 @@
     <string name="contextmenu_openlink" msgid="2176176524824953775">"ເປີດໃນໂປຣແກຣມທ່ອງເວັບ"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"ສຳເນົາ"</string>
     <string name="contextmenu_copylink" msgid="3580131515400610839">"ສຳເນົາລິ້ງ URL"</string>
-    <string name="contextmenu_view_image" msgid="8855189263365643422">"ເບິ່ງຮູບ​ພາບ​"</string>
+    <string name="contextmenu_view_image" msgid="8855189263365643422">"ເບິ່ງຮູບ​ພາບ"</string>
     <string name="contextmenu_dial_dot" msgid="9104426720103729453">"ໂທ..."</string>
     <string name="contextmenu_sms_dot" msgid="6481040539501081547">"SMS..."</string>
     <string name="contextmenu_add_contact" msgid="8395100913366045250">"ເພີ່ມລາຍຊື່"</string>
@@ -251,7 +251,7 @@
     <string name="message_invite_tentative" msgid="3898050756490962079">"ອາດຈະໄປ"</string>
     <string name="message_invite_decline" msgid="4524135969656266758">"ບໍ່"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
-    <string name="send_anyway" msgid="426079691638238572">"ສົ່ງ​"</string>
+    <string name="send_anyway" msgid="426079691638238572">"ສົ່ງ"</string>
     <string name="ok" msgid="8339355733816891026">"ຕົກລົງ"</string>
     <string name="done" msgid="3079981801778027540">"ແລ້ວໆ"</string>
     <string name="cancel" msgid="8762981157252199115">"ຍົກເລີກ"</string>
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"ໂຟນເດີທັງຫມົດ"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"ໂຟນເດີທີ່ຜ່ານມາ"</string>
     <string name="message_details_title" msgid="2183394728494962332">"ລາຍລະອຽດຂໍ້ຄວາມ"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"ເປີດຂໍ້ຄວາມຖັດໄປອັດຕະໂນມັດ"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"ເລືອກວ່າຈະໃຫ້ສະແດງໜ້າໃດຫຼັງຈາກທ່ານລຶບຂໍ້ຄວາມ"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"​ເລື່ອນ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"ຕັ້ງຄ່າ \"ເປີດຂໍ້ຄວາມຖັດໄປອັດຕະໂນມັດ\"\n(ຫຼັງຈາກທ່ານທຳການລຶບ ຯລຯ.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"ໃໝ່ກວ່າ"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"ສະແດງການສົນທະນາທີ່ເກົ່າກວ່າ ຫຼັງຈາກທ່ານລຶບແລ້ວ"</item>
     <item msgid="2189929276292165301">"ສະແດງລາຍການການສົນທະນາ ຫຼັງຈາກທ່ານລຶບແລ້ວ"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"ເລື່ອນໄປຫາ"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"ລຶບການອະນຸມັດຮູບ"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"ລຶບການອະນຸມັດຮູບ?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"ຢຸດການສະແດງຮູບພາບໃນແຖວຈາກຜູ່ສົ່ງທີ່ທ່ານເຄີຍອະນຸຍາດມາກ່ອນແລ້ວ."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຄວາມໃຫມ່"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້​ຄວາມ​ໃໝ່"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> ​ອີ​ເມວ​ໃໝ່"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"ການເກັບເຂົ້າແຟ້ມ &amp; ການລຶບ"</string>
@@ -425,7 +428,7 @@
     <string name="vacation_responder_body_hint_text" msgid="5731550117332146705">"ຂໍ້ຄວາມ"</string>
     <string name="send_to_contacts_text" msgid="2696513899649703420">"ສົ່ງໃຫ້ຜູ່ທີ່ຢູ່ໃນລາຍຊື່ຕິດຕໍ່ຂອງຂ້ອຍເທົ່ານັ້ນ"</string>
     <string name="send_to_domain_text" msgid="5055332409482662383">"ສົ່ງ​ໃຫ້ສະເພາະ <xliff:g id="DOMAIN">%1$s</xliff:g>"</string>
-    <string name="pick_start_date_title" msgid="915230000170560933">"ມື້ເລີ່ມ​"</string>
+    <string name="pick_start_date_title" msgid="915230000170560933">"ມື້ເລີ່ມ"</string>
     <string name="pick_end_date_title" msgid="2068598706186320098">"ມື້ຈົບ (ເປັນທາງເລືອກ​)"</string>
     <string name="date_not_set" msgid="4925325938525330766">"ຍັງບໍ່ໄດ້ຕັ້ງ"</string>
     <string name="set_end_date_dialog_title" msgid="72028456826019380">"ມື້ຈົບ (ເປັນທາງເລືອກ)"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"​ຕົກ​ລົງ, ​ໄວ້ຂ້ອຍ​ຈະ​ຕິດ​ຕໍ່​ກັບ​ຫາ​ເຈົ້າ"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"​ຢືນ​ຢັນ​ກ່ອນ​ດຳ​ເນີນ​ການ"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"​ຢືນ​ຢັນ​ກ່ອນ​ການ​ລຶບ"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"​ຢືນ​ຢັນ​ກ່ອນ​ຈັດ​ເກັບ​ເຂົ້າ​ແຟ້ມ"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"​ຢືນ​ຢັນ​ກ່ອນ​ການ​ສົ່ງ"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"​ປັບ​ຂໍ້​ຄວາມ​ໃຫ້​ພໍ​ດີ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"​ຫຍໍ້​ຂໍ້​ຄວາມ​ໃຫ້​ພໍ​ດີ​ກັບ​ໜ້າ"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"​ຈັດ​ການ​ຂໍ້​ຄວາມ"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"ສະ​ແດງ​ຄຳ​ສັ່ງ​ຂໍ້​ຄວາມ​ຢູ່​ເທິງ​ສຸດ​ຂອງ​ໜ້າ​ຈໍ"</item>
+    <item msgid="1197074110597228768">"​ສະ​ແດງ​ສະ​ເພາະ​ຄຳ​ສັ່ງ​ຂໍ້​ຄວາມ​ຢູ່​ເທິງ​ສຸດ​ຂອງ​ໜ້າ​ຈໍ​ເທື່ອ​ໝຸນ​ຈໍ​ໄປ​ລວງ​ຕັ້ງ"</item>
+    <item msgid="8496844279095098067">"​ບໍ່​ສະ​ແດງ​ຄຳ​ສ​ັ່ງ​ຂໍ້​ຄວາມ​ຢູ່​ນອກ​ສ່ວນ​ຫົວ​ຂໍ້​ອີ​ເມວ"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"​ສະ​ແດງ​ທຸກ​ຄັ້ງ"</item>
+    <item msgid="8546075502478857367">"​ສະ​ເພາະ​ສະ​ເພາະ​​ລວງ​ຕັ້ງ"</item>
+    <item msgid="863690009910739926">"ບໍ່ສະແດງ"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"​ລຶບ​ປະ​ຫວັດ​ການ​ຊອກ​ຫາ"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"​ລຶບ​ລ້າງ​ປະ​ຫວັດ​ການ​ຊອກ​ຫາ​ແລ້ວ."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"ລຶບ​ປະ​ຫວັດ​ການ​ຊອກ​ຫາ​ບໍ?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"​ທຸກໆ​ການ​ຊອກ​ຫາ​ທີ່​ທ່ານ​ເຄີຍ​ຊອກ​ມາ​ກ່ອນ​ໜ້າ​ນີ້​ຈະ​ຖືກ​ລຶບ​ອອກ."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"​ຈັດ​ການ​ບັນ​ຊີ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index edc2e229e..ba34c2e25 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Visi aplankai"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nauji aplankai"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Išsami pranešimo informacija"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automatiškai išplėsti"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Pasirinkite, kurį ekraną rodyti ištrynus pranešimą"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Automatiškai pereiti"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Nustatyti automatinio perėjimo nuostatą\n(ištrynus ir kt.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Naujesnis"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Ištrynus rodyti senesnį pokalbį"</item>
     <item msgid="2189929276292165301">"Ištrynus rodyti pokalbių sąrašą"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Pereiti į"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Išvalyti nuotraukų patvirtinimus"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Išvalyti nuotraukų patvirtinimus?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Nebepateikti įterptųjų vaizdų iš anksčiau leistų siuntėjų."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="6295442146249725952">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Archyvavimas ir ištrynimas"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Gerai, informuosiu vėliau"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Veiksmų patvirtinimai"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Patvirtinti prieš ištrinant"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Patvirtinti prieš archyvuojant"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Patvirtinti prieš išsiunčiant"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Automatinis pranešimų prider."</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Sutraukti pranešimus, kad tilptų ekrane"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Pranešimų veiksmai"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Visada rodyti pranešimų veiksmus ekrano viršuje"</item>
+    <item msgid="1197074110597228768">"Rodyti pranešimų veiksmus ekrano viršuje, tik kai ekranas pasuktas portreto režimu"</item>
+    <item msgid="8496844279095098067">"Nerodyti pranešimų veiksmų ne pranešimo antraštėje"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Visada rodyti"</item>
+    <item msgid="8546075502478857367">"Rodyti tik portreto režimu"</item>
+    <item msgid="863690009910739926">"Nerodyti"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Išvalyti paieškos istoriją"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Paieškos istorija išvalyta."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Išvalyti paieškos istoriją?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Visos anksčiau atliktos paieškos bus pašalintos."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Tvarkyti paskyras"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9292f45ba..536d843b1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Visas mapes"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Jaunākās mapes"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Informācija par ziņojumu"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automātiska pāriešana"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Izvēlieties pēc ziņojuma dzēšanas parādāmo ekrānu."</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Automātiska pāriešana"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Automātiskas pāriešanas preferences\niestatīšana (pēc dzēšanas utt.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Jaunākas"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Rādīt vecāku sarunu pēc dzēšanas"</item>
     <item msgid="2189929276292165301">"Rādīt sarunu sarakstu pēc dzēšanas"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Pāriešana uz"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Attēlu rādīšanas apstiprinājumu atcelšana"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vai atcelt attēlu rādīšanas apstiprinājumus?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Vairs nerādīt iekļautos attēlus no sūtītājiem, kuriem iepriekš tas bija atļauts"</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> jauni ziņojumi"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> jauns ziņojums"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> jauni ziņojumi"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Arhivēšanas un dzēšanas darbības"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Labi, sazināšos ar jums."</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Darbību apstiprinājumi"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Apstiprināšana pirms dzēšanas"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Apstiprināšana pirms arhivēšanas"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Apstiprināšana pirms sūtīšanas"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Automātiska ietilpināšana"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Ziņojumi tiek samazināti, lai tie ietilptu ekrānā."</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Darbības ar ziņojumiem"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Vienmēr rādīt darbības ar ziņojumiem ekrāna augšdaļā"</item>
+    <item msgid="1197074110597228768">"Rādīt darbības ar ziņojumiem tikai ekrāna augšdaļā, kad ierīce pagriezta portreta režīmā"</item>
+    <item msgid="8496844279095098067">"Nerādīt darbības ar ziņojumiem ārpus ziņojuma galvenes"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Rādīt vienmēr"</item>
+    <item msgid="8546075502478857367">"Rādīt tikai portreta režīmā"</item>
+    <item msgid="863690009910739926">"Nerādīt"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Notīrīt meklēšanas vēsturi"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Meklēšanas vēsture ir notīrīta."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Vai notīrīt meklēšanas vēsturi?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Visi iepriekšējie meklēšanas vienumi tiks noņemti."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Pārvaldīt kontus"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index ed2af164f..057a57c5e 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Бүх фолдерууд"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Саяхны фолдерууд"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Зурвасын мэдээлэл"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Автомат шилжилт"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Таныг зурвас устгасны дараа ямар дэлгэцийг харуулахыг сонгоно уу"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Автоматаар шилжих"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Автомат-шилжилтийн сонголтыг тохируулах\n(устгасны дараа гэх мэт.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Шинэ"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Устгасны дараа хуучин харилцааг харуулах"</item>
     <item msgid="2189929276292165301">"Устгасны дараа харилцааны жагсаалтыг харуулах"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Шилжих"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Зургийн зөвшөөрлүүдийг арилгах"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Зургийн зөвшөөрлүүдийг арилгах уу?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Таны өмнө нь зөвшөөрсөн илгээгчдээс ирүүлсэн  зурвас доторх зургуудыг харуулахыг зогсоох."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> шинэ зурвас"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> шинэ зурвас"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> шинэ зурвас"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Архивлах &amp; устгах үйлдлүүд"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"За, би эргээд холбоо баръя"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Үйлдэлийн баталгаажуулалт"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Устгахын өмнө баталгаажуулах"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Архивлахын өмнө баталгаажуулах"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Илгээхийн өмнө баталгаажуулах"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Зурвасуудыг автоматаар тааруулах"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Зурвасуудыг агшаан дэлгэцэнд багтаах"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Зурвасын үйлдэлүүд"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Зурвасын үйлдлийг байнга дэлгэцний дээд хэсэгт харуулах"</item>
+    <item msgid="1197074110597228768">"Босоо байдлаар эргүүлсэн үед дэлгэцний дээд хэсэгт зөвхөн зурвасын үйлдлийг харуулах"</item>
+    <item msgid="8496844279095098067">"Зурвасын үйлдлийг зурвасын толгойн гадна харуулахгүй"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Байнга харуулах"</item>
+    <item msgid="8546075502478857367">"Зөвхөн босоогоор харуулах"</item>
+    <item msgid="863690009910739926">"Харуулахгүй"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Хайлтын түүхийг арилгах"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Хайлтын түүхийг арилгасан."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Хайлтын түүхийг арилгах уу?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Таны өмнө нь хийсэн бүх хайлтыг арилгах болно."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Акаунтуудыг удирдах"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 5e0ff190d..efe110f4b 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Semua folder"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Folder terbaru"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Butiran mesej"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Auto maju"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Pilih skrin mana mahu ditunjukkan selepas anda memadamkan mesej"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Tetapkan pilihan auto mara\n(selepas anda memadamkan, dsb.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Lebih baharu"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Tunjukkan perbualan yang lebih lama selepas memadamkan"</item>
     <item msgid="2189929276292165301">"Tunjukkan senarai perbualan selepas memadamkan"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Padam bersih kebenaran gambar"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Padam bersih kebenaran gambar?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Berhenti memaparkan imej sebaris daripada penghantar yang anda benarkan sebelum ini."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mesej baharu"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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">"Senyap"</string>
     <string name="preference_removal_action_title" msgid="6585232628422090835">"Arkib &amp; padam tindakan"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, saya akan hubungi anda"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 494ff6147..2a2a0b51f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle mapper"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nylige mapper"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Meldingsinformasjon"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automatisk flytting"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Velg hvilken skjerm som skal vises når du sletter en e-post"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Autoflytting"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Angi innst. for autoflytting\n(etter at du sletter, osv.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Nyere"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Vis eldre samtaler etter du har slettet"</item>
     <item msgid="2189929276292165301">"Vis samtaleliste etter du har slettet"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Gå til"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Fjern bildegodkjenninger"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vil du fjerne bildegodkjenninger?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Slutt å vise innebygde bilder fra avsendere du tidligere har godkjent."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nye e-poster"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> ny e-post"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> nye e-poster"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Handlinger for arkivering og sletting"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, jeg tar kontakt senere"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Aktivitetsbekreftelser"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Bekreft før sletting"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Bekreft før arkivering"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Bekreft før sending"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Automatisk tilpasning for e-post"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Krymp e-poster slik at de passer til skjermen"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"E-postalternativer"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Vis alltid e-posthandlinger øverst på skjermen"</item>
+    <item msgid="1197074110597228768">"Vis bare e-posthandlinger øverst på skjermen når rotert til stående"</item>
+    <item msgid="8496844279095098067">"Ikke vis e-posthandlinger utenfor e-postoverskriften"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Vis alltid"</item>
+    <item msgid="8546075502478857367">"Vis bare i stående visning"</item>
+    <item msgid="863690009910739926">"Ikke vis"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Tøm søkeloggen"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Søkeloggen er tømt."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Vil du tømme søkeloggen?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Alle søkene du har utført tidligere, fjernes."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Administrer kontoer"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ab8fcae8c..27c12a78c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Alle mappen"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Recente mappen"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Berichtdetails"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automatisch doorgaan"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Het scherm selecteren dat wordt getoond na het verw. van bericht"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Automatisch doorgaan"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Voorkeur voor automatisch doorgaan instellen\n(na verwijderen, enzovoort)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Nieuwer"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Oudere conversatie weergeven na het verwijderen"</item>
     <item msgid="2189929276292165301">"Conversatielijst weergeven na het verwijderen"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Doorgaan naar"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Goedkeuringen voor foto\'s wissen"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Goedkeuringen voor foto\'s wissen?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Niet langer inline-afbeeldingen weergeven van afzenders die u eerder heeft toegestaan."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nieuwe berichten"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> nieuw bericht"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> nieuwe berichten"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Acties voor archiveren of verwijderen"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Hier kom ik later op terug"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Actiebevestigingen"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Bevestigen vóór verwijderen"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Bevestigen vóór archiveren"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Bevestigen vóór verzenden"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Berichten aanpassen aan scherm"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Berichten verkleinen tot schermgrootte"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Berichtacties"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Berichtacties altijd boven aan het scherm weergeven"</item>
+    <item msgid="1197074110597228768">"Berichtacties alleen boven aan het scherm weergeven wanneer het scherm naar een staande indeling is gedraaid"</item>
+    <item msgid="8496844279095098067">"Berichtacties niet weergeven buiten de berichtkop"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Altijd weergeven"</item>
+    <item msgid="8546075502478857367">"Alleen staand weergeven"</item>
+    <item msgid="863690009910739926">"Niet weergeven"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Zoekgeschiedenis wissen"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Zoekgeschiedenis gewist."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Zoekgeschiedenis wissen?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Alle zoekopdrachten die u eerder heeft uitgevoerd, worden verwijderd."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Accounts beheren"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6e1ca48ea..a56830ec2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Wszystkie foldery"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Ostatnie foldery"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Szczegóły wiadomości"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Autoprzechodzenie"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Wybierz ekran, który ma wyświetlać się po usunięciu wiadomości"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Automatyczne przechodzenie"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Ustaw automatyczne przechodzenie\n(np. po usunięciu)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Nowsze wątki"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Pokazuj starszą konwersację po usunięciu"</item>
     <item msgid="2189929276292165301">"Pokazuj listę konwersacji po usunięciu"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Przejdź do"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Wyłącz pokazywanie obrazów"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Wyłączyć pokazywanie obrazów?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Przestań pokazywać w wiadomościach obrazy od zatwierdzonych wcześniej nadawców."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Nowe wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> nowa wiadomość"</item>
+    <item quantity="other" msgid="6295442146249725952">"Nowe wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Czynności archiwizuj i usuń"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, odezwę się do Ciebie"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Potwierdzenia czynności"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Potwierdź przed usunięciem"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Potwierdź przed zarchiwizowaniem"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Potwierdź przed wysłaniem"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Autodopasowanie wiadomości"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Zmniejsz wiadomości, by zmieścić je na ekranie"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Pasek opcji"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Zawsze pokazuj pasek opcji u góry ekranu"</item>
+    <item msgid="1197074110597228768">"Pokazuj pasek opcji u góry ekranu tylko w trybie pionowym"</item>
+    <item msgid="8496844279095098067">"Nie pokazuj paska opcji poza nagłówkiem wiadomości"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Zawsze pokazuj"</item>
+    <item msgid="8546075502478857367">"Pokazuj w trybie pionowym"</item>
+    <item msgid="863690009910739926">"Nie pokazuj"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Wyczyść historię wyszukiwania"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Wyczyszczono historię wyszukiwania."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Wyczyścić historię wyszukiwania?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Wszystkie poprzednie wyszukiwania zostaną usunięte."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Zarządzaj kontami"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 19103f26e..252afd7ee 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Todas as pastas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Pastas recentes"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Detalhes da mensagem"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Avanço automático"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Selecionar o ecrã a apresentar após eliminar uma mensagem"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Avanço automático"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Definir preferência de avanço autom.\n(depois de eliminar, etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Mais recente"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Mostrar conversa mais antiga após eliminar"</item>
     <item msgid="2189929276292165301">"Mostrar lista de conversas após eliminar"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Avançar para"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Limpar aprovações de fotografias"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Limpar aprovações de fotografias?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Parar apresentação de imagens inline de remetentes anteriormente permitidos."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens novas"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> mensagem nova"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens novas"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Arquivar e eliminar ações"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, ligo mais tarde"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Confirmações de ação"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Confirmar antes de eliminar"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Confirmar antes de arquivar"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Confirmar antes de enviar"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Ajuste automático de mensagens"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Diminuir o tamanho das mensagens para se ajustarem ao ecrã"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Ações de mensagens"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Mostrar sempre ações de mensagens na parte superior do ecrã"</item>
+    <item msgid="1197074110597228768">"Mostrar apenas ações de mensagens na parte superior do ecrã ao rodar para modo de retrato"</item>
+    <item msgid="8496844279095098067">"Não mostrar ações de mensagens fora do cabeçalho das mensagens"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Mostrar sempre"</item>
+    <item msgid="8546075502478857367">"Mostrar apenas em modo de retrato"</item>
+    <item msgid="863690009910739926">"Não mostrar"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Limpar histórico de pesquisas"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Histórico de pesquisas limpo."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Limpar o histórico de pesquisas?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Serão removidas todas as pesquisas realizadas anteriormente."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Gerir contas"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 17e407fd7..cde468428 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Todas as pastas"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Pastas recentes"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Detalhes da mensagem"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Avanço automático"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Selecione a tela exibida após excluir uma mensagem"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Configurar a preferência de avanço automático\n(depois de excluir, etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Mais recente"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Exibir conversa mais antiga depois de excluir"</item>
     <item msgid="2189929276292165301">"Exibir a lista de conversas depois de excluir"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Limpar aprovações de fotos"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Limpar aprovações de fotos?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Não mostrar mais imagens inline de remetentes que você autorizou anteriormente."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> novas mensagens"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"Ações de arquivar e excluir"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, falo com você depois"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index b8a721738..6967e4b8b 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -486,9 +486,7 @@
     <skip />
     <!-- no translation found for message_details_title (2183394728494962332) -->
     <skip />
-    <!-- no translation found for auto_advance_label (3192951873988392119) -->
-    <skip />
-    <!-- no translation found for auto_advance_summary (573927628806250719) -->
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
     <skip />
     <!-- no translation found for auto_advance_help_title (8091541690538426090) -->
     <skip />
@@ -498,6 +496,8 @@
     <!-- no translation found for prefSummaries_autoAdvance:0 (6389534341359835440) -->
     <!-- no translation found for prefSummaries_autoAdvance:1 (732746454445519134) -->
     <!-- no translation found for prefSummaries_autoAdvance:2 (2189929276292165301) -->
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
     <skip />
     <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
@@ -534,8 +534,8 @@
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <!-- no translation found for label_notification_ticker (1684732605316462621) -->
     <skip />
-    <!-- no translation found for new_messages (4419173946074516420) -->
-    <skip />
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <!-- no translation found for single_new_message_notification_title (4138237430881084155) -->
     <skip />
     <!-- no translation found for silent_ringtone (5856834572357761687) -->
@@ -715,4 +715,34 @@
     <skip />
     <!-- no translation found for reply_choice_frowning_face (1620301664784374038) -->
     <skip />
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 53d8e4eef..42bcb7525 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Toate dosarele"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Dosare recente"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Detalii mesaj"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Înaintare automată"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Alegeţi ce ecran se afişează după ştergerea unui mesaj"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Setaţi preferinţa pentru înaintare automată\n(după ce ştergeţi etc.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Mai noi"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Afişaţi conversaţia mai veche după ce ştergeţi"</item>
     <item msgid="2189929276292165301">"Afişaţi lista de conversaţii după ce ştergeţi"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Ștergeți aprobările pentru imagini"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Ștergeți aprobările pentru imagini?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Nu mai afișați imaginile inline de la expeditori acceptați anterior."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje noi"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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">"Silențios"</string>
     <string name="preference_removal_action_title" msgid="6585232628422090835">"Arhivați și Ștergeți"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, revin mai târziu"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7cae0a219..5faf1d2df 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Все папки"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Последние папки"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Сведения о сообщении"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Автопереход"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Выберите, что вы хотите видеть после удаления письма"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Что показывать после\n удаления писем"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Следующее письмо"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Показывать более раннюю цепочку после удаления текущей"</item>
     <item msgid="2189929276292165301">"Показывать список цепочек после удаления текущей цепочки"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Запретить показ изображений"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Запретить показ изображений?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Вы действительно хотите запретить показ изображений в письмах?"</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Новых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"Архивация или удаление"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"ОК, отвечу позже"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 876d12816..4a2bd90f6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Všetky priečinky"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nedávne priečinky"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Podrobnosti správy"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Automatický prechod"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Vybrať, čo sa zobrazí po odstránení správy"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Preferovaný automatický prechod\n(po odstránení správy atď.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Novšia konverzácia"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Po odstránení zobraziť staršiu konverzáciu"</item>
     <item msgid="2189929276292165301">"Po odstránení zobraziť zoznam konverzácií"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Vymazať schválenia obrázkov"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Chcete vymazať schválenia obrázkov?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Prestanú sa zobrazovať vložené obrázky od odosielateľov, pre ktorých ste to predtým povolili."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Počet nových správ: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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">"Tichý režim"</string>
     <string name="preference_removal_action_title" msgid="6585232628422090835">"Akcie archivácie a odstránenia"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, odpíšem vám neskôr"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 69b0a3275..8f8f39938 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Vse mape"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Nedavne mape"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Podrobnosti sporočila"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Samodejno napredovanje"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Izberite, kateri zaslon naj se prikaže po brisanju sporočila"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Nastavitev samodejnega napredovanja \n(po brisanju ipd.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Novejši"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Po izbrisu pokaži starejši pogovor"</item>
     <item msgid="2189929276292165301">"Po izbrisu pokaži seznam pogovorov"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Izbriši odobritve slik"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Želite izbrisati odobritve slik?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Prenehanje prikazovanja slik v sporočilih pošiljateljev, za katere ste to v preteklosti odobrili."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Št. novih sporočil: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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">"Tiho"</string>
     <string name="preference_removal_action_title" msgid="6585232628422090835">"Dejanji arhiviranja in brisanja"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"V redu, se oglasim pozneje"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a183eeeb9..f3652974f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Сви директоријуми"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Недавни директоријуми"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Детаљи поруке"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Аутоматски пређи на"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Избор екрана који желите да прикажете након брисања поруке"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Аутоматски пређи на"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Подешавање аутоматског померања унапред\n(након брисања итд.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Новије"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Приказ старије преписке након брисања"</item>
     <item msgid="2189929276292165301">"Приказ листе преписки након брисања"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Пређи на"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Обриши одобрења за слике"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Желите ли да обришете одобрења за слике?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Престаните да приказујете уметнуте слике пошиљалаца које сте раније одобрили."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Нових порука: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> нова порука"</item>
+    <item quantity="other" msgid="6295442146249725952">"Нових порука: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Радње архивирања и брисања"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"У реду, јавићу вам се касније"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Потврде радњи"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Потврди пре брисања"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Потврди пре архивирања"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Потврди пре слања"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Аутоматски уклопи поруке"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Смањује поруке да би се уклопиле на екран"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Радње са порукама"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Увек приказуј радње са порукама у врху екрана"</item>
+    <item msgid="1197074110597228768">"Приказуј активности са порукама у врху екрана само када је положај промењен у вертикални"</item>
+    <item msgid="8496844279095098067">"Не приказуј радње са порукама ван заглавља поруке"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Увек прикажи"</item>
+    <item msgid="8546075502478857367">"Приказуј само у вертикалном положају"</item>
+    <item msgid="863690009910739926">"Не приказуј"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Обриши историју претраге"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Историја претраге је обрисана."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Желите ли да обришете историју претраге?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Све претраге које сте раније обавили биће уклоњене."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Управљање налозима"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 1646af43c..d58da7ff7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Alla mappar"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Senaste mapparna"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Meddelandeinfo"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Flytta automatiskt"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Välj vilken skärm som ska visas när du tar bort ett meddelande"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Flytta automatiskt"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Ange inställningar för automatisk flytt\n(efter borttagning osv.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Nyare"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Visa en äldre konversation efter borttagning"</item>
     <item msgid="2189929276292165301">"Visa konversationslistan efter borttagning"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Flytta till"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Ta bort godkännanden av bilder"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vill du ta bort godkännanden av bilder?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Sluta visa infogade bilder från avsändare vars bilder du tidigare har godkänt."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> nytt meddelande"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Åtgärderna arkivera och ta bort"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Okej, jag återkommer."</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Åtgärdsbekräftelser"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Bekräfta innan du tar bort"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Bekräfta innan du arkiverar"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Bekräfta innan du skickar"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Anpassa meddelanden automatiskt"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Förminska meddelandena så att de får plats på skärmen"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Aktiviteter för meddelanden"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Visa alltid aktiviteter för meddelanden högst upp på skärmen"</item>
+    <item msgid="1197074110597228768">"Visa endast aktiviteter för meddelanden högst upp på skärmen när telefonen är i stående läge"</item>
+    <item msgid="8496844279095098067">"Visa inte aktiviteter för meddelanden utanför meddelanderubriken"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Visa alltid"</item>
+    <item msgid="8546075502478857367">"Visa bara i stående läge"</item>
+    <item msgid="863690009910739926">"Visa inte"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Rensa sökhistoriken"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Sökhistoriken har rensats."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Vill du rensa sökhistoriken?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Alla dina sökningar kommer att tas bort."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Hantera konton"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2679f20c5..3eefdd9b8 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Folda zote"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Folda za hivi karibuni"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Maelezo ya ujumbe"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Endeleza kiotomatiki"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Chagua skrini ya kuonyesha baada ya kufuta barua pepe"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Endelea kiotomatiki"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Weka mapendeleo ya kuendeleza kiotomatiki\n(baada ya kufuta, n.k.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Mpya zaidi"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Onyesha mazungumzo ya zamani zaidi baada ya kufuta"</item>
     <item msgid="2189929276292165301">"Onyesha orodha ya mazungumzo baada ya kufuta"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Endelea kwa"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Futa uidhinishaji wa picha"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Ungependa kufuta uidhinishaji wa picha?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Acha kuonyesha picha zinazolingana na maandishi kutoka kwa watumaji uliowaruhusu hapo awali."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Barua pepe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
+    <item quantity="other" msgid="6295442146249725952">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</item>
+  </plurals>
     <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">"Kimya"</string>
     <string name="preference_removal_action_title" msgid="6585232628422090835">"Kuweka kwenye kumbukumbu na kufuta"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Sawa, nitawasiliane nawe baadaye"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Kuthibitisha kwa Vitendo"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Thibitisha kabla ya kufuta"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Thibitisha kabla ya kuhifadhi kwenye kumbukumbu"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Thibitisha kabla ya kutuma"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Pima barua pepe kiotomatiki"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Punguza barua pepe ili zitoshee kwenye skrini"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Yanayoweza kufanyiwa ujumbe"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Onyesha yanayoweza kufanyiwa barua pepe juu ya skrini kila wakati"</item>
+    <item msgid="1197074110597228768">"Onyesha yanayoweza kufanyiwa barua pepe juu ya skrini wakati iko wima"</item>
+    <item msgid="8496844279095098067">"Usionyeshe yanayoweza kufanyiwa ujumbe nje ya kichwa cha ujumbe"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Onyesha kila wakati"</item>
+    <item msgid="8546075502478857367">"Onyesha ikiwa wima pekee"</item>
+    <item msgid="863690009910739926">"Usionyeshe"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Futa historia ya utafutaji"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Historia ya utafutaji imefutwa."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Ungependa kufuta historia ya utafutaji?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Utafutaji wote uliotekeleza hapo awali utaondolewa."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Simamia Akaunti"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index fb86118b7..ca1a57ab7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"โฟลเดอร์ทั้งหมด"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"โฟลเดอร์ล่าสุด"</string>
     <string name="message_details_title" msgid="2183394728494962332">"รายละเอียดข้อความ"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"เลื่อนไปข้างหน้าโดยอัตโนมัติ"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"เลือกหน้าจอที่จะแสดงขึ้นหลังจากที่คุณลบข้อความ"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"เลื่อนไปข้างหน้าอัตโนมัติ"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"ตั้งค่ากำหนดเลื่อนอัตโนมัติ\n(หลังจากที่คุณลบ ฯลฯ)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"ใหม่กว่า"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"แสดงการสนทนาที่เก่ากว่าหลังจากลบ"</item>
     <item msgid="2189929276292165301">"แสดงรายการสนทนาหลังจากลบ"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"เลื่อนไปที่"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"ล้างการอนุมัติภาพ"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"ล้างการอนุมัติภาพไหม"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"หยุดการแสดงภาพในบรรทัดจากผู้ส่ง ที่คุณอนุญาตไว้ก่อนหน้านี้"</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"การดำเนินการ \"เก็บ\" และ \"ลบ\""</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"ตกลง ฉันจะติดต่อกลับมาภายหลัง"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"การยืนยันการทำงาน"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"ยืนยันก่อนลบ"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"ยืนยันก่อนเก็บถาวร"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"ยืนยันก่อนส่ง"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"ปรับข้อความให้พอดีโดยอัตโนมัติ"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"ย่อข้อความให้พอดีกับหน้าจอ"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"การทำงานกับข้อความ"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"แสดงการทำงานกับข้อความที่ด้านบนของหน้าจอทุกครั้ง"</item>
+    <item msgid="1197074110597228768">"แสดงการทำงานกับข้อความที่ด้านบนของหน้าจอเมื่อหมุนเป็นแนวตั้งเท่านั้น"</item>
+    <item msgid="8496844279095098067">"อย่าแสดงการทำงานกับข้อความนอกส่วนหัวของข้อความ"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"แสดงตลอดเวลา"</item>
+    <item msgid="8546075502478857367">"แสดงในแนวตั้งเท่านั้น"</item>
+    <item msgid="863690009910739926">"ไม่แสดง"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"ล้างประวัติการค้นหา"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"ล้างประวัติการค้นหาแล้ว"</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"ล้างประวัติการค้นหาไหม"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"ระบบจะนำการค้นหาทั้งหมดที่คุณได้ทำไปก่อนหน้านี้ออก"</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"จัดการบัญชี"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f24a6a91a..dcd271798 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Lahat ng folder"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Mga kamakailang folder"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Mga detalye ng mensahe"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"I-auto-advance"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Piliin ang screen na ipapakita pagkatapos magtanggal ng mensahe"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Magtakda ng nais na auto-advance\n(pagkatapos mong magtanggal, atbp.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Mas bago"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Magpakita ng mas lumang pag-uusap pagkatapos mong magtanggal"</item>
     <item msgid="2189929276292165301">"Ipakita ang listahan ng pag-uusap pagkatapos mong magtanggal"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"I-clear pag-apruba sa lararawan"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"I-clear ang mga pag-apruba sa larawan?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Huminto sa pagpapakita ng mga inline na larawan mula sa mga nagpadalang dati mong pinayagan."</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> (na) bagong mensahe"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"Mga pagkilos na i-archive at tanggalin"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, babalikan kita"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 18ee1dc9b..f9583551f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Tüm klasörler"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Son klasörler"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Mesaj ayrıntıları"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Otomatik ilerle"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Bir iletiyi sildikten sonra gösterilecek ekranı seçin"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Otomatik ilerleme tercihini ayarla\n(silme vb. sonrası)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Daha yeni"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"Sildikten sonra daha eski ileti dizisini göster"</item>
     <item msgid="2189929276292165301">"Sildikten sonra ileti dizisi listesini göster"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Resim onaylarını temizle"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Resim onayları temizlensin mi?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Önceden izin verdiğiniz gönderenlerden gelen satır içi resimleri görüntülemeyi durdur"</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> yeni ileti"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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">"Sessiz"</string>
     <string name="preference_removal_action_title" msgid="6585232628422090835">"Arşivleme ve silme işlemleri"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Tamam, sana dönerim"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1b83e77b7..778192f38 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Усі папки"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Останні папки"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Деталі повідомлення"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Автоматичний перехід"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Виберіть, що відображати після видалення повідомлення"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Автоматичний перехід"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Установити параметр автоматичного переходу\n(після видалення тощо)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Новіші"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Показувати старішу бесіду після видалення"</item>
     <item msgid="2189929276292165301">"Показувати список бесід після видалення"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Перейти до пункту"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Заборонити показ зображень"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Заборонити показ зображень?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Не показувати вставлені зображення від відправників, дозволені раніше."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"Нових повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> нове повідомлення"</item>
+    <item quantity="other" msgid="6295442146249725952">"Нових повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Архівування та видалення"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Добре, я відповім пізніше"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Підтвердження дій"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Підтвердити перед видаленням"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Підтвердити перед архівуванням"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Підтвердити перед надсиланням"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Автоматично вибирати розмір"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Зменшувати повідомлення до розмірів екрана"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Дії з повідомленнями"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Завжди показувати повідомлення про дії вгорі екрана"</item>
+    <item msgid="1197074110597228768">"Показувати повідомлення про дії вгорі екрана лише в книжковій орієнтації"</item>
+    <item msgid="8496844279095098067">"Не показувати повідомлення про дії за межами заголовка повідомлення"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Завжди показувати"</item>
+    <item msgid="8546075502478857367">"Показувати лише в книжковій орієнтації"</item>
+    <item msgid="863690009910739926">"Не показувати"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Очистити історію пошуку"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Історію пошуку очищено."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Очистити історію пошуку?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Усі пошукові запити, як ви вводили, буде видалено."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Керувати обліковими записами"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 67cdcbfef..919d03207 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Tất cả thư mục"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Thư mục gần đây"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Chi tiết tin nhắn"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Tự động tiến"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Chọn màn hình hiển thị sau khi bạn xóa thư"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Tự động tiến"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Đặt tùy chọn tự động tiến\n(sau khi bạn xóa, v.v.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Mới hơn"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Hiển thị cuộc hội thoại cũ hơn sau khi bạn xóa"</item>
     <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="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Chuyển sang"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Xóa phê duyệt ảnh"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Xóa phê duyệt ảnh?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Dừng hiển thị các hình ảnh nội tuyến từ người gửi bạn đã cho phép trước đó."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>: <xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> tin nhắn mới"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> tin nhắn mới"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> tin nhắn mới"</item>
+  </plurals>
     <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">"Im lặng"</string>
     <string name="preference_removal_action_title" msgid="6585232628422090835">"Tác vụ lưu trữ và xóa"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"OK, tôi sẽ liên hệ lại với bạn"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Xác nhận hành động"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Xác nhận trước khi xóa"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Xác nhận trước khi lưu trữ"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Xác nhận trước khi gửi"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Tự động chỉnh kích thước thư"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Thu hẹp kích thước thư cho vừa với màn hình"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Tác vụ thư"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Luôn hiển thị các tác vụ thư ở phía trên cùng của màn hình"</item>
+    <item msgid="1197074110597228768">"Chỉ hiển thị các tác vụ thư ở đỉnh màn hình khi được xoay sang chiều dọc"</item>
+    <item msgid="8496844279095098067">"Không hiển thị các tác vụ thư bên ngoài tiêu đề thư"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Luôn hiển thị"</item>
+    <item msgid="8546075502478857367">"Chỉ hiển thị theo chiều dọc"</item>
+    <item msgid="863690009910739926">"Không hiển thị"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Xóa lịch sử tìm kiếm"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Đã xóa lịch sử tìm kiếm."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Xóa lịch sử tìm kiếm?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Tất cả tìm kiếm bạn đã thực hiện trước đó sẽ bị xóa."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Quản lý tài khoản"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 34ec64b53..773fe88b7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"所有文件夹"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"近期文件夹"</string>
     <string name="message_details_title" msgid="2183394728494962332">"邮件详情"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"自动跳转"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"选择删除邮件后显示的屏幕"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"自动跳转偏好设置\n（在您执行删除等操作后）"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"后一个会话"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"在您执行删除操作后显示较旧的前一个会话"</item>
     <item msgid="2189929276292165301">"在您执行删除操作后显示会话列表"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"清除“显示图片”设置"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"是否要清除“显示图片”设置？"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"对于您之前允许显示其邮件内嵌图片的发件人，停止显示其邮件内的图片。"</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>：<xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"归档和删除操作"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"我会尽快回复你"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index de762e946..31e01e535 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"所有資料夾"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"最近使用的資料夾"</string>
     <string name="message_details_title" msgid="2183394728494962332">"郵件詳細資訊"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"自動前移"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"選擇在您刪除郵件後所要顯示的畫面"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"設定自動推進喜好設定\n(在刪除等操作後執行)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"較新"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"在刪除後顯示較舊的對話群組"</item>
     <item msgid="2189929276292165301">"在刪除後顯示對話群組清單"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"清除圖片核准"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"清除圖片核准？"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"不再顯示先前允許的寄件者傳送的內嵌圖片。"</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>：<xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> 則新訊息"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"封存及刪除操作"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"好，我稍後再回覆您"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e42ae2b96..7644b3447 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -320,8 +320,8 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"所有資料夾"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"最近使用的資料夾"</string>
     <string name="message_details_title" msgid="2183394728494962332">"郵件詳細資料"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"自動推進"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"選擇刪除郵件後所要顯示的畫面"</string>
+    <!-- no translation found for preference_advance_to_title (5129119549230481490) -->
+    <skip />
     <string name="auto_advance_help_title" msgid="8091541690538426090">"自動推進偏好設定\n(在刪除等動作完成後執行)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"較新"</item>
@@ -333,6 +333,8 @@
     <item msgid="732746454445519134">"在刪除動作完成後顯示較舊的會話群組"</item>
     <item msgid="2189929276292165301">"在刪除動作完成後顯示會話群組清單"</item>
   </string-array>
+    <!-- no translation found for prefDialogTitle_autoAdvance (6912968951235868060) -->
+    <skip />
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"清除圖片顯示許可"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"要清除圖片顯示許可？"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"對於您之前允許顯示其郵件內置圖片的寄件者，停止顯示其郵件內的圖片。"</string>
@@ -353,7 +355,8 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g>：<xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</string>
+    <!-- no translation found for new_messages:one (1039991646835933015) -->
+    <!-- no translation found for new_messages:other (6295442146249725952) -->
     <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_removal_action_title" msgid="6585232628422090835">"封存及刪除動作"</string>
@@ -460,4 +463,34 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"好，我稍後再回覆您"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <!-- no translation found for preference_header_action_confirmations (1764964041519032154) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_delete_title (950789555970278587) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_archive_title (237445234989486590) -->
+    <skip />
+    <!-- no translation found for preference_confirm_before_send_title (3718309715757387457) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_title (6712673875809375620) -->
+    <skip />
+    <!-- no translation found for preferences_conversation_mode_summary (6310522471722441546) -->
+    <skip />
+    <!-- no translation found for preferences_disable_snap_headers_title (7803887396971658547) -->
+    <skip />
+    <!-- no translation found for prefSummaries_snapHeader:0 (6008949895584107910) -->
+    <!-- no translation found for prefSummaries_snapHeader:1 (1197074110597228768) -->
+    <!-- no translation found for prefSummaries_snapHeader:2 (8496844279095098067) -->
+    <!-- no translation found for prefEntries_snapHeader:0 (8453672890190461527) -->
+    <!-- no translation found for prefEntries_snapHeader:1 (8546075502478857367) -->
+    <!-- no translation found for prefEntries_snapHeader:2 (863690009910739926) -->
+    <!-- no translation found for clear_history_title (8974919373315137028) -->
+    <skip />
+    <!-- no translation found for search_history_cleared (1524305711478787614) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_title (2726420681651913195) -->
+    <skip />
+    <!-- no translation found for clear_history_dialog_message (3779277353786135671) -->
+    <skip />
+    <!-- no translation found for manage_accounts_menu_item (1585009985898462502) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index a2c5e4bea..163b6bd78 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -320,8 +320,7 @@
     <string name="all_folders_heading" msgid="2506843494725730618">"Wonke amafolda"</string>
     <string name="recent_folders_heading" msgid="8613621794529777406">"Amafolda akamuva"</string>
     <string name="message_details_title" msgid="2183394728494962332">"Imininingwane yomlayezo"</string>
-    <string name="auto_advance_label" msgid="3192951873988392119">"Ukuthuthuka ngokuzenzakalela"</string>
-    <string name="auto_advance_summary" msgid="573927628806250719">"Khetha ukuthi isiphi isikrini esizoboniswa emuva kokuba ususe umyalezo"</string>
+    <string name="preference_advance_to_title" msgid="5129119549230481490">"Thuthukisa ngokuzenzakalela"</string>
     <string name="auto_advance_help_title" msgid="8091541690538426090">"Hlela izintandokazi zokuzenzakalelayo okudlulele\n (ngemuva kokususa, njalo-njalo.)"</string>
   <string-array name="prefEntries_autoAdvance">
     <item msgid="3400401085256526376">"Okusha kakhulu"</item>
@@ -333,6 +332,7 @@
     <item msgid="732746454445519134">"Bonisa ingxoxo endala ngemuva kokususa"</item>
     <item msgid="2189929276292165301">"Bonisa uhlu lwengxoxo ngemuva kokususa"</item>
   </string-array>
+    <string name="prefDialogTitle_autoAdvance" msgid="6912968951235868060">"Dlulela ku-"</string>
     <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Sula ukuvunywa kwesithombe"</string>
     <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Sula ukuvunywa kwesithombe?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Misa ukubonisa izithombe ezisemugqeni ezisuka kubathumeli obavumele ngaphambilini."</string>
@@ -353,7 +353,10 @@
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
     <string name="veiled_summary_unknown_person" msgid="4030928895738205054"></string>
     <string name="label_notification_ticker" msgid="1684732605316462621">"<xliff:g id="LABEL">%s</xliff:g><xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
-    <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emisha"</string>
+  <plurals name="new_messages">
+    <item quantity="one" msgid="1039991646835933015">"<xliff:g id="COUNT">%1$d</xliff:g> umlayezo omusha"</item>
+    <item quantity="other" msgid="6295442146249725952">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emisha"</item>
+  </plurals>
     <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_removal_action_title" msgid="6585232628422090835">"Izenzo zokufaka kungobo yomlando nokususa"</string>
@@ -460,4 +463,26 @@
     <string name="reply_choice_later" msgid="6294535370720117768">"Kulungile, ngizobuya kuwe"</string>
     <string name="reply_choice_smiling_face" msgid="7319371040013238561">":)"</string>
     <string name="reply_choice_frowning_face" msgid="1620301664784374038">":("</string>
+    <string name="preference_header_action_confirmations" msgid="1764964041519032154">"Ukuqinisekiswa kwesenzo"</string>
+    <string name="preference_confirm_before_delete_title" msgid="950789555970278587">"Qinisekisa ngaphambi kokususa"</string>
+    <string name="preference_confirm_before_archive_title" msgid="237445234989486590">"Qinisekisa ngaphambi kokufaka kungobo yomlando"</string>
+    <string name="preference_confirm_before_send_title" msgid="3718309715757387457">"Qinisekisa ngaphambi kokuthumela"</string>
+    <string name="preferences_conversation_mode_title" msgid="6712673875809375620">"Linganisa ngokuzenzakalela imilayezo"</string>
+    <string name="preferences_conversation_mode_summary" msgid="6310522471722441546">"Nciphisa imilayezo ukuze ilingane isikrini"</string>
+    <string name="preferences_disable_snap_headers_title" msgid="7803887396971658547">"Izenzo zomlayezo"</string>
+  <string-array name="prefSummaries_snapHeader">
+    <item msgid="6008949895584107910">"Bonisa njalo izenzo zemlayezo ngaphezu kwesikrini"</item>
+    <item msgid="1197074110597228768">"Bonisa kuphela izenzo zomlayezo ngaphezulu kwesikrini uma ijikiselwe ekumeni ngobude"</item>
+    <item msgid="8496844279095098067">"Ungabonisi izenzo zomlayezo ngaphandle kwesihloko somlayezo"</item>
+  </string-array>
+  <string-array name="prefEntries_snapHeader">
+    <item msgid="8453672890190461527">"Bonisa njalo"</item>
+    <item msgid="8546075502478857367">"Bonisa kuphela ekumeni ngobude"</item>
+    <item msgid="863690009910739926">"Ungabonisi"</item>
+  </string-array>
+    <string name="clear_history_title" msgid="8974919373315137028">"Sula umlando wokusesha"</string>
+    <string name="search_history_cleared" msgid="1524305711478787614">"Umlando wokusesha usuliwe."</string>
+    <string name="clear_history_dialog_title" msgid="2726420681651913195">"Sula umlando wokusesha?"</string>
+    <string name="clear_history_dialog_message" msgid="3779277353786135671">"Konke ukusesha okwenzile ngokudlule kuzosuswa."</string>
+    <string name="manage_accounts_menu_item" msgid="1585009985898462502">"Phatha ama-akhawunti"</string>
 </resources>