Merge "Change default colors for labels" into jb-mr2-dev
diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml
index e0aad9f..6bfab15 100644
--- a/res/layout/conversation_item_view_normal.xml
+++ b/res/layout/conversation_item_view_normal.xml
@@ -152,7 +152,8 @@
                     android:id="@+id/subject"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="48dp"
+                    android:layout_toLeftOf="@id/star"
+                    android:layout_marginRight="14dp"
                     android:lines="2"
                     android:textSize="13sp"
                     android:includeFontPadding="false"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0b97d70..7f97f15 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -276,7 +276,7 @@
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Klaar"</string>
     <string name="cancel" msgid="8762981157252199115">"Kanselleer"</string>
-    <string name="clear" msgid="3184687982186479442">"Vee uit"</string>
+    <string name="clear" msgid="3184687982186479442">"Maak skoon"</string>
     <string name="close" msgid="419945428844076406">"Maak toe"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Geen vouers is vir hierdie rekening opgestel nie."</string>
   <string-array name="sync_status">
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Krimp wye boodskappe om op jou skerm te pas en laat zoem toe. Om hierdie opsie af te skakel, gaan na Instellings &gt; Algemene instellings."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Antwoord"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Antwoord almal"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Stuur aan"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Argiveer"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Verwyder etiket"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Vee uit"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Merk as gelees"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Geargiveer"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiket verwyder"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Uitgevee"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nie gestel nie"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NUUT"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Voorkeur ActionBar-items"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Kies tot <xliff:g id="MAX">%1$d</xliff:g> handelinge"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Etiket: argiveer/verwyder"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Konsepte: vee uit/gooi weg"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Merk as gelees/ongelees"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Ster: voeg by/verwyder"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Merk as (on)belangrik"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Gee aan as (nie) strooipos"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Trek af om te verfris"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kyk tans vir pos"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 282d8dd..93b8d96 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"ሰፊ መልዕክቶች ከማያ ገጽዎ ጋር እንዲመጣጠኑ እና ማጉላትን ለማስቻል ያሳንሷቸው። ይህን አማራጭ ለማጥፋት ወደ &gt; አጠቃላይ ቅንብሮች ይሂዱ።"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"ምላሽ ይስጡ"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"ለሁሉም ምላሽ ይስጡ"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"ያስተላልፉ"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"በማህደር ያስቀምጡ"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"መለያ ስም ያስወግዱ"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"ይሰርዙ"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"መነበቡን ምልክት ያድርጉበት"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"በማህደር የተቀመጠ"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"መለያ ስም ተወግዷል"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"ተሰርዟል"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"አልተወሰነም"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> አዲስ"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"የተመረጡ የActionBar ንጥሎች"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"እስከ <xliff:g id="MAX">%1$d</xliff:g> እርምጃዎች ይምረጡ"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"መለያ ስም በማህደር አስቀምጥ/አስወግድ"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"ረቂቆችን ሰርዝ/አስወግድ"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"እንደተነበበ/እንዳልተነበበ ምልክት አድርግበት"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"ኮከብ አክል/አስወግድ"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"አስፈላጊ እንደሆነ/እንዳልሆነ ምልክት ያድርጉበት"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"አይፈለጌ መልዕክት (አለ)መሆኑን ሪፖርት አድርግ"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"ለማደስ ወደ ታች ያንሸራትቱ"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"መልዕክት በማየት ላይ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7319bc4..3fecacd 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"يمكنك تصغير الرسائل الكبيرة لتناسب شاشتك كما يمكنك السماح بالتكبير. لإيقاف هذا الخيار، انتقل إلى إعدادات &gt; إعدادات عامة."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"رد"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"الرد على الكل"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"إعادة توجيه"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"وضع في الأرشيف"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"إزالة التصنيف"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"حذف"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"وضع علامة كـ \"مقروءة\""</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"تمت الأرشفة"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"تمت إزالة التصنيف"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"تم الحذف"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"لم يتم التعيين"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> جديدة"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"عناصر شريط الإجراءات المفضلة"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"تحديد ما يصل إلى <xliff:g id="MAX">%1$d</xliff:g> من الإجراءات"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"أرشفة/إزالة تصنيف"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"حذف/إلغاء المسودات"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"وضع علامة كمقروءة/غير مقروءة"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"إضافة/إزالة نجمة"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"وضع علامة كمهمة/غير مهمة"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"إبلاغ أنها رسالة غير مرغوب فيها/ليست رسالة غير مرغوب فيها"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"التمرير لأسفل للتحديث"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"التحقق من وجود بريد"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 34bcaf0..ee4576d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Звужвайце шырокiя паведамленнi ў адпаведнасці з вашым экранам і павелічвайце маштаб. Каб адключыць гэту опцыю, перайдзіце ў меню Налады &gt; Агульныя налады."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Адказаць"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Адказаць усім"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Наперад"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архіваваць"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Выдаліць цэтлік"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Выдаліць"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Пазначыць як прачытанае"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Заархiвавана"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Цэтлiк выдалены"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Выдалены"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Дзеянні не заданыя"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"НОВЫХ: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Пераважныя элементы ActionBar"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Максiмальная колькасць прыкладанняў для вашага выбару: <xliff:g id="MAX">%1$d</xliff:g>"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Архiваваць/выдаліць цэтлiк"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Выдаліць/адмяніць чарнавiкi"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Пазначыць прачытаныя/непрачытаныя"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Дадац/выдаліць зорку"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Пазначыць як важнае/няважнае"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Паведамiць, што гэта спам/не спам"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Правядзіце ўніз, каб абнавіць"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Праверка пошты"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3b62aa2..3b221a2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Намалете голямата ширина на съобщенията, за да се поберат на екрана ви, и разрешете увеличаването на мащаба. За да изключите тази опция, отворете „Настройки“ &gt; „Общи настройки“."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Отговор"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Отговор до всички"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Препращане"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архивиране"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Етикет: Премахване"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Изтриване"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Означ. като прочетено"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Архивирано"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Етикетът е премахнат"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Изтрито"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Незададени"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> НОВИ"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Предпочитани елементи в лентата за действие"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Изберете до <xliff:g id="MAX">%1$d</xliff:g> действия"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Архив./премахване на етикет"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Изтрив./отхвърл. на чернови"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Означ. като прочетено/непроч."</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Добавяне/премахване на звезда"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Означ. като важно (маловажно)"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Подав. на сигнал „(Не е) Спам“"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Прекарайте пръст надолу, за да опресните"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверява се за поща"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0c174b8..9c907af 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Canvia la mida dels missatges perquè s\'ajustin a la pantalla i permet ampliar-los. Per desactivar aquesta opció, vés a Configuració &gt; General."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Respon"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Respon a tots"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Reenvia"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arxiva"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Elimina l\'etiqueta"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Suprimeix"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Marca com a llegit"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arxivat"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiqueta eliminada"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Suprimit"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Sense definir"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"NOUS: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Elements preferits de la barra d\'accions"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selecciona <xliff:g id="MAX">%1$d</xliff:g> accions com a màxim"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arxiva/suprimeix una etiqueta"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Suprimeix/descarta esborranys"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Marca com a llegit/no llegit"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Afegeix/suprimeix una estrella"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Marca com a (no) important"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Indica que (no) és brossa"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fes lliscar el dit cap avall per actualitzar."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"S\'està comprovant si hi ha correu."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8279421..4883c13 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Zmenšit široké zprávy, aby se vešly na obrazovku, a umožnit přiblížení. Chcete-li povolit tuto možnost, přejděte na Nastavení &gt; Obecná nastavení."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odpovědět"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odpovědět všem"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Předat dál"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivovat"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Odebrat štítek"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Smazat"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Označ. jako přečtené"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Archivováno"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Štítek odstraněn"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Smazáno"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nenastaveno"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"NOVÉ: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Upřednostňované položky na panelu akcí"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Vyberte akce (maximálně <xliff:g id="MAX">%1$d</xliff:g>)"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivovat/odstranit štítek"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Smazat/zahodit koncepty"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Ozn. jako přečtené/nepřečtené"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Přidat/odebrat hvězdičku"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Označit jako (ne)důležité"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"(Ne)nahlásit jako spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Seznam aktualizujete posunutím dolů."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 114c8cc..13156d8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Gør brede meddelelser mindre, så de passer til din skærm og for at gøre det muligt at zoome ind. Hvis du vil deaktivere denne indstilling, skal du gå til Indstillinger &gt; Generelle indstillinger."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Svar"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Svar alle"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Videresend"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkivér"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Fjern etiket"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Slet"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Markér som læst"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arkiveret"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiketten blev fjernet"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Slettet"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Endnu ikke angivet"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NYE"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Foretrukne Actionbar-elementer"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Vælg op til <xliff:g id="MAX">%1$d</xliff:g> handlinger"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arkivér/fjern etiket"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Slet/kassér kladder"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Markér som læst/ulæst"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Tilføj/fjern stjerne"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Markér som vigtig/ikke vigtig"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Rapportér (ikke) som spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Stryg ned for at opdatere"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tjekker for e-mails"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5101e64..e318c95 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Breite Nachrichten an Ihren Bildschirm anpassen und Heranzoomen ermöglichen. Um diese Option zu deaktivieren, rufen Sie \"Einstellungen\" &gt; \"Allgemeine Einstellungen\" auf."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Antworten"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Allen antworten"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Weiterleiten"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivieren"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Label entfernen"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Löschen"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Als gelesen markieren"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Archiviert"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label entfernt"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Gelöscht"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nicht definiert"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> neu"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Bevorzugte ActionBar-Elemente"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Bis zu <xliff:g id="MAX">%1$d</xliff:g> Aktionen auswählen"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Label archivieren/entfernen"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Entwürfe löschen"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Als gelesen/ungelesen markieren"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Markierung hinzuf./entf."</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Als (nicht) wichtig markieren"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"(Nicht) als Spam melden"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Zum Aktualisieren nach unten wischen"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Nachrichten werden abgerufen..."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8821ff9..0db701e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Συρρικνώστε τα μεγάλα μηνύματα για να χωράνε στην οθόνη και να είναι δυνατή η μεγέθυνσή τους. Για να απενεργοποιήσετε αυτήν την επιλογή, μεταβείτε στο μενού Ρυθμίσεις &gt; Γενικές ρυθμίσεις."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Απάντηση"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Απάντηση σε όλους"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Προώθηση"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Αρχειοθέτηση"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Κατάργηση ετικέτας"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Διαγραφή"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Επισήμανση ως αναγν."</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Αρχειοθετημένο"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Η ετικέτα καταργήθηκε"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Διαγραμμένο"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Δεν έχει ρυθμιστεί"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> ΝΕΑ"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Προτιμώμενα στοιχεία ActionBar"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Επιλέξτε έως και <xliff:g id="MAX">%1$d</xliff:g> ενέργειες"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Αρχειοθ./κατάργηση ετικέτας"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Διαγραφή/απόρριψη προχείρων"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Επισήμανση ως αναγν./μη αναγν."</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Προσθήκη/κατάργηση αστεριού"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Επισήμανση ως (μη) σημαντικού"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Αναφορά ως (μη) ανεπιθύμητου"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Σύρετε προς τα κάτω για ανανέωση"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Γίνεται έλεγχος για αλληλογραφία"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fb78bc8..87babbd 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Shrink wide messages to fit your screen and allow zooming in. To turn off this option, go to Settings &gt; General settings."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Reply"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Reply all"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Forward"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archive"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Remove label"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Delete"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Mark as read"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Archived"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label Removed"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Deleted"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Not set"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,12 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NEW"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Preferred ActionBar items"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Select up to <xliff:g id="MAX">%1$d</xliff:g> actions"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Archive/Remove Label"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Delete/Discard drafts"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Mark Read/Unread"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Add/Remove Star"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Mark (not) important"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Report not spam"</string>
+    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Remove action"</string>
+    <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Delete rather than archive conversations"</string>
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swipe down to refresh"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Checking for mail"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ddba260..ab496ea 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Reduce el tamaño de los mensajes más anchos para que se adapten a la pantalla y amplíalos para verlos más de cerca. Para desactivar esta opción, ve a Configuración &gt; Configuración general."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Reenviar"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivar"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Eliminar etiqueta"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Eliminar"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcar como leído"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Archivado"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiqueta eliminada"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Eliminado"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"No se estableció"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NUEVOS"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Elementos preferidos de la barra de acciones"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Seleccionar hasta <xliff:g id="MAX">%1$d</xliff:g> acciones"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivar o eliminar etiqueta"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Eliminar o descartar borradores"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcar como leídos o no leídos"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Agregar o eliminar estrella"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Marcar como (no) importante"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Informar que (no) es spam"</string>
-    <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslizar el dedo hacia abajo para actualizar"</string>
-    <string name="checking_for_mail" msgid="2301797903350897130">"Comprobando si hay correo electrónico"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
+    <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Desliza el dedo hacia abajo para actualizar."</string>
+    <string name="checking_for_mail" msgid="2301797903350897130">"Comprobando si hay correo electrónico…"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9aac8a7..57dde13 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Ajusta los mensajes grandes al tamaño de la pantalla y amplía la vista. Para desactivar esta opción, accede a Ajustes &gt; Ajustes generales."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Reenviar"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivar"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Eliminar etiqueta"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Eliminar"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcar como leído"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Archivado"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiqueta eliminada"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Eliminado"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"No definido"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NUEVOS"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Elementos de barra de acción preferidos"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Seleccionar hasta <xliff:g id="MAX">%1$d</xliff:g> acciones"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivar/eliminar etiqueta"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Eliminar/descartar borradores"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcar como leído/no leído"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Añadir/eliminar estrella"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Marcar como (no) importante"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Informar de que (no) es spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslizar hacia abajo para actualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Buscando correo electrónico..."</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 842e843..e42b0cf 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Laiade sõnumite kahandamine, nii et need mahuksid ekraanile ja suurendamise lubamine. Valiku sisselülitamiseks valige Seaded &gt; Üldseaded."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Vasta"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Vasta kõigile"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Edasta"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhiveeri"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Eemalda silt"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Kustuta"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Märgi loetuks"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhiveeritud"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Silt on eemaldatud"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Kustutatud"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Määramata"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"UUSI: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Eelistatud toiminguriba üksused"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Valige kuni <xliff:g id="MAX">%1$d</xliff:g> toimingut"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhiveeri/eemalda silt"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Kustuta mustandid / loobu mustanditest"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Märgi loetuks/lugemata"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Lisa/eemalda tärn"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Märgi (mitte)oluliseks"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Teata, et on/pole rämpspost(i)"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Värskendamiseks pühkige alla"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"E-posti kontrollimine"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 489c82f..de7b8a6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -39,7 +39,7 @@
     <string name="forward_attribution" msgid="1498936339458535158">"---------- پیام باز ارسال شده ----------&lt;br&gt;فرستنده: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Date: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;موضوع: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;گیرنده: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="cc_attribution" msgid="374493748526504562">"Cc: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="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_single" msgid="2996733972478212136">"فایل بیش از <xliff:g id="MAXSIZE">%1$s</xliff:g> قابل پیوست نیست."</string>
     <string name="too_large_to_attach_multiple" msgid="5452547998184881210">"یک یا چند فایل پیوست نشده است. حداکثر ظرفیت <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="3366607594339390249">"فایل پیوست نشد. فراتر از حداکثر ظرفیت <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"پیوست فایل انجام نشد."</string>
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"پیام‌های گسترده را متناسب با صفحه شما کوچک می‌کند و امکان بزرگنمایی را بوجود می‌آورد. برای غیرفعال کردن این گزینه به تنظیمات &gt; تنظیمات عمومی بروید."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"پاسخ"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"پاسخ به همه"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"بازارسال"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"آرشیو"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"حذف برچسب"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"حذف"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"علامت بعنوان خوانده"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"بایگانی شد"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"برچسب حذف شد"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"حذف شده"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"تنظیم نشده است"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> پیام جدید"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"موارد ActionBar دلخواه"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"حداکثر <xliff:g id="MAX">%1$d</xliff:g> عملکرد را انتخاب کنید"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"بایگانی/حذف برچسب"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"حذف/صرفنظر کردن از پیش‌نویس‌ها"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"علامت‌گذاری به عنوان خوانده شده/خوانده نشده"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"افزودن/حذف ستاره"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"علامت‌گذاری به‌ عنوان (غیر)مهم"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"گزارش به عنوان (غیر)هرزنامه"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"برای بازخوانی، صفحه را با انگشت به سمت پایین بکشید"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"در حال بررسی برای ایمیل"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d60be8f..a6ead3a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Kutista leveät viestit ruutuun sopiviksi ja salli zoomaus. Voit poistaa tämän asetuksen käytöstä kohdassa Asetukset &gt; Yleisasetukset."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Vastaa"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Vastaa kaikille"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Seuraava"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkistoi"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Poista tunniste"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Poista"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Merkitse luetuksi"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arkistoitu"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Tunniste on poistettu"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Poistettu"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ei asetettu"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> UUTTA"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Ensisijaiset ActionBar-kohteet"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Valitse korkeintaan <xliff:g id="MAX">%1$d</xliff:g> toimintoa"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arkistoi/poista tunniste"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Poista/hylkää luonnokset"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Merkitse luetuksi/lukemattom."</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Lisää/poista tähti"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Merkitse (ei-)tärkeäksi"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Merkitse (ei-)roskapostiksi"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Päivitä liu\'uttamalla alas"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tarkistetaan sähköposteja"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e20e9f1..38da476 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Réduisez la taille des messages les plus larges de sorte qu\'ils soient ajustés à votre écran et autorisez les zooms avant. Pour désactiver cette option, sélectionnez Paramètres &gt; Paramètres généraux."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Répondre"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Répondre à tous"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Transférer"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archiver"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Supprimer le libellé"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Supprimer"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Marquer comme lu"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Message archivé."</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Libellé supprimé."</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Message supprimé."</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Non défini"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NOUVEAUX"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Éléments favoris de la barre d\'actions"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Sélectionner <xliff:g id="MAX">%1$d</xliff:g> actions au maximum"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Archiver/Supprimer un libellé"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Supprimer des brouillons"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Marquer comme lu/non lu"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Ajouter/Supprimer une étoile"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Marquer comme important ou non"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Signaler comme spam/non-spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Faire glisser le doigt vers le bas pour actualiser"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Vérification des e-mails en cours…"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 2016ed6..30c4112 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"बड़े संदेशों को अपनी स्क्रीन में फ़िट करने के लिए उन्हें सिकोड़ें और ज़ूम इन करने दें. इस विकल्प को बंद करने के लिए, सेटिंग &gt; सामान्य सेटिंग पर जाएं."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"जवाब दें"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"सभी को जवाब दें"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"अग्रेषित करें"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"संग्रहीत करें"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"लेबल निकालें"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"हटाएं"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"पठित चिह्नित करें"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"संग्रहीत"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"लेबल निकाल दिया गया"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"हटा दिया गया"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"सेट नहीं है"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> नए"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"पसंदीदा ActionBar आइटम"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"अधिकतम <xliff:g id="MAX">%1$d</xliff:g> क्रियाएं चुनें"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"लेबल संगृहीत करें/निकालें"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"ड्राफ़्ट हटाएं/खारिज करें"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"पठित/अपठित चिह्नित करें"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"तारा जोड़ें/निकालें"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"महत्वपूर्ण (नहीं) चिह्नित करें"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"स्पैम (नहीं) रिपोर्ट करें"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"रीफ्रेश करने के लिए नीचे स्वाइप करें"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"मेल के लिए जांच की जा रही है"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 635c772..df40d53 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Sažmite široke poruke kako bi se prilagodile zaslonu i omogućite povećavanje prikaza. Da biste isključili tu opciju, idite na Postavke &gt; Opće postavke."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odgovori"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odgovori svima"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Proslijedi"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhiva"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Ukloni oznaku"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Izbriši"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Označi pročitanim"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhivirano"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Oznaka je uklonjena"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Izbrisano"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nije postavljeno"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"NOVE PORUKE (<xliff:g id="NUMBER">%d</xliff:g>)"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Željene stavke trake radnje"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Odaberite najviše ovoliko radnji: <xliff:g id="MAX">%1$d</xliff:g>"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhiviraj/ukloni oznaku"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Izbriši/odbaci nacrte"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Označi pročitanim/nepročitanim"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Dodaj/ukloni zvjezdicu"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Označi kao (ne)važno"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Prijavi da (ni)je než. pošta"</string>
-    <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Prijeđite prstom prema dolje  za osvježivanje"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
+    <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Prijeđite prstom prema dolje za osvježivanje"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Provjeravanje pošte"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c063b83..1801786 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Összenyomja a széles üzeneteket, és lehetővé teszi a  nagyítást. A funkció kikapcsolásához válassza a Beállítások &gt; Általános beállítások lehetőséget."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Válasz"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Válasz mindenkinek"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Továbbítás"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archiválás"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Címke eltávolítása"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Törlés"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Olvasott"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Archiválva"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Címke eltávolítva"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Törölve"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nincs megadva"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> ÚJ"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Előnyben részesített elemek a műveleti sávon"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Legfeljebb <xliff:g id="MAX">%1$d</xliff:g> műveletet válasszon ki"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Címke archiválása/eltávolítása"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Vázlatok törlése/elvetése"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Megjelölés (nem) olvasottként"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Csillag hozzáad./eltávolítása"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Megjelölés (nem) fontosként"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Ez (nem) spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Frissítéshez húzza le"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"E-mail ellenőrzése"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 09edb33..5dfe785 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Mampatkan pesan yang lebar agar pas dengan layar Anda dan memungkinkan pembesaran. Untuk mematikan opsi ini, buka Setelan &gt; Setelan umum."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Balas"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Balas ke semua"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Teruskan"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arsipkan"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Hapus label"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Hapus"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Tandai sudah dibaca"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Diarsipkan"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label Dihapus"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Dihapus"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Belum siap"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> BARU"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Item BilahTindakan yang dipilih"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Pilih hingga <xliff:g id="MAX">%1$d</xliff:g> tindakan"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arsipkan/Hapus Label"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Hapus/Buang draf"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Tandai Dibaca/Belum Dibaca"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Tambah/Hapus Bintang"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Tandai sebagai (tidak) penting"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Laporkan sebagai (bukan) spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Gesek ke bawah untuk menyegarkan"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Memeriksa email"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8a2d8dd..781a46a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Restringi i messaggi larghi per adattarli allo schermo e consenti lo zoom in avanti. Per disattivare questa opzione, vai a Impostazioni &gt; Impostazioni generali."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Rispondi"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Rispondi a tutti"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Inoltra"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivia"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Rimuovi etichetta"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Elimina"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Segna come già letto"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Archiviato"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etichetta rimossa"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Eliminato"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Non impostata"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NUOVI"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Voci preferite della barra delle azioni"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Seleziona fino a <xliff:g id="MAX">%1$d</xliff:g> azioni"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivia/Rimuovi etichetta"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Elimina/Annulla bozze"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Segna come letto/da leggere"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Aggiungi a/Rimuovi da Speciali"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Segna come non importante"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Segnala come (non) spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fai scorrere verso il basso per aggiornare"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Controllo della posta"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index fa06424..45daa29 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"כווץ הודעות רחבות כדי שיתאימו למסך וכדי לאפשר שינוי של מרחק התצוגה. כדי לכבות אפשרות זו, עבור אל \'הגדרות\' &gt; \'הגדרות כלליות\'."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"השב"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"השב לכולם"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"העבר"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"שלח לארכיון"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"הסר תווית"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"מחק"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"סמן כנקראה"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"הועברה לארכיון"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"התווית הוסרה"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"נמחקה"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"לא מוגדר"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> חדשות"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"פריטים מועדפים בסרגל הפעולות"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"בחר עד <xliff:g id="MAX">%1$d</xliff:g> פעולות"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"העבר לארכיון/הסר תווית"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"מחק טיוטות"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"סמן כנקרא/לא נקרא"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"הוסף/הסר כוכב"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"סמן כ(לא) חשוב"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"דווח כ(לא) דואר זבל"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"החלק מטה לביצוע רענון"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"בודק אם יש דואר"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7adccf8..ce93033 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"横長のメッセージが画面に合わせて自動で調整され、拡大することもできます。このオプションをオフにするには、[設定] &gt; [全般設定]を選択します。"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"返信"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"全員に返信"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"転送"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"アーカイブ"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"ラベルを削除"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"削除"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"既読にする"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"アーカイブ済み"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"ラベル削除済み"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"削除済み"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"未設定"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g>件の新着"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"ActionBarの優先アイテム"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"最大<xliff:g id="MAX">%1$d</xliff:g>個の操作を選択"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"ラベルをアーカイブ/削除"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"下書きを削除/破棄"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"既読/未読にする"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"スターを付ける/外す"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"重要マークを付ける(外す)"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"迷惑メール(でないこと)を報告"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下にスワイプして更新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"メールを確認しています"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bb578b1..7a6e966 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"메일의 너비가 화면에 맞도록 크기를 축소하고, 확대 기능을 지원합니다. 이 옵션을 사용 중지하려면 설정 &gt; 일반 설정으로 이동합니다."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"답장"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"전체답장"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"전달"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"보관처리"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"라벨 삭제"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"삭제"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"읽음으로 표시"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"보관처리됨"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"라벨 삭제됨"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"삭제됨"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"설정되지 않음"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g>개의 새 이메일"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"기본 ActionBar 항목"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"액션을 최대 <xliff:g id="MAX">%1$d</xliff:g>개까지 선택"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"라벨 보관처리/삭제"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"임시보관 메일 삭제/취소"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"읽음/읽지 않음 표시"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"별표 추가/삭제"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"중요/중요하지 않음으로 표시"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"스팸 신고/해제"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"아래로 스와이프하여 새로고침"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"메일 확인 중"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f0566ef..8e00df3 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Sumažinkite plačius pranešimus, kad jie tilptų jūsų ekrane, ir įgalinkite mastelio keitimą. Jei norite išjungti šią parinktį, eikite į „Nustatymai“ &gt; „Bendrieji nustatymai“."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Atsakyti"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Atsakyti visiems"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Persiųsti"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archyvuoti"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Pašalinti etiketę"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Ištrinti"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Žymėti raudonai"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Suarchyvuota"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiketė pašalinta"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Ištrinta"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nenustatyta"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"NAUJA: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Pageidaujami veiksmų juostos elementai"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Pasirinkite iki <xliff:g id="MAX">%1$d</xliff:g> veiksm."</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Archyvuoti / pašalinti etiketę"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Ištrinti / išmesti juodr."</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Pažym. kaip skait. / neskait."</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Pridėti / pašalinti žvaigždutę"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Pažymėti kaip (ne)svarbų"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Praneš., kad tai (ne)šlamštas"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Perbraukite žemyn, kad atnaujintumėte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ieškoma laiškų"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b012a2c..62b99da 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Samaziniet ziņojumu lielumu, lai ietilpinātu tos ekrānā, un atļaujiet tuvināšanu. Lai izslēgtu šo opciju, dodieties uz izvēlni Iestatījumi &gt; Vispārīgi iestatījumi."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Atbildēt"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Atbildēt visiem"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Pārsūtīt"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhivēt"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Noņemt iezīmi"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Dzēst"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Atzīmēt kā izlasītu"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhivēts"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Iezīme noņemta"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Dzēsts"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nav iestatīts"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"JAUNI (<xliff:g id="NUMBER">%d</xliff:g>)"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Vajadzīgie darbību joslas vienumi"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Atlasiet ne vairāk kā <xliff:g id="MAX">%1$d</xliff:g> darbības"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhivēt/noņemt iezīmi"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Dzēst/nerādīt melnrakstus"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Atzīmēt kā lasītu/nelasītu"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Pievienot/noņemt zvaigznīti"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Atzīmēt kā svarīgu/nesvarīgu"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Ziņot, ka tā ir/nav mēstule"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Lai atsvaidzinātu, velciet uz leju."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Notiek e-pasta pārbaude"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6b21dc9..d60de2b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Mengecutkan mesej lebar agar muat pada skrin anda dan membenarkan zum masuk. Untuk mematikan pilihan ini sila pergi ke Tetapan &gt; Tetapan umum."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Balas"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Balas kepada semua"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Kirim semula"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkib"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Alih keluar label"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Padam"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Tandakan dibaca"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Diarkibkan"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label Dialih Keluar"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Dipadamkan"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Tidak ditetapkan"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> BAHARU"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Item ActionBar pilihan"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Pilih sehingga <xliff:g id="MAX">%1$d</xliff:g> tindakan"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arkibkan/Alih Keluar Label"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Padam/Buang draf"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Tandakan Dibaca/Belum Dibaca"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Tambah/Alih Keluar Bintang"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Tandakan (tidak) penting"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Laporkan (bukan) spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Leret ke bawah untuk memuat semula"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Menyemak mel"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 31b4da9..89b0d30 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Krymp brede e-poster slik at de tilpasses skjermen din og tillat zooming. Gå til Innstillinger &gt; Generelle innstillinger for å deaktivere dette alternativet."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Svar"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Svar alle"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Videresend"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkivér"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Fjern etikett"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Slett"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Merk som lest"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arkivert"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiketten er fjernet"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Slettet"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ikke angitt"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NYE"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Foretrukne handlingsrad-elementer"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Velg inntil <xliff:g id="MAX">%1$d</xliff:g> handlinger"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Lagre eller fjern etikett"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Slett eller forkast utkast"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Merk som lest eller ulest"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Legg til eller fjern stjerne"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Merk som uviktig"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Rapportér som ikke-nettsøppel"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Sveip ned for å laste inn på nytt"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ser etter e-post"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5636bd1..1e76232 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Verklein brede berichten tot ze op uw scherm passen en sta inzoomen toe. Als u deze optie wilt uitschakelen, gaat u naar \'Instellingen &gt; Algemene instellingen\'."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Beantwoorden"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Allen beantwoorden"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Doorsturen"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archiveren"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Label verwijderen"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Verwijderen"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Markeren als gelezen"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Gearchiveerd"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label verwijderd"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Verwijderd"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Niet ingesteld"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NIEUW"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Voorkeursitems voor actiebalk"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selecteer maximaal <xliff:g id="MAX">%1$d</xliff:g> acties"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Label archiveren/verwijderen"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Concepten verwijderen/weggooien"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Markeren als gelezen/ongelezen"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Ster toevoegen/verwijderen"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Markeren als (niet) belangrijk"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Melden dat dit (geen) spam is"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Veeg omlaag om te vernieuwen"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Controleren op e-mail"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4ae21a9..b60a53a 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -366,15 +366,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Zmniejsz wiadomości zajmujące dużo miejsca w poziomie, by pasowały do ekranu, i zezwól na powiększanie. Aby wyłączyć tę opcję, wybierz kolejno Ustawienia &gt; Ustawienia ogólne."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odpowiedz"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odpowiedz wszystkim"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Przekaż dalej"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archiwizuj"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Usuń etykietę"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Usuń"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Oznacz jako przeczytane"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Zarchiwizowano"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etykieta usunięta"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Usunięto"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nie ustawiono"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -384,14 +381,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"NOWE: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Preferowane elementy na pasku akcji"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Wybierz nie więcej niż <xliff:g id="MAX">%1$d</xliff:g> czynności"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Zarchiwizuj/usuń etykietę"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Usuń/odrzuć wersje robocze"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Oznacz jako (nie)przeczytane"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Dodaj/usuń gwiazdkę"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Oznacz jako (nie)ważne"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Zgłoś jako (nie)spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Przesuń w dół, by odświeżyć"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Sprawdzam pocztę"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 994fb4f..e6aa5d9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Encolha mensagens compridas para que se ajustem ao ecrã e possa ampliá-las. Para desligar esta opção, aceda a Definições &gt; Definições gerais."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Encaminhar"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arquivo"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Remover marcador"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Eliminar"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcar como lida"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arquivada"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Marcador Removido"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Eliminado"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Não definido"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NOVAS"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Itens ActionBar preferidos"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selecione até <xliff:g id="MAX">%1$d</xliff:g> ações"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arquivar/Remover Marcador"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Eliminar/Rejeitar rascunhos"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcar como Lido/Não Lido"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Adicionar/Remover Estrela"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Marcar como (não) importante"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Informar de que (não) é spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize rapidamente para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"A verificar a existência de correio"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a811d42..6f45dc9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Reduz mensagens largas para que caibam na tela e permite aumentar zoom. Para desativar esta opção, vá para \"Configurações\" &gt; \"Configurações gerais\"."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Encaminhar"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arquivar"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Remover marcador"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Excluir"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcar como lida"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arquivada"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Marcador removido"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Excluída"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Não definido"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NOVAS"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Itens preferenciais da ActionBar"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selecione até <xliff:g id="MAX">%1$d</xliff:g> ações"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arquivar/Remover marcador"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Excluir/Descartar rascunhos"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcar como lida/não lida"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Adicionar/Remover estrela"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Marcar como não importante"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Não é spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Verificando e-mail"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index dc8abb7..d3cef82 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -568,24 +568,18 @@
     <skip />
     <!-- no translation found for notification_action_reply_all (20020468410400912) -->
     <skip />
-    <!-- no translation found for notification_action_forward (7252777659544972497) -->
-    <skip />
     <!-- no translation found for notification_action_archive (81978513898440040) -->
     <skip />
     <!-- no translation found for notification_action_remove_label (5852730267411032291) -->
     <skip />
     <!-- no translation found for notification_action_delete (327773454111551791) -->
     <skip />
-    <!-- no translation found for notification_action_mark_read (4351952818740163225) -->
-    <skip />
     <!-- no translation found for notification_action_undo_archive (7280710366587361219) -->
     <skip />
     <!-- no translation found for notification_action_undo_remove_label (1425192858683932457) -->
     <skip />
     <!-- no translation found for notification_action_undo_delete (3105611327110905438) -->
     <skip />
-    <!-- no translation found for notification_action_preference_summary_not_set (8168109255072452703) -->
-    <skip />
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -600,21 +594,13 @@
     <skip />
     <!-- no translation found for inbox_unseen_banner (4561582938706814621) -->
     <skip />
-    <!-- no translation found for preference_preferred_actionbar_items (1494873630787823560) -->
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
     <skip />
-    <!-- no translation found for preference_preferred_actionbar_items_dialog_title (7547680637775341220) -->
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
     <skip />
-    <!-- no translation found for action_archive_remove_label (2373265427931131215) -->
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
     <skip />
-    <!-- no translation found for action_delete_discard_drafts (3398268725115377135) -->
-    <skip />
-    <!-- no translation found for action_mark_read_unread (3532210270682619853) -->
-    <skip />
-    <!-- no translation found for action_add_remove_star (6658875981206117895) -->
-    <skip />
-    <!-- no translation found for action_mark_not_important (7097443517025742878) -->
-    <skip />
-    <!-- no translation found for action_report_not_spam (7491310680850552208) -->
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
     <skip />
     <!-- no translation found for swipe_down_to_refresh (6401908905820786227) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 026fb1c..438dab5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Micşoraţi dimensiunea mesajelor late pentru ca acestea să încapă pe ecran şi să le puteţi mări. Pentru a dezactiva această opţiune, accesaţi Setări &gt; Setări generale."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Răspundeți"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Răspundeți tuturor"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Redirecționați"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhivați"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Eliminați eticheta"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Ștergeți"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcați ca citit"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhivat"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Eticheta a fost eliminată"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Șters"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nesetat"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NOI"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Elemente preferate în Bara de acțiuni"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selectați până la <xliff:g id="MAX">%1$d</xliff:g> (de) acțiuni"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhivați/eliminați o etichetă"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Ștergeți mesajele nefinalizate"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcați drept citit/necitit"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Adăugați/eliminați o stea"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Marcați ca (ne)important"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Semnalați ca „(Nu) este spam”"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Glisați în jos pentru actualizare"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Se verifică e-mailurile"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 95bdaa4..f14d5c1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Окно просмотра писем меняется в соответствии с размером экрана. Чтобы отключить функцию, перейдите в раздел \"Общие настройки\"."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Ответить"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Ответить всем"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Переслать"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архивировать"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Удалить ярлык"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Удалить"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Прочитано"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Отправлено в архив"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Ярлык удален"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Удалено"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Не задано"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"НОВЫХ: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Элементы на панели действий"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Выберите элементы (не больше <xliff:g id="MAX">%1$d</xliff:g>)"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Архивировать/удалить ярлык"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Удалить черновики"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Пометить как прочитанное/непрочитанное"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Добавить/удалить пометку"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Отметить как важное/неважное"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Спам/не спам"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Пролистните вниз, чтобы обновить"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверка почты…"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2ee6fa6..fde4870 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Zmenšite široké správy, aby sa vošli na obrazovku, a umožnite približovanie. Ak chcete povoliť túto možnosť, prejdite na možnosť Nastavenia &gt; Všeobecné nastavenia."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odpovedať"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odpovedať všetkým"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Poslať ďalej"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Archivovať"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Odstrániť menovku"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Odstrániť"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Ozn. ako prečítané"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Archivované"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Menovka bola odstránená"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Odstránené"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nenastavené"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"NOVÉ: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Uprednostňované položky panela akcií"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Akcie: vyberte maximálne <xliff:g id="MAX">%1$d</xliff:g>"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivovať/odstrániť menovku"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Odstrániť/zahodiť koncepty"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Označiť ako (ne)prečítané"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Pridať/odstrániť hviezdičku"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Označiť ako (ne)dôležité"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"(Ne)nahlásiť ako spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Potiahnutím nadol obnovte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 51d58ae..c4394ef 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Skrčite dolga sporočila, da se prilegajo zaslonu, in dovolite povečavo. To možnost lahko izklopite v Nastavitve &gt; Splošne nastavitve."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Odgovori"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Odgovori vsem"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Posreduj"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arhiviraj"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Odstrani oznako"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Izbriši"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Označi kot prebrano"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhivirano"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Oznaka odstranjena"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Izbrisano"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ni nastavljeno"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"ŠT. NOVIH: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Prednostni elementi za ActionBar"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Izberete lahko največ toliko dejanj: <xliff:g id="MAX">%1$d</xliff:g>"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhiviraj/odstrani oznako"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Izbriši/zavrzi osnutke"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Označi kot prebrano/neprebrano"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Dodaj/odstrani zvezdico"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Označi kot (ne)pomembno"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Ni/je vsiljena pošta"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Za osvežitev povlecite navzdol"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Preverjanje pošte"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c982ef9..791c792 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Смањите широке поруке да би се уклопиле у екран и омогућите увећавање. Да бисте искључили ову опцију, идите на Подешавања &gt; Општа подешавања."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Одговори"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Одговори свима"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Проследи"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архивирај"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Уклони ознаку"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Избриши"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Означи као прочитано"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Архивирано"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Ознака је уклоњена"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Избрисано"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Није подешено"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"НОВИХ: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Жељене ставке са траке за радње"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Избор радњи (највише <xliff:g id="MAX">%1$d</xliff:g>)"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Архивирај/уклони ознаку"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Избриши/одбаци недовршене"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Означи као прочитано/непрочит."</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Додај/уклони звездицу"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Означи као (не)важно"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Пријави као (не)пожељно"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Листајте надоле да бисте освежили"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверавање поште"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 29f47c5..2dd4ca3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Gör stora meddelanden mindre så att de får plats på skärmen och möjliggör inzoomning. Om du vill stänga av det här alternativet öppnar du Inställningar &gt; Allmänna inställningar."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Svara"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Svara alla"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Vidarebefordra"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arkivera"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Ta bort etikett"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Ta bort"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Markera som läst"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arkiverat"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiketten har tagits bort"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Borttaget"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Har inte angetts"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> NYA"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Önskade ActionBar-objekt"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Välj upp till <xliff:g id="MAX">%1$d</xliff:g> åtgärder"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Arkivera/ta bort etikett"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Ta bort/släng utkast"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Markera som läst/oläst"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Lägg till/ta bort stjärna"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Inte viktigt"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Inte skräppost"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Dra nedåt om du vill uppdatera"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Söker efter e-post"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 147775c..9968fe0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Kunja ujumbe mpana ili utoshee kwenye skrini yako na uruhusu ukuzaji karibu. Ili kuzima chaguo hili, nenda kwenye Mipangilio &gt; mipagilio ya Jumla."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Jibu"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Jibu wote"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Sambaza"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Kumbukumbu"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Ondoa lebo"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Futa"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Tia alama kuwa imesomwa"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Imewekwa kwenye kumbukumbu"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Lebo Imeondolewa"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Imefutwa"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Haijawekwa"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> MPYA"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Vipengee vya ActionBar vinavyopendelewa"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Chagua hadi vitendo <xliff:g id="MAX">%1$d</xliff:g>"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Weka kwenye kumbukumbu/Ondoa Lebo"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Futa/Tupa rasimu"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Tia alama Soma/Hazijasomwa"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Ongeza/Ondoa Nyota"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Tia alama kuwa (siyo) muhimu"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Ripoti kuwa (siyo) barua taka"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Papasa kwa kasi kwenda chini ili kuonyesha upya"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Inaangalia barua pepe"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1f6d975..3bbb13e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"หดข้อความที่ยาวให้พอดีกับหน้าจอของคุณและอนุญาตให้ขยายได้ หากต้องการปิดตัวเลือกนี้ ให้ไปที่การตั้งค่า &gt; การตั้งค่าทั่วไป"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"ตอบ"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"ตอบทั้งหมด"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"ส่งต่อ"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"เก็บถาวร"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"ลบป้ายกำกับ"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"ลบ"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"อ่านแล้ว"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"เก็บถาวรแล้ว"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"ลบป้ายกำกับแล้ว"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"ลบแล้ว"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"ไม่ได้ตั้งค่า"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> ข้อความใหม่"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"รายการ ActionBar ที่ต้องการ"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"เลือกการทำงานได้สูงสุด <xliff:g id="MAX">%1$d</xliff:g> รายการ"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"เก็บถาวร/นำป้ายกำกับออก"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"ลบ/ยกเลิกข้อความร่าง"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"ทำเครื่องหมายว่าอ่านแล้ว/ยังไม่ได้อ่าน"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"เพิ่ม/นำดาวออก"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"ทำเครื่องหมายว่า (ไม่) สำคัญ"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"รายงานว่า (ไม่ใช่) สแปม"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"กวาดลงเพื่อรีเฟรช"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"กำลังตรวจดูจดหมาย"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index ef31b4f..178865b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Paliitin ang malalapad na mensahe upang magkasya sa iyong screen at payagan ang pag-zoom in. Upang i-off ang pagpipiliang ito, pumunta sa Mga Setting &gt; Mga pangkalahatang setting."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Tumugon"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Tumugon sa lahat"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Ipasa"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"I-archive"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Alisin ang label"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Tanggalin"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Markahang nabasa na"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Na-archive"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Inalis ang Label"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Tinanggal"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Hindi nakatakda"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> (na) BAGO"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Mga gustong item sa ActionBar"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Pumili ng hanggang <xliff:g id="MAX">%1$d</xliff:g> (na) pagkilos"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"I-archive/Alisin ang Label"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Tanggalin/Itapon ang mga draft"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Markahang Nabasa/Di pa nabasa"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Magdagdag/Mag-alis ng Star"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Markahang (hindi) mahalaga"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Iulat na (hindi) spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Mag-swipe pababa upang mag-refresh"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tumitingin ng mail"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 516adf1..d40c000 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Uzun iletileri ekranınıza sığdırmak için küçültün ve yakınlaştırmaya izin verin. Bu seçeneği kapatmak için Ayarlar &gt; Genel ayarlar seçeneğine gidin."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Yanıtla"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Tümünü yanıtla"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Yönlendir"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Arşivle"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Etiketi kaldır"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Sil"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Okundu olarak işaretle"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Arşivlendi"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiket Kaldırıldı"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Silindi"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ayarlanmadı"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> YENİ"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Tercih edilen İşlem Çubuğu öğeleri"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"En çok <xliff:g id="MAX">%1$d</xliff:g> işlem seçin"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Etiketi Arşivle/Kaldır"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Taslakları Sil"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Okundu/Okunmadı olarak işaretle"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Yıldız Ekle/Kaldır"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Önemli/önemsiz olarak işaretle"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Spam olduğunu/olmadığını bildir"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Yenilemek için aşağı hızlıca kaydırın"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Posta kontrol ediliyor"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f38ee1c..2211532 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Великі повідомлення змінюються відповідно до розміру екрана, а також їх можна наближати. Щоб вимкнути цей параметр, перейдіть у Налаштування &gt; Загальні налаштування."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Відповісти"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Відповісти всім"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Переслати"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Архівувати"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Вилучити мітку"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Видалити"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Позначити як прочитане"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Архів"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Мітку вилучено"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Видалено"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Не встановлено"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"НОВИХ: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Вибрані параметри панелі дій"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Виберіть щонайбільше стільки дій: <xliff:g id="MAX">%1$d</xliff:g>"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Додати/зняти мітку"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Видалити/відхилити чернетки"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Позначити як прочит./непрочит."</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Додати/зняти зірочку"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Позначити як (не)важливе"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Позначити, що це (не) спам"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Проведіть пальцем униз, щоб оновити"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Перевірка пошти"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 24733a5..4aacc9d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Co tin nhắn rộng cho vừa với màn hình và cho phép phóng to. Để tắt tùy chọn này, đi tới Cài đặt &gt; Cài đặt chung."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Trả lời"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Trả lời tất cả"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Chuyển tiếp"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Lưu trữ"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Xóa nhãn"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Xóa"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Đánh dấu là đã đọc"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Đã lưu trữ"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Đã xóa nhãn"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Đã xóa"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Chưa được đặt"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> MỚI"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Mục được ưa thích trên thanh tác vụ"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Chọn tối đa <xliff:g id="MAX">%1$d</xliff:g> tác vụ"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Lưu trữ/xóa nhãn"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Xóa/hủy thư nháp"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Đánh dấu là đã đọc/chưa đọc"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Thêm/xóa dấu sao"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Đánh dấu là (không) quan trọng"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Báo cáo (không phải) spam"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Vuốt xuống để làm mới"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Đang kiểm tra thư"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2ce594c..5c4fa4d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"缩小过宽的邮件内容,使其适应屏幕大小。您还可以自行放大邮件内容以使其更易阅读。要关闭此选项,请转到“设置”&gt;“常规设置”。"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"回复"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"全部回复"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"转发"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"归档"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"删除标签"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"删除"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"标为已读"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"已归档"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"已删除标签"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"已删除"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"未设置"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g>封新邮件"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"首选操作栏项"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"最多可选择<xliff:g id="MAX">%1$d</xliff:g>项操作"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"归档/移除标签"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"删除/舍弃草稿"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"标为已读/未读"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"添加/删除星标"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"标为(不)重要"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"举报(非)垃圾邮件"</string>
-    <string name="swipe_down_to_refresh" msgid="6401908905820786227">"向下滑动即可刷新"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
+    <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下拉即可刷新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在检查邮件"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ccd441d..f573c88 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"根據螢幕大小縮小寬版郵件,並可讓您放大畫面。如要關閉這個選項,請前往 [設定] &gt; [一般設定]。"</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"回覆"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"回覆所有人"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"轉寄"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"封存"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"移除標籤"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"刪除"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"標示為已讀"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"已封存"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"已移除標籤"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"已刪除"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"未設定"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> 封新郵件"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"偏好的動作列項目"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"選取動作 (最多可選取 <xliff:g id="MAX">%1$d</xliff:g> 項)"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"封存/移除標籤"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"刪除/捨棄草稿"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"標示為已讀/未讀"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"加上/移除星號"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"標示為重要/不重要"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"回報垃圾郵件/非垃圾郵件"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"向下滑動即可重新整理"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在檢查郵件"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index fade126..02fe7db 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -368,15 +368,12 @@
     <string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Shwabanisa imilayezo ebanzi ukuze ilingane isikrini sakho futhi ivumele ukusondezwa kwesithombe. Ukuze uvale lokhu kukhetha hamba kuzilungiselelo &gt; izilungiselelo ezijwayelekile."</string>
     <string name="notification_action_reply" msgid="6015299134424685297">"Phendula"</string>
     <string name="notification_action_reply_all" msgid="20020468410400912">"Phendula konke"</string>
-    <string name="notification_action_forward" msgid="7252777659544972497">"Dlulisela phambili"</string>
     <string name="notification_action_archive" msgid="81978513898440040">"Faka kungobo yomlando"</string>
     <string name="notification_action_remove_label" msgid="5852730267411032291">"Khipha ilebula"</string>
     <string name="notification_action_delete" msgid="327773454111551791">"Susa"</string>
-    <string name="notification_action_mark_read" msgid="4351952818740163225">"Maka njengokufundiwe"</string>
     <string name="notification_action_undo_archive" msgid="7280710366587361219">"Okufakwe kungobo yomlando"</string>
     <string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Ilebula isusiwe"</string>
     <string name="notification_action_undo_delete" msgid="3105611327110905438">"Kususiwe"</string>
-    <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ayisethiwe"</string>
     <string name="veiled_address" msgid="1209670815434513191"></string>
     <string name="veiled_alternate_text" msgid="7370933826442034211"></string>
     <string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,14 +383,14 @@
     <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="inbox_unseen_banner" msgid="4561582938706814621">"<xliff:g id="NUMBER">%d</xliff:g> OKUSHA"</string>
-    <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Izinto ze-ActionBar ezincanyelwayo"</string>
-    <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Khetha kuze kufinyelela kuzenzo ezingu-<xliff:g id="MAX">%1$d</xliff:g>"</string>
-    <string name="action_archive_remove_label" msgid="2373265427931131215">"Faka kungobo yomlando/susa ilebula"</string>
-    <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Susa/lahla okusalungiswa"</string>
-    <string name="action_mark_read_unread" msgid="3532210270682619853">"Maka okufundiwe/okungafundiwe"</string>
-    <string name="action_add_remove_star" msgid="6658875981206117895">"Engeza/susa inkanyezi"</string>
-    <string name="action_mark_not_important" msgid="7097443517025742878">"Maka (okungabalulekile)"</string>
-    <string name="action_report_not_spam" msgid="7491310680850552208">"Bika (okungekona) ugaxekile"</string>
+    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <skip />
+    <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title (807579971507624260) -->
+    <skip />
+    <!-- no translation found for preference_swipe_description (5132683510510041028) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swayiphela phansi ukuze uqale kabusha"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ihlolela imeyili"</string>
 </resources>
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 7470f7c..b2fbcf6 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -851,7 +851,7 @@
     }
 
     private void checkSyncStatus() {
-        if (mFolder.isSyncInProgress()) {
+        if (mFolder != null && mFolder.isSyncInProgress()) {
             // Still syncing, ignore
         } else {
             // Finished syncing: