am ccf9a34b: Add support for disabling email sanitization * commit 'ccf9a34bcdcfdb884799ea3f3ecbd425970f26fc': Add support for disabling email sanitization

commit: 99710c6cef8a0537c85afcd2618d95c7755865e6 [log] [tgz]
author: James Lemieux <jplemieux@google.com> Sun Nov 02 18:57:49 2014 +0000
committer: Android Git Automerger <android-git-automerger@android.com> Sun Nov 02 18:57:49 2014 +0000
tree: 5955521c6f623975fb69913441fb10767bb22699
parent: 9dada6a9d6ddfa99b1f204239b080121001a1c36 [diff]
parent: ccf9a34bcdcfdb884799ea3f3ecbd425970f26fc [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 348fc62..3ce96a9 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Stoor konsep"</string>
     <string name="discard" msgid="4905982179911608430">"Gooi weg"</string>
     <string name="compose" msgid="2602861958391035523">"Skryf"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Skryf"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Antwoord"</item>
     <item msgid="2767793214788399009">"Antwoord almal"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Een of meer lêers nie aangeheg nie. Beperking <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Lêer nie aangeheg nie. <xliff:g id="MAXSIZE">%1$s</xliff:g> limiet bereik."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Kon nie lêer aanheg nie."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Toestemming is vir die aanhegsel geweier."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Voeg ten minste een ontvanger by."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Ontvangerfout"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Stuur boodskap?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Stuur terugvoer"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Skuif gesprek"</item>
+    <item quantity="other" msgid="6639576653114141743">"Skuif <xliff:g id="ID_1">%1$d</xliff:g> gesprekke"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> oor <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> op <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> oor <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> om <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"gesprek gelees"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Bekyk besonderhede&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Versteek details"</string>
     <string name="to_message_header" msgid="3954385178027011919">"aan <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Wys kontakinligting vir <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Wys kontakinligting"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ouer boodskappe"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Laai tans <xliff:g id="COUNT">%1$d</xliff:g> ouer boodskappe"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Van:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Antwoord aan:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Aan: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"E-posvouer"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Verander vouers"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Skuif na"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Soek"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Deursoek e-pos"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Stemsoek word nie op hierdie toestel gesteun nie."</string>
     <string name="network_error" msgid="5931164247644972255">"Geen verbinding nie"</string>
     <string name="retry" msgid="916102442074217293">"Herprobeer"</string>
     <string name="load_more" msgid="8702691358453560575">"Laai nóg"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Stil"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Standaard handeling"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Argiveer- en uitvee-handelinge"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Argief"</item>
-    <item msgid="2567465476369142505">"Vee uit"</item>
+    <item msgid="954772302016538814">"Wys net geargiveer"</item>
+    <item msgid="7212690302706180254">"Wys net uitgevee"</item>
+    <item msgid="2539051197590685708">"Wys geargiveer en uitgevee"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Argief"</item>
-    <item msgid="6088164268501960435">"Vee uit"</item>
+    <item msgid="6877416142040695022">"Wys net geargiveer"</item>
+    <item msgid="1510017057984222376">"Wys net uitgevee"</item>
+    <item msgid="3196207224108008441">"Wys geargiveer en uitgevee"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Standaard handeling"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Argiveer- en uitvee-handelinge"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Antwoord almal"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Gebruik as verstek vir antwoorde op boodskappe"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Veehandelinge"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Sleep om te argiveer"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Sleep om uit te vee"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"In gespreklys"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Stuurderprent"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Wys langs naam in gespreklys"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Vouer-ikoon"</string>
     <string name="add_account" msgid="5905863370226612377">"Voeg rekening by"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Maak wenk toe"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Outo-sinkronisering is af. Raak om aan te skakel."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Rekeningsinkronisering is af. Skakel dit aan in &lt;a href=\'http://www.example.com\'&gt;Rekeninginstellings.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> ongestuur in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Skakel outo-sinkroniseer aan?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Veranderinge wat jy aan alle programme en rekeninge maak, nie net in Gmail nie, sal tussen die web, jou ander toestelle en jou <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> gesinkroniseer word."</string>
     <string name="phone" msgid="4142617042507912053">"foon"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Skakel aan"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Wys <xliff:g id="NUMBER">%1$s</xliff:g> vouers"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Wys nog <xliff:g id="NUMBER">%1$s</xliff:g> vouers"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Versteek vouers"</string>
     <string name="print" msgid="7987949243936577207">"Druk uit"</string>
     <string name="print_all" msgid="4011022762279519941">"Druk alles uit"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Bestuur rekeninge"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Algemene instellings"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Instellings"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Nog opsies"</string>
 </resources>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9e7af05..4489622 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"ረቂቅ አስቀምጥ"</string>
     <string name="discard" msgid="4905982179911608430">"አስወግድ"</string>
     <string name="compose" msgid="2602861958391035523">"አዲስ ጻፍ"</string>
-    <string name="compose_title" msgid="5673376086133995913">"ጽሁፍ አቀናብር"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"ምላሽ ስጥ"</item>
     <item msgid="2767793214788399009">"ለሁሉም ምላሽ ስጥ"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"አንድ ወይም ከዚያ በላይ ፋይሎች አልተያያዙም። ገደብ <xliff:g id="MAXSIZE">%1$s</xliff:g>።"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ፋይል አልተያያዘም። የ<xliff:g id="MAXSIZE">%1$s</xliff:g> ገደቡ ተደርሷል።"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ፋይል ማያያዝ አልተቻለም።"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"ለዓባሪው ፍቃድ ተከልክሏል።"</string>
     <string name="recipient_needed" msgid="319816879398937214">"ቢያንስ አንድ ተቀባይ አክል።"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"የተቀባይ ስህተት"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"መልዕክት ይላከ?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"ግብረ-መልስ ላክ"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"ውይይት አንቀሳቅስ"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> ውይይቶች አንቀሳቅስ"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> ስለ<xliff:g id="SUBJECT">%3$s</xliff:g>፣ <xliff:g id="SNIPPET">%4$s</xliff:g> በ<xliff:g id="DATE">%5$s</xliff:g> ላይ፣ <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> ስለ<xliff:g id="SUBJECT">%3$s</xliff:g>፣ <xliff:g id="SNIPPET">%4$s</xliff:g> በ<xliff:g id="TIME">%5$s</xliff:g> ላይ፣ <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"የተነበበ ውይይት"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;ዝርዝሮችን ይመልከቱ&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"ዝርዝሮችን ደብቅ"</string>
     <string name="to_message_header" msgid="3954385178027011919">"ለ<xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"ስውር ቅጂ፦ "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"የ<xliff:g id="NAME">%1$s</xliff:g> የእውቂያ መረጃ አሳይ"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"የዕውቂያ መረጃ አሳይ"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> የቆዩ መልዕክቶች"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> የቆዩ መልዕክቶችን በመጫን ላይ"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"ከ፦"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"መልስ ለ፦"</string>
     <string name="to_heading" msgid="3495203282540398336">"ለ፦ "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"የኢሜይል አቃፊ"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"አቃፊዎችን ይቀይሩ"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"ውሰድ ወደ"</string>
-    <string name="search_hint" msgid="7060626585689391003">"ፍለጋ"</string>
+    <string name="search_hint" msgid="4916671414132334289">"መልዕክት ፈልግ"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"የድምጽ ፍለጋ በዚህ መሣሪያ ላይ አይደገፍም።"</string>
     <string name="network_error" msgid="5931164247644972255">"ምንም ግንኙነት የለም"</string>
     <string name="retry" msgid="916102442074217293">"እንደገና ሞክር"</string>
     <string name="load_more" msgid="8702691358453560575">"ተጨማሪ ስቀል"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"ፀጥታ"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"ነባሪ እርምጃ"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"በማህደር የማስቀመጥ እና የመሰረዝ እርምጃዎች"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"በማህደር አስቀምጥ"</item>
-    <item msgid="2567465476369142505">"ሰርዝ"</item>
+    <item msgid="954772302016538814">"በማህደር አስቀምጥ ብቻ አሳይ"</item>
+    <item msgid="7212690302706180254">"ሰርዝ ብቻ አሳይ"</item>
+    <item msgid="2539051197590685708">"በማህደር አስቀምጥ እና ሰርዝ አሳይ"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"በማህደር አስቀምጥ"</item>
-    <item msgid="6088164268501960435">"ሰርዝ"</item>
+    <item msgid="6877416142040695022">"በማህደር አስቀምጥ ብቻ አሳይ"</item>
+    <item msgid="1510017057984222376">"ሰርዝ ብቻ አሳይ"</item>
+    <item msgid="3196207224108008441">"በማህደር አስቀምጥ እና ሰርዝ አሳይ"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"ነባሪ እርምጃ"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"በማህደር የማስቀመጥ እና የመሰረዝ እርምጃዎች"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"ለሁሉም ምላሽ ይስጡ"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"ለመልዕክት ምላሾች እንደ ነባሪ ተጠቀምበት"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"የማንሸራተት እርምጃዎች"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"በማህደር ለማስቀመጥ ያንሸራትቱ"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"ለመሰረዝ ያንሸራቱ"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"በውይይት ዝርዝር ውስጥ"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"የላኪ ምስል"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"በውይይት ዝርዝር ውስጥ ከስም ጎን አሳይ"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"የአቃፊ አዶ"</string>
     <string name="add_account" msgid="5905863370226612377">"መለያ ያክሉ"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"ጠቃሚ ምክሩን ያሰናብቱ"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"ራስ-አመሳስል ጠፍቷል። ለማብራት ይንኩ።"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"መለያ አመሳስል ጠፍቷል። በ&lt;a href=\'http://www.example.com\'&gt;የመለያ ቅንብሮች&lt;/a&gt; ውስጥ ያብሩት።"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> ያልተላከ በ<xliff:g id="OUTBOX">%2$s</xliff:g> ውስጥ"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"ራስ-አመሳስል ይብራ?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"በGmail ላይ ብቻ ሳይሆን በሁሉም መተግበሪያዎች እና መለያዎች ላይ የሚያደርጓቸው ለውጦች በድር፣ ሌሎች የእርስዎ መሣሪያዎች እና በእርስዎ <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> መካከል ይመሳሰላሉ።"</string>
     <string name="phone" msgid="4142617042507912053">"ስልክ"</string>
     <string name="tablet" msgid="4593581125469224791">"ጡባዊ"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"አብራ"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> አቃፊዎችን አሳይ"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"ተጨማሪ <xliff:g id="NUMBER">%1$s</xliff:g> አቃፊዎችን አሳይ"</string>
     <string name="hide_folders" msgid="7618891933409521283">"አቃፊዎችን ደብቅ"</string>
     <string name="print" msgid="7987949243936577207">"አትም"</string>
     <string name="print_all" msgid="4011022762279519941">"ሁሉንም አትም"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"መለያዎችን ያቀናብሩ"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"አጠቃላይ ቅንብሮች"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"ቅንብሮች"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"ተጨማሪ አማራጮች"</string>
 </resources>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c014263..e674100 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"حفظ كمسودة"</string>
     <string name="discard" msgid="4905982179911608430">"تجاهل"</string>
     <string name="compose" msgid="2602861958391035523">"إنشاء"</string>
-    <string name="compose_title" msgid="5673376086133995913">"إنشاء"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"رد"</item>
     <item msgid="2767793214788399009">"رد على الكل"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"لم يتم إرفاق ملف أو أكثر. الحد الأقصى هو <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"لم يتم إرفاق الملف. تم بلوغ حد الحجم الأقصى <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"تعذر إرفاق الملف."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"تم رفض الإذن الخاص بالمرفق."</string>
     <string name="recipient_needed" msgid="319816879398937214">"أضف مستلمًا واحدًا على الأقل."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"خطأ في المستلم"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"هل تريد إرسال الرسالة؟"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"إرسال تعليقات"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"نقل المحادثة"</item>
+    <item quantity="other" msgid="6639576653114141743">"نقل <xliff:g id="ID_1">%1$d</xliff:g> من المحادثات"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> بشأن <xliff:g id="SUBJECT">%3$s</xliff:g>، <xliff:g id="SNIPPET">%4$s</xliff:g> في <xliff:g id="DATE">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> بشأن <xliff:g id="SUBJECT">%3$s</xliff:g>، <xliff:g id="SNIPPET">%4$s</xliff:g> في <xliff:g id="TIME">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"تمت قراءة المحادثة"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"‏<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;عرض التفاصيل&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"إخفاء التفاصيل"</string>
     <string name="to_message_header" msgid="3954385178027011919">"إلى <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"نسخة مخفية الوجهة: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"عرض معلومات جهة الاتصال لـ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"عرض معلومات جهة الاتصال"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"الرسائل القديمة: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"جارٍ تحميل <xliff:g id="COUNT">%1$d</xliff:g> من الرسائل القديمة"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"من:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"جهة الرد:"</string>
     <string name="to_heading" msgid="3495203282540398336">"إلى: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"مجلد البريد الإلكتروني"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"تغيير المجلدات"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"نقل إلى"</string>
-    <string name="search_hint" msgid="7060626585689391003">"بحث"</string>
+    <string name="search_hint" msgid="4916671414132334289">"بحث في البريد"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"البحث الصوتي غير مدعوم على هذا الجهاز."</string>
     <string name="network_error" msgid="5931164247644972255">"ليس هناك اتصال"</string>
     <string name="retry" msgid="916102442074217293">"إعادة المحاولة"</string>
     <string name="load_more" msgid="8702691358453560575">"تحميل المزيد"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"صامت"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"إجراء افتراضي"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"إجراءات الأرشيف والحذف"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"وضع في الأرشيف"</item>
-    <item msgid="2567465476369142505">"الحذف"</item>
+    <item msgid="954772302016538814">"عرض الأرشيف فقط"</item>
+    <item msgid="7212690302706180254">"عرض الحذف فقط"</item>
+    <item msgid="2539051197590685708">"عرض الأرشيف والحذف"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"وضع في الأرشيف"</item>
-    <item msgid="6088164268501960435">"الحذف"</item>
+    <item msgid="6877416142040695022">"عرض الأرشيف فقط"</item>
+    <item msgid="1510017057984222376">"عرض الحذف فقط"</item>
+    <item msgid="3196207224108008441">"عرض الأرشيف والحذف"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"إجراء افتراضي"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"إجراءات الأرشيف والحذف"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"الرد على الكل"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"الاستخدام كافتراضي مع الردود على الرسائل"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"إجراءات التمرير السريع"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"مرر بسرعة لإجراء أرشفة"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"مرر بسرعة لإجراء حذف"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"في قائمة المحادثات"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"صورة المرسل"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"عرض بجوار الاسم في قائمة الدردشات"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"رمز المجلد"</string>
     <string name="add_account" msgid="5905863370226612377">"إضافة حساب"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"تجاهل النصيحة"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"المزامنة التلقائية متوقفة. المس للتشغيل."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"‏مزامنة الحساب لا تعمل. شغّلها في &lt;a href=\'http://www.example.com\'&gt;إعدادات الحساب.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> من الرسائل التي لم يتم إرسالها في <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"تشغيل المزامنة التلقائية؟"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"‏ستتم مزامنة التغييرات التي تجريها على جميع التطبيقات والحسابات، وليس Gmail فقط، بين الويب والأجهزة الأخرى و<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"هاتف"</string>
     <string name="tablet" msgid="4593581125469224791">"جهاز لوحي"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"تشغيل"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"عرض <xliff:g id="NUMBER">%1$s</xliff:g> من المجلدات"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"عرض <xliff:g id="NUMBER">%1$s</xliff:g> من المجلدات الأخرى"</string>
     <string name="hide_folders" msgid="7618891933409521283">"إخفاء المجلدات"</string>
     <string name="print" msgid="7987949243936577207">"طباعة"</string>
     <string name="print_all" msgid="4011022762279519941">"طباعة الكل"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"إدارة الحسابات"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"الإعدادات العامة"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"الإعدادات"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"خيارات أخرى"</string>
 </resources>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 86db454..5a25797 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Запазване на чернова"</string>
     <string name="discard" msgid="4905982179911608430">"Отхвърляне"</string>
     <string name="compose" msgid="2602861958391035523">"Ново съобщение"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Съобщение"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Отговор"</item>
     <item msgid="2767793214788399009">"Отговор до всички"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Един или повече файла не са прикачени. Ограничението е <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Файлът не е прикачен. Достигнато е ограничението от <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Файлът не можа да бъде прикачен."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"За прикачения файл бе отказано разрешение."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Добавете поне един получател."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Грешка при получателя"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Да се изпрати ли съобщението?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Изпратете отзиви"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Преместване на кореспонденция"</item>
+    <item quantity="other" msgid="6639576653114141743">"Преместване на <xliff:g id="ID_1">%1$d</xliff:g> кореспонденции"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> относно „<xliff:g id="SUBJECT">%3$s</xliff:g>“: „<xliff:g id="SNIPPET">%4$s</xliff:g>“ на <xliff:g id="DATE">%5$s</xliff:g> – <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> относно „<xliff:g id="SUBJECT">%3$s</xliff:g>“: „<xliff:g id="SNIPPET">%4$s</xliff:g>“ в <xliff:g id="TIME">%5$s</xliff:g> – <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"кореспонденцията е прочетена"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Преглед на подробностите&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Скриване на подробностите"</string>
     <string name="to_message_header" msgid="3954385178027011919">"до <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Ск: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Показване на информацията за връзка със: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Показване на информацията за връзка"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> по-стари съобщения"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Зареждат се <xliff:g id="COUNT">%1$d</xliff:g> по-стари съобщения"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"От:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Отг. до:"</string>
     <string name="to_heading" msgid="3495203282540398336">"До: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Папка „Имейл"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Промяна на папките"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Преместване във"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Търсете"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Търсене в пощата"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"На това устройство не се поддържа гласово търсене."</string>
     <string name="network_error" msgid="5931164247644972255">"Няма връзка"</string>
     <string name="retry" msgid="916102442074217293">"Повторен опит"</string>
     <string name="load_more" msgid="8702691358453560575">"Зареждане на още"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Тих режим"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Действие по подразбиране"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Действия за архивиране и изтриване"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Архивиране"</item>
-    <item msgid="2567465476369142505">"Изтриване"</item>
+    <item msgid="954772302016538814">"Показване само на архивирането"</item>
+    <item msgid="7212690302706180254">"Показване само на изтриването"</item>
+    <item msgid="2539051197590685708">"Показване на архивирането и изтриването"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Архивиране"</item>
-    <item msgid="6088164268501960435">"Изтриване"</item>
+    <item msgid="6877416142040695022">"Показване само на архивирането"</item>
+    <item msgid="1510017057984222376">"Показване само на изтриването"</item>
+    <item msgid="3196207224108008441">"Показване на архивирането и изтриването"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Действие по подразбиране"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Действия за архивиране и изтриване"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Отговор до всички"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Използване като стандартна опция при отговор на съобщения"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Действия при прекарване на пръст"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Прекарайте пръст, за да архивирате"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Прекарайте пръст, за да изтриете"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"В списък с кореспонденции"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Изображение на подателя"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Показване до името в списъка с кореспонденции"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Икона на папката"</string>
     <string name="add_account" msgid="5905863370226612377">"Добавяне на профил"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Отхвърляне на съвета"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Автоматичното синхронизиране е изключено. Докоснете, за да го включите."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Синхронизирането на профила е изключено. Включете го в &lt;a href=\'http://www.example.com\'&gt;настройките на профила&lt;/a&gt;."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> неизпратени от <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Да се включи ли автоматичното синхронизиране?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Промените, които правите във всички приложения и профили, а не само в Gmail, ще се синхронизират между мрежата, другите ви устройства и <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ви."</string>
     <string name="phone" msgid="4142617042507912053">"телефона"</string>
     <string name="tablet" msgid="4593581125469224791">"таблета"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Вкл."</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Показване на <xliff:g id="NUMBER">%1$s</xliff:g> папки"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Показване на още <xliff:g id="NUMBER">%1$s</xliff:g> папки"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Скриване на папките"</string>
     <string name="print" msgid="7987949243936577207">"Печат"</string>
     <string name="print_all" msgid="4011022762279519941">"Печат на всички"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Управление на профилите"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Общи настройки"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Настройки"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Още опции"</string>
 </resources>

diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index f94c4aa..0c2feff 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"খসড়া সংরক্ষণ করুন"</string>
     <string name="discard" msgid="4905982179911608430">"পরিত্যাগ করুন"</string>
     <string name="compose" msgid="2602861958391035523">"লিখুন"</string>
-    <string name="compose_title" msgid="5673376086133995913">"রচনা করুন"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"উত্তর দিন"</item>
     <item msgid="2767793214788399009">"সকলকে উত্তর দিন"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"একটি বা তার বেশি ফাইল সংযুক্ত হয়নি। সীমা <xliff:g id="MAXSIZE">%1$s</xliff:g>।"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ফাইল সংযুক্ত হয়নি। <xliff:g id="MAXSIZE">%1$s</xliff:g> সীমাতে পৌঁছেছে।"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ফাইল সংযুক্ত করা যায়নি।"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"এই সংযুক্তিটির জন্য অনুমতি অস্বীকৃত৷"</string>
     <string name="recipient_needed" msgid="319816879398937214">"কমপক্ষে একজন প্রাপককে জুড়ুন।"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"প্রাপক ত্রুটি"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"বার্তা পাঠাবেন?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"প্রতিক্রিয়া পাঠান"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"কথোপকথন সরান"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g>টি কথোপকথন সরান"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> সম্পর্কে, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g> এ, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> সম্পর্কে, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g> এ, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"কথোপকথন পঠন"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;বিশদ বিবরণ দেখুন&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"বিশদ বিবরণ লুকান"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> কে"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> এর যোগাযোগের তথ্য দেখান"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"যোগাযোগের তথ্য দেখান"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g>টি পুরোনো বার্তা"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g>টি অপেক্ষাকৃত পুরানো বার্তা লোড হচ্ছে"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"প্রেরক:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"একে-উত্তর দিন:"</string>
     <string name="to_heading" msgid="3495203282540398336">"প্রতি: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ইমেল ফোল্ডার"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"ফোল্ডারগুলি পরিবর্তন করুন"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"এতে সরান"</string>
-    <string name="search_hint" msgid="7060626585689391003">"অনুসন্ধান করুন"</string>
+    <string name="search_hint" msgid="4916671414132334289">"মেল অনুসন্ধান করুন"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"ভয়েস অনুসন্ধান এই ডিভাইসে সমর্থিত নয়৷"</string>
     <string name="network_error" msgid="5931164247644972255">"কোনো সংযোগ নেই"</string>
     <string name="retry" msgid="916102442074217293">"পুনরায় চেষ্টা করুন"</string>
     <string name="load_more" msgid="8702691358453560575">"আরো লোড করুন"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"নীরব"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"ডিফল্ট অ্যাকশন"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"ক্রিয়াগুলি সংরক্ষণাগারভুক্ত করুন বা মুছুন"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"সংরক্ষণ করুন"</item>
-    <item msgid="2567465476369142505">"মুছুন"</item>
+    <item msgid="954772302016538814">"শুধুমাত্র সংরক্ষণাগার দেখান"</item>
+    <item msgid="7212690302706180254">"শুধুমাত্র মোছা দেখান"</item>
+    <item msgid="2539051197590685708">"সংরক্ষণ এবং মুছুন দেখান"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"সংরক্ষণ করুন"</item>
-    <item msgid="6088164268501960435">"মুছুন"</item>
+    <item msgid="6877416142040695022">"শুধুমাত্র সংরক্ষণাগার দেখান"</item>
+    <item msgid="1510017057984222376">"কেবলমাত্র মোছা দেখান"</item>
+    <item msgid="3196207224108008441">"সংরক্ষণাগার দেখান ও মুছুন"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"ডিফল্ট অ্যাকশন"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"সংরক্ষণ এবং বিলোপ ক্রিয়াগুলি"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"সকলকে উত্তর দিন"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"বার্তার উত্তরগুলির জন্য ডিফল্ট হিসাবে ব্যবহার করুন"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"অ্যাকশনগুলি সোয়াইপ করুন"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"সংরক্ষণ করতে সোয়াইপ করুন"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"মুছতে সোয়াইপ করুন"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"কথোপকথন তালিকাতে"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"প্রেরকের চিত্র"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"কথোপকথন তালিকায় নামের পাশে দেখান"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"ফোল্ডার আইকন"</string>
     <string name="add_account" msgid="5905863370226612377">"অ্যাকাউন্ট জুড়ুন"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"টিপ খারিজ করুন"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"স্বতঃ-সিঙ্ক বন্ধ আছে৷ চালু করতে স্পর্শ করুন৷"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"অ্যাকাউন্ট সিঙ্ক বন্ধ আছে৷ &lt;a href=\'http://www.example.com\'&gt;অ্যাকাউন্ট সেটিংস&lt;/a&gt;  এ চালু করুন৷"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> এ <xliff:g id="NUMBER">%1$s</xliff:g>টি অপ্রেরিত"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"স্বয়ং-সিঙ্ক চালু করবেন?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"শুধুমাত্র Gmail এ নয়, সমস্ত অ্যাপ্লিকেশনে এবং অ্যাকাউন্টে আপনার করা পরিবর্তনগুলি, ওয়েব, আপনার অন্যান্য ডিভাইস, এবং আপনার <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> এর মধ্যে সিঙ্ক্রোনাইজ হবে।"</string>
     <string name="phone" msgid="4142617042507912053">"ফোন"</string>
     <string name="tablet" msgid="4593581125469224791">"ট্যাবলেট"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"চালু করুন"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g>টি ফোল্ডার দেখান"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"আরো <xliff:g id="NUMBER">%1$s</xliff:g>টি ফোল্ডার দেখান"</string>
     <string name="hide_folders" msgid="7618891933409521283">"ফোল্ডারগুলি লুকান"</string>
     <string name="print" msgid="7987949243936577207">"মুদ্রণ"</string>
     <string name="print_all" msgid="4011022762279519941">"সবগুলি মুদ্রণ করুন"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"অ্যাকাউন্টগুলি পরিচালনা করুন"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"সাধারণ সেটিংস"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"সেটিংস"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"আরো বিকল্প"</string>
 </resources>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 037f359..cb3f5ee 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Desa l\'esborrany"</string>
     <string name="discard" msgid="4905982179911608430">"Descarta"</string>
     <string name="compose" msgid="2602861958391035523">"Redacta"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Redacta"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Respon"</item>
     <item msgid="2767793214788399009">"Respon a tots"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"No s\'han adjuntat un o més fitxers. Límit: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"El fitxer no s\'ha adjuntat. Has arribat al límit de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"No s\'ha pogut adjuntar el fitxer."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"S\'ha denegat el permís per al fitxer adjunt."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Afegeix com a mínim un destinatari."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Error de destinatari"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Vols enviar el missatge?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Envia comentaris"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Mou la conversa"</item>
+    <item quantity="other" msgid="6639576653114141743">"Mou <xliff:g id="ID_1">%1$d</xliff:g> converses"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> el dia <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> a les <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversa llegida"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Mostra els detalls&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Amaga els detalls"</string>
     <string name="to_message_header" msgid="3954385178027011919">"per a <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Cco: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Mostra la informació de contacte de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Mostra la informació de contacte"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> missatges anteriors"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"S\'estan carregant <xliff:g id="COUNT">%1$d</xliff:g> missatges antics."</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"De:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Respon a:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Per a: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Carpeta de correu electrònic"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Canvia les carpetes"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Mou a"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Cerca"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Cerca al correu"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Aquest dispositiu no admet la cerca per veu."</string>
     <string name="network_error" msgid="5931164247644972255">"Sense connexió"</string>
     <string name="retry" msgid="916102442074217293">"Torna-ho a provar"</string>
     <string name="load_more" msgid="8702691358453560575">"Penja\'n més"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silenci"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Acció predeterminada"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Accions d\'arxivament i de supressió"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arxiva"</item>
-    <item msgid="2567465476369142505">"Suprimeix"</item>
+    <item msgid="954772302016538814">"Mostra només l\'arxivament"</item>
+    <item msgid="7212690302706180254">"Mostra només la supressió"</item>
+    <item msgid="2539051197590685708">"Mostra l\'arxivament i la supressió"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arxiva"</item>
-    <item msgid="6088164268501960435">"Suprimeix"</item>
+    <item msgid="6877416142040695022">"Mostra només l\'arxivament"</item>
+    <item msgid="1510017057984222376">"Mostra només la supressió"</item>
+    <item msgid="3196207224108008441">"Mostra l\'arxivament i la supressió"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Acció predeterminada"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Accions d\'arxivament i de supressió"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Respon a tots"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Utilitza com a opció predeterminada per respondre missatges"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Accions fent lliscar el dit"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Fes lliscar el dit per arxivar"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Fes lliscar el dit per suprimir"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"A la llista de converses"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Imatge del remitent"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Mostra al costat del nom a la llista de converses"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Icona de la carpeta"</string>
     <string name="add_account" msgid="5905863370226612377">"Afegeix un compte"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Omet el consell"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"La sincronització automàtica està desactivada. Toqueu aquí per activar-la."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"La sincronització del compte està desactivada. Activeu-la a &lt;a href=\'http://www.example.com\'&gt;Configuració del compte.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> missatges no enviats a <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Vols activar la sincronització automàtica?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Els canvis que facis a les aplicacions i als comptes, i no només a Gmail, se sincronitzaran al web, a la resta de dispositius i a <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telèfon"</string>
     <string name="tablet" msgid="4593581125469224791">"tauleta"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Activa"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Mostra <xliff:g id="NUMBER">%1$s</xliff:g> carpetes"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Mostra <xliff:g id="NUMBER">%1$s</xliff:g> carpetes més"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Amaga les carpetes"</string>
     <string name="print" msgid="7987949243936577207">"Imprimeix"</string>
     <string name="print_all" msgid="4011022762279519941">"Imprimeix-ho tot"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Gestiona els comptes"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Configuració general"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Configuració"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Més opcions"</string>
 </resources>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 950bf67..9a40d9d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Uložit koncept"</string>
     <string name="discard" msgid="4905982179911608430">"Zahodit"</string>
     <string name="compose" msgid="2602861958391035523">"Napsat"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Napsat"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Odpovědět"</item>
     <item msgid="2767793214788399009">"Odpovědět všem"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Jeden nebo více souborů nebylo připojeno. Limit je <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Soubor nebyl přiložen. Byl dosažen limit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Soubor se nepodařilo připojit jako přílohu."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Pro přílohu bylo zamítnuto oprávnění."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Přidejte alespoň jednoho příjemce."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Chyba příjemce"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Odeslat zprávu?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Odeslat zpětnou vazbu"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Přesunout konverzaci"</item>
+    <item quantity="other" msgid="6639576653114141743">"Přesunutí <xliff:g id="ID_1">%1$d</xliff:g> konverzací"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> – <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>, dne <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> – <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>, v <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"Konverzace byla přečtena."</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.cz\'&gt;Zobrazit podrobnosti&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skrýt podrobnosti"</string>
     <string name="to_message_header" msgid="3954385178027011919">"komu: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"skr. kop.: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Zobrazit kontaktní údaje uživatele <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Zobrazit kontaktní údaje"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Starší zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Načítání <xliff:g id="COUNT">%1$d</xliff:g> starších zpráv"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Odesílatel:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Odpovědět:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Komu: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Složka aplikace E-mail"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Změnit složky"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Přesunout"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Vyhledat"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Vyhledat v poště"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Hlasové vyhledávání není na tomto zařízení podporováno."</string>
     <string name="network_error" msgid="5931164247644972255">"Žádné připojení"</string>
     <string name="retry" msgid="916102442074217293">"Opakovat"</string>
     <string name="load_more" msgid="8702691358453560575">"Načíst další"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Tichý režim"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Výchozí akce"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Akce archivace a smazání"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archivovat"</item>
-    <item msgid="2567465476369142505">"Smazat"</item>
+    <item msgid="954772302016538814">"Zobrazit pouze archivaci"</item>
+    <item msgid="7212690302706180254">"Zobrazit pouze smazání"</item>
+    <item msgid="2539051197590685708">"Zobrazit archivaci i smazání"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archivovat"</item>
-    <item msgid="6088164268501960435">"Smazat"</item>
+    <item msgid="6877416142040695022">"Zobrazit pouze archivaci"</item>
+    <item msgid="1510017057984222376">"Zobrazit pouze smazání"</item>
+    <item msgid="3196207224108008441">"Zobrazit archivaci i smazání"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Výchozí akce"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Akce archivace a smazání"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Odpovědět všem"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Použít jako výchozí pro odpovědi na zprávy"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Akce po přejetí prstem"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Archivace přejetím prstem"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Mazat po přejetí prstem"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"V seznamu konverzací"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Obrázek odesílatele"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Zobrazit vedle jména v seznamu konverzací"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ikona složky"</string>
     <string name="add_account" msgid="5905863370226612377">"Přidat účet"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Zavřít tip"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automatická synchronizace je vypnutá. Zapnete ji klepnutím."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Synchronizace účtu je vypnutá. Zapnout ji můžete v &lt;a href=\'http://www.example.com\'&gt;Nastaveních účtu.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Neodeslané zprávy ve složce <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Zapnout automatickou synchronizaci?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Změny, které provedete ve všech aplikacích a účtech (nikoli jen v Gmailu), budou synchronizovány mezi webem, ostatními zařízeními a zařízením <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Zapnout"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Zobrazit složky (celkem <xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Zobrazit další složky (<xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Skrýt složky"</string>
     <string name="print" msgid="7987949243936577207">"Tisk"</string>
     <string name="print_all" msgid="4011022762279519941">"Vytisknout vše"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Spravovat účty"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Obecná nastavení"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Nastavení"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Další možnosti"</string>
 </resources>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e0fdef7..e75bb38 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Gem kladde"</string>
     <string name="discard" msgid="4905982179911608430">"Slet"</string>
     <string name="compose" msgid="2602861958391035523">"Skriv"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Skriv"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Svar"</item>
     <item msgid="2767793214788399009">"Svar alle"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"En eller flere filer blev ikke vedhæftet. Grænsen er <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Filen blev ikke vedhæftet. Grænsen på <xliff:g id="MAXSIZE">%1$s</xliff:g> er nået."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Filen kunne ikke vedhæftes."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Tilladelse nægtet for den vedhæftede fil."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Tilføj mindst én modtager."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Fejl i modtager"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Vil du sende meddelelsen?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Send feedback"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Flyt samtale"</item>
+    <item quantity="other" msgid="6639576653114141743">"Flyt <xliff:g id="ID_1">%1$d</xliff:g> samtaler"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> om <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> den <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> om <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kl. <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"samtalen er læst"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Se info&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skjul info"</string>
     <string name="to_message_header" msgid="3954385178027011919">"til <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Vis kontaktoplysninger for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Vis kontaktoplysninger"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ældre meddelelser"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> ældre meddelelser indlæses"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Fra:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Svar til:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Til: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"E-mailmappe"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Skift mapper"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Flyt til"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Søg"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Søg i mail"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Stemmesøgning understøttes ikke på denne enhed."</string>
     <string name="network_error" msgid="5931164247644972255">"Ingen forbindelse"</string>
     <string name="retry" msgid="916102442074217293">"Prøv igen"</string>
     <string name="load_more" msgid="8702691358453560575">"Indlæs mere"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Lydløs"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Standardhandling"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Handlinger for arkivering og sletning"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arkivér"</item>
-    <item msgid="2567465476369142505">"Slet"</item>
+    <item msgid="954772302016538814">"Vis kun \"arkivér\""</item>
+    <item msgid="7212690302706180254">"Vis kun \"slet\""</item>
+    <item msgid="2539051197590685708">"Vis \"arkivér\" og \"slet\""</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arkivér"</item>
-    <item msgid="6088164268501960435">"Slet"</item>
+    <item msgid="6877416142040695022">"Vis kun \"arkivér\""</item>
+    <item msgid="1510017057984222376">"Vis kun \"slet\""</item>
+    <item msgid="3196207224108008441">"Vis \"arkivér\" og \"slet\""</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Standardhandling"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Handlinger for arkivering og sletning"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Svar alle"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Brug som standardsvar på meddelelser"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Strygehandlinger"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Stryg til siden for at arkivere"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Stryg til siden for at slette"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"På samtaleliste"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Afsenderbillede"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Vis ud for navnet i samtalelisten"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Mappeikon"</string>
     <string name="add_account" msgid="5905863370226612377">"Tilføj konto"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Afvis tip"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automatisk synkronisering er slået fra. Tryk for at slå funktionen til."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Kontosynkronisering er slået fra. Slå funktionen til under &lt;a href=\'http://www.example.com\'&gt;kontoindstillingerne.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> usendte meddelelser i <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Vil du slå automatisk synkronisering til?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Ændringer, du foretager i alle apps og konti, ikke kun Gmail, synkroniseres mellem nettet, dine andre enheder og din <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Slå til"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Vis <xliff:g id="NUMBER">%1$s</xliff:g> mapper"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Vis <xliff:g id="NUMBER">%1$s</xliff:g> mapper mere"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Skjul mapper"</string>
     <string name="print" msgid="7987949243936577207">"Udskriv"</string>
     <string name="print_all" msgid="4011022762279519941">"Udskriv alle"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Administrer konti"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Generelle indstillinger"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Indstillinger"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Flere muligheder"</string>
 </resources>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5bb7a91..b404da2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Entwurf speichern"</string>
     <string name="discard" msgid="4905982179911608430">"Löschen"</string>
     <string name="compose" msgid="2602861958391035523">"Schreiben"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Schreiben"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Antworten"</item>
     <item msgid="2767793214788399009">"Allen antworten"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Mindestens eine Datei wurde nicht angehängt. Limit: <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Datei wurde nicht angehängt. Limit von <xliff:g id="MAXSIZE">%1$s</xliff:g> erreicht."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Die Datei konnte nicht hinzugefügt werden."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Der Zugriff auf den Anhang wurde verweigert."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Fügen Sie mindestens einen Empfänger hinzu."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Fehler beim Empfänger"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Nachricht senden?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Feedback geben"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Konversation verschieben"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> Konversationen verschieben"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> über <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> am <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> über <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> um <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"Konversation gelesen"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.ihrebeispielurl.com\'&gt;Details ansehen&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Details ausblenden"</string>
     <string name="to_message_header" msgid="3954385178027011919">"an <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Kontaktinformationen für <xliff:g id="NAME">%1$s</xliff:g> anzeigen"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Kontaktinformationen anzeigen"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ältere Nachrichten"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> ältere Nachrichten werden geladen."</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Von:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Antwort:"</string>
     <string name="to_heading" msgid="3495203282540398336">"An: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"E-Mail-Ordner"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Ordner ändern"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Verschieben nach"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Suche"</string>
+    <string name="search_hint" msgid="4916671414132334289">"In E-Mails suchen"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Die Sprachsuche wird auf diesem Gerät nicht unterstützt."</string>
     <string name="network_error" msgid="5931164247644972255">"Keine Verbindung"</string>
     <string name="retry" msgid="916102442074217293">"Erneut versuchen"</string>
     <string name="load_more" msgid="8702691358453560575">"Weitere laden"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Lautlos"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Standardaktion"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Aktionen \"Archivieren\" und \"Löschen\""</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archivieren"</item>
-    <item msgid="2567465476369142505">"Löschen"</item>
+    <item msgid="954772302016538814">"Nur \"Archivieren\" anzeigen"</item>
+    <item msgid="7212690302706180254">"Nur \"Löschen\" anzeigen"</item>
+    <item msgid="2539051197590685708">"\"Archivieren\" und \"Löschen\" anzeigen"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archivieren"</item>
-    <item msgid="6088164268501960435">"Löschen"</item>
+    <item msgid="6877416142040695022">"Nur \"Archivieren\" anzeigen"</item>
+    <item msgid="1510017057984222376">"Nur \"Löschen\" anzeigen"</item>
+    <item msgid="3196207224108008441">"\"Archivieren\" und \"Löschen\" anzeigen"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Standardaktion"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Aktionen \"Archivieren\" und \"Löschen\""</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Allen antworten"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Als Standard für Antworten verwenden"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Aktionen beim Wischen"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Zum Archivieren wischen"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Zum Löschen wischen"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"In einer Unterhaltungsliste"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Bild des Absenders"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Neben Namen in der Konversationsliste anzeigen"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ordnersymbol"</string>
     <string name="add_account" msgid="5905863370226612377">"Konto hinzufügen"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Tipp schließen"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Die automatische Synchronisierung ist deaktiviert. Tippen Sie, um sie zu aktivieren."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Die Kontosynchronisierung ist deaktiviert. Sie können sie in den &lt;a href=\'http://www.ihrebeispielurl.de\'&gt;Kontoeinstellungen&lt;/a&gt; aktivieren."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> nicht gesendete Nachricht(en) in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Automatische Synchronisierung aktivieren?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Änderungen, die Sie nicht nur an Gmail, sondern an allen Apps und Konten vornehmen, werden zwischen dem Web, Ihren anderen Geräten und Ihrem <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> synchronisiert."</string>
     <string name="phone" msgid="4142617042507912053">"Telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"Tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Aktivieren"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> Ordner anzeigen"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"<xliff:g id="NUMBER">%1$s</xliff:g> weitere Ordner anzeigen"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ordner ausblenden"</string>
     <string name="print" msgid="7987949243936577207">"Drucken"</string>
     <string name="print_all" msgid="4011022762279519941">"Alle drucken"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Konten verwalten"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Allgemeine Einstellungen"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Einstellungen"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Weitere Optionen"</string>
 </resources>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5a8bb93..f95c509 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Αποθήκευση προχείρου"</string>
     <string name="discard" msgid="4905982179911608430">"Απόρριψη"</string>
     <string name="compose" msgid="2602861958391035523">"Σύνταξη"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Σύνταξη"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Απάντηση"</item>
     <item msgid="2767793214788399009">"Απάντ. σε όλους"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Δεν έγινε επισύναψη ενός ή περισσότερων αρχείων. Όριο <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Δεν έγινε επισύναψη του αρχείου. Το όριο <xliff:g id="MAXSIZE">%1$s</xliff:g> εξαντλήθηκε."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Δεν ήταν δυνατή η επισύναψη του αρχείου."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Δεν έχετε δικαίωμα πρόσβασης στο συνημμένο."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Προσθέστε τουλάχιστον έναν παραλήπτη."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Σφάλμα παραλήπτη"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Αποστολή μηνύματος;"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Αποστολή σχολίων"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Μετακίνηση συνομιλίας"</item>
+    <item quantity="other" msgid="6639576653114141743">"Μετακίνηση <xliff:g id="ID_1">%1$d</xliff:g> συνομιλιών"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> σχετικά με <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> στις <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> σχετικά με <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> στις <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"αναγνωσμένη συνομιλία"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Λεπτομέρειες&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Απόκρυψη λεπτομερειών"</string>
     <string name="to_message_header" msgid="3954385178027011919">"προς <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Κρ. κοιν.: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Εμφάνιση στοιχείων επικοινωνίας για τον χρήστη <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Εμφάνιση στοιχείων επικοινωνίας"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> παλαιότερα μηνύματα"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Φόρτωση <xliff:g id="COUNT">%1$d</xliff:g> παλαιότερων μηνυμάτων"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Από:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Απάντ. σε:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Προς: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Φάκελος email"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Αλλαγή φακέλων"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Μετακίνηση σε"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Αναζήτηση"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Αναζήτηση μηνυμάτων ηλ. ταχ."</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Η φωνητική αναζήτηση δεν υποστηρίζεται σε αυτήν τη συσκευή."</string>
     <string name="network_error" msgid="5931164247644972255">"Δεν υπάρχει σύνδεση"</string>
     <string name="retry" msgid="916102442074217293">"Επανάληψη"</string>
     <string name="load_more" msgid="8702691358453560575">"Φόρτωση περισσότερων"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Σίγαση"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Προεπιλεγμένη ενέργεια"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Ενέργειες αρχειοθέτησης και διαγραφής"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Αρχειοθέτηση"</item>
-    <item msgid="2567465476369142505">"Διαγραφή"</item>
+    <item msgid="954772302016538814">"Εμφάνιση μόνο αρχειοθέτησης"</item>
+    <item msgid="7212690302706180254">"Εμφάνιση μόνο διαγραφής"</item>
+    <item msgid="2539051197590685708">"Εμφάνιση αρχειοθέτησης και διαγραφής"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Αρχειοθέτηση"</item>
-    <item msgid="6088164268501960435">"Διαγραφή"</item>
+    <item msgid="6877416142040695022">"Εμφάνιση μόνο αρχειοθέτησης"</item>
+    <item msgid="1510017057984222376">"Εμφάνιση μόνο διαγραφής"</item>
+    <item msgid="3196207224108008441">"Εμφάνιση αρχειοθέτησης και διαγραφής"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Προεπιλεγμένη ενέργεια"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Ενέργειες αρχειοθέτησης και διαγραφής"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Απάντηση σε όλους"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Χρήση ως προεπιλογή για απαντήσεις μηνυμάτων"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Ενέργειες ολίσθησης"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Σύρετε για αρχειοθέτηση"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Ολίσθηση για διαγραφή"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Στη λίστα συνομιλιών"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Εικόνα αποστολέα"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Εμφάνιση δίπλα στο όνομα στη λίστα συνομιλιών"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Εικονίδιο φακέλου"</string>
     <string name="add_account" msgid="5905863370226612377">"Προσθήκη λογαριασμού"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Παράβλεψη συμβουλής"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Ο αυτόματος συγχρονισμός είναι απενεργοποιημένος. Αγγίξτε για να τον ενεργοποιήσετε."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Ο συγχρονισμός λογαριασμού είναι απενεργοποιημένος. Ενεργοποιήστε τον στις &lt;a href=\'http://www.example.com\'&gt;Ρυθμίσεις λογαριασμοή.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> μη απεσταλμένα σε <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Ενεργοποίηση αυτόματου συγχρονισμού;"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Θα γίνει συγχρονισμός όλων των αλλαγών που πραγματοποιείτε σε όλες τις εφαρμογές και τους λογαριασμούς, όχι μόνο στο Gmail, στον ιστό, σε άλλες συσκευές και στο <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> σας."</string>
     <string name="phone" msgid="4142617042507912053">"τηλέφωνo"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Ενεργοποίηση"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Εμφάνιση <xliff:g id="NUMBER">%1$s</xliff:g> φακέλων"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Εμφάνιση <xliff:g id="NUMBER">%1$s</xliff:g> ακόμη φακέλων"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Απόκρυψη φακέλων"</string>
     <string name="print" msgid="7987949243936577207">"Εκτύπωση"</string>
     <string name="print_all" msgid="4011022762279519941">"Εκτύπωση όλων"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Διαχείριση λογαριασμών"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Γενικές ρυθμίσεις"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Ρυθμίσεις"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Περισσότερες επιλογές"</string>
 </resources>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d743dae..2973fe5 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Save draft"</string>
     <string name="discard" msgid="4905982179911608430">"Discard"</string>
     <string name="compose" msgid="2602861958391035523">"Compose"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Compose"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Reply"</item>
     <item msgid="2767793214788399009">"Reply all"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"One or more files not attached. Limit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"File not attached. <xliff:g id="MAXSIZE">%1$s</xliff:g> limit reached."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Unable to attach file."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Permission denied for the attachment."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Add at least one recipient."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Recipient error"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Send message?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Send feedback"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Move conversation"</item>
+    <item quantity="other" msgid="6639576653114141743">"Move <xliff:g id="ID_1">%1$d</xliff:g> conversations"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> on <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> at <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversation read"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Hide details"</string>
     <string name="to_message_header" msgid="3954385178027011919">"to <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Show contact information for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Show contact information"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Loading <xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"From:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Reply to:"</string>
     <string name="to_heading" msgid="3495203282540398336">"To: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Email folder"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Change folders"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Move to"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Search"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Search mail"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Voice search is not supported on this device."</string>
     <string name="network_error" msgid="5931164247644972255">"No connection"</string>
     <string name="retry" msgid="916102442074217293">"Retry"</string>
     <string name="load_more" msgid="8702691358453560575">"Load more"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silent"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Default action"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Archive &amp; delete actions"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archive"</item>
-    <item msgid="2567465476369142505">"Delete"</item>
+    <item msgid="954772302016538814">"Show archive only"</item>
+    <item msgid="7212690302706180254">"Show delete only"</item>
+    <item msgid="2539051197590685708">"Show archive &amp; delete"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archive"</item>
-    <item msgid="6088164268501960435">"Delete"</item>
+    <item msgid="6877416142040695022">"Show archive only"</item>
+    <item msgid="1510017057984222376">"Show delete only"</item>
+    <item msgid="3196207224108008441">"Show archive &amp; delete"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Default action"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Archive &amp; delete actions"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Reply all"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Use as default for message replies"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Swipe actions"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Swipe to archive"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Swipe to delete"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"In conversation list"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Sender image"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Show beside name in conversation list"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Folder icon"</string>
     <string name="add_account" msgid="5905863370226612377">"Add account"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Dismiss tip"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Auto-sync is off. Touch to turn on."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Account sync is off. Turn it on in &lt;a href=\'http://www.example.com\'&gt;Account settings.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> unsent in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Turn auto-sync on?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Changes you make to all apps and accounts, not just Gmail, will be synchronised between the web, your other devices and your <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"phone"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Turn on"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Show <xliff:g id="NUMBER">%1$s</xliff:g> folders"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Show <xliff:g id="NUMBER">%1$s</xliff:g> more folders"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Hide folders"</string>
     <string name="print" msgid="7987949243936577207">"Print"</string>
     <string name="print_all" msgid="4011022762279519941">"Print all"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Manage Accounts"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"General settings"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Settings"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"More options"</string>
 </resources>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index d743dae..2973fe5 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Save draft"</string>
     <string name="discard" msgid="4905982179911608430">"Discard"</string>
     <string name="compose" msgid="2602861958391035523">"Compose"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Compose"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Reply"</item>
     <item msgid="2767793214788399009">"Reply all"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"One or more files not attached. Limit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"File not attached. <xliff:g id="MAXSIZE">%1$s</xliff:g> limit reached."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Unable to attach file."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Permission denied for the attachment."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Add at least one recipient."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Recipient error"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Send message?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Send feedback"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Move conversation"</item>
+    <item quantity="other" msgid="6639576653114141743">"Move <xliff:g id="ID_1">%1$d</xliff:g> conversations"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> on <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> at <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversation read"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Hide details"</string>
     <string name="to_message_header" msgid="3954385178027011919">"to <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Show contact information for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Show contact information"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Loading <xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"From:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Reply to:"</string>
     <string name="to_heading" msgid="3495203282540398336">"To: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Email folder"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Change folders"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Move to"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Search"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Search mail"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Voice search is not supported on this device."</string>
     <string name="network_error" msgid="5931164247644972255">"No connection"</string>
     <string name="retry" msgid="916102442074217293">"Retry"</string>
     <string name="load_more" msgid="8702691358453560575">"Load more"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silent"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Default action"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Archive &amp; delete actions"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archive"</item>
-    <item msgid="2567465476369142505">"Delete"</item>
+    <item msgid="954772302016538814">"Show archive only"</item>
+    <item msgid="7212690302706180254">"Show delete only"</item>
+    <item msgid="2539051197590685708">"Show archive &amp; delete"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archive"</item>
-    <item msgid="6088164268501960435">"Delete"</item>
+    <item msgid="6877416142040695022">"Show archive only"</item>
+    <item msgid="1510017057984222376">"Show delete only"</item>
+    <item msgid="3196207224108008441">"Show archive &amp; delete"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Default action"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Archive &amp; delete actions"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Reply all"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Use as default for message replies"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Swipe actions"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Swipe to archive"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Swipe to delete"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"In conversation list"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Sender image"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Show beside name in conversation list"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Folder icon"</string>
     <string name="add_account" msgid="5905863370226612377">"Add account"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Dismiss tip"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Auto-sync is off. Touch to turn on."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Account sync is off. Turn it on in &lt;a href=\'http://www.example.com\'&gt;Account settings.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> unsent in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Turn auto-sync on?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Changes you make to all apps and accounts, not just Gmail, will be synchronised between the web, your other devices and your <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"phone"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Turn on"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Show <xliff:g id="NUMBER">%1$s</xliff:g> folders"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Show <xliff:g id="NUMBER">%1$s</xliff:g> more folders"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Hide folders"</string>
     <string name="print" msgid="7987949243936577207">"Print"</string>
     <string name="print_all" msgid="4011022762279519941">"Print all"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Manage Accounts"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"General settings"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Settings"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"More options"</string>
 </resources>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bc460e0..9c87529 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Guardar como borrador"</string>
     <string name="discard" msgid="4905982179911608430">"Descartar"</string>
     <string name="compose" msgid="2602861958391035523">"Redactar"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Redactar"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Responder"</item>
     <item msgid="2767793214788399009">"Responder a todos"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"No se adjuntaron uno o varios archivos. Se alcanzó el límite de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"No se adjuntó el archivo. Se alcanzó el límite de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"No se pudo adjuntar el archivo."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Se denegó el permiso para el archivo adjunto."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Agrega al menos un destinatario."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Error de destinatario"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"¿Deseas enviar este mensaje?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar comentario"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Mover conversación"</item>
+    <item quantity="other" msgid="6639576653114141743">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversaciones"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> el <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> a la hora <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversación leída"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ver detalles&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalles"</string>
     <string name="to_message_header" msgid="3954385178027011919">"para <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Cco: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Mostrar la información de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Mostrar la información de contacto"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes antiguos"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Cargando <xliff:g id="COUNT">%1$d</xliff:g> mensajes más antiguos"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"De:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Responder a:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Carpeta de correo electrónico"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Cambiar carpetas"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Mover a"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Buscar"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Buscar correo"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"El dispositivo no admite la búsqueda por voz."</string>
     <string name="network_error" msgid="5931164247644972255">"Sin conexión"</string>
     <string name="retry" msgid="916102442074217293">"Volver a intentar"</string>
     <string name="load_more" msgid="8702691358453560575">"Realizar más cargas"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silencio"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Acción predeterminada"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Acciones de archivar y eliminar"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archivar"</item>
-    <item msgid="2567465476369142505">"Eliminar"</item>
+    <item msgid="954772302016538814">"Mostrar solo archivar"</item>
+    <item msgid="7212690302706180254">"Mostrar solo eliminar"</item>
+    <item msgid="2539051197590685708">"Mostrar archivar y eliminar"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archivar"</item>
-    <item msgid="6088164268501960435">"Eliminar"</item>
+    <item msgid="6877416142040695022">"Mostrar solo archivar"</item>
+    <item msgid="1510017057984222376">"Mostrar solo eliminar"</item>
+    <item msgid="3196207224108008441">"Mostrar archivar y eliminar"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Acción predeterminada"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Acciones de archivar y eliminar"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Usar como opción predeterminada para responder mensajes"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Acciones al deslizar"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Deslizar para archivar"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Deslizar para eliminar"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"En lista de conversaciones"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Imagen del remitente"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Mostrar al lado del nombre en la lista de conversaciones"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ícono de carpeta"</string>
     <string name="add_account" msgid="5905863370226612377">"Agregar cuenta"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Descartar sugerencia"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"La sincronización automática está desactivada. Toca para activarla."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"La sincronización de la cuenta está desactivada. Para activarla, ve a la href=\'http://www.example.com\'&gt;Configuración de la cuenta.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> sin enviar en <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"¿Activar la sincronización automática?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Los cambios que realices en todas las aplicaciones y cuentas, no solo en Gmail, se sincronizarán con la Web, con otros dispositivos que tengas y con tu <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"teléfono"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Activar"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Mostrar <xliff:g id="NUMBER">%1$s</xliff:g> carpetas"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Mostrar <xliff:g id="NUMBER">%1$s</xliff:g> carpetas más"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ocultar carpetas"</string>
     <string name="print" msgid="7987949243936577207">"Imprimir"</string>
     <string name="print_all" msgid="4011022762279519941">"Imprimir todo"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Administrar cuentas"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Configuración general"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Configuración"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Más opciones"</string>
 </resources>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0d37bd4..995a9ea 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Guardar borrador"</string>
     <string name="discard" msgid="4905982179911608430">"Descartar"</string>
     <string name="compose" msgid="2602861958391035523">"Redactar"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Redactar"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Responder"</item>
     <item msgid="2767793214788399009">"Responder a todos"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Uno o varios archivos no se han adjuntado (límite de <xliff:g id="MAXSIZE">%1$s</xliff:g>)."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"No se ha adjuntado el archivo. Se ha alcanzado el límite de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"No se ha podido adjuntar el archivo."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Se ha denegado el permiso para el archivo adjunto."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Añade al menos un destinatario."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Error de destinatario"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"¿Quieres enviar el mensaje?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar sugerencias"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Mover una conversación"</item>
+    <item quantity="other" msgid="6639576653114141743">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversaciones"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> el <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> a las <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversación leída"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Detalles&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalles"</string>
     <string name="to_message_header" msgid="3954385178027011919">"para <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Cco: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Mostrar información de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Mostrar información de contacto"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes antiguos"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Cargando <xliff:g id="COUNT">%1$d</xliff:g> mensajes anteriores"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"De:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Responder a:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Carpeta de correo"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Cambiar carpetas"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Mover a"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Buscar"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Buscar mensaje"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Este dispositivo no es compatible con la búsqueda por voz."</string>
     <string name="network_error" msgid="5931164247644972255">"Sin conexión"</string>
     <string name="retry" msgid="916102442074217293">"Reintentar"</string>
     <string name="load_more" msgid="8702691358453560575">"Cargar más"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silencio"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Acción predeterminada"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Archivar y eliminar"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archivar"</item>
-    <item msgid="2567465476369142505">"Eliminar"</item>
+    <item msgid="954772302016538814">"Mostrar solo archivar"</item>
+    <item msgid="7212690302706180254">"Mostrar solo eliminar"</item>
+    <item msgid="2539051197590685708">"Mostrar archivar y eliminar"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archivar"</item>
-    <item msgid="6088164268501960435">"Eliminar"</item>
+    <item msgid="6877416142040695022">"Mostrar solo archivar"</item>
+    <item msgid="1510017057984222376">"Mostrar solo eliminar"</item>
+    <item msgid="3196207224108008441">"Mostrar archivar y eliminar"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Acción predeterminada"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Archivar y eliminar"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Usar como opción predeterminada para responder mensajes"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Acciones que provocas cuando deslizas el dedo"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Desliza para archivar"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Deslizar para eliminar"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"En la lista de conversaciones"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Imagen del remitente"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Mostrar junto al nombre en la lista de conversaciones"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Icono de carpeta"</string>
     <string name="add_account" msgid="5905863370226612377">"Añadir cuenta"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Ignorar sugerencia"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"La sincronización automática está desactivada. Toca para activarla."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"La sincronización de la cuenta está desactivada. Actívala en &lt;a href=\'http://www.example.com\'&gt;Ajustes de la cuenta.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> sin enviar en <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"¿Quieres activar la sincronización automática?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Los cambios que realices en todas las aplicaciones y cuentas, no solo en Gmail, se sincronizarán en la Web, otros de tus dispositivos y tu <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"teléfono"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Activar"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Mostrar <xliff:g id="NUMBER">%1$s</xliff:g> carpetas"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Mostrar otras <xliff:g id="NUMBER">%1$s</xliff:g> carpetas"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ocultar carpetas"</string>
     <string name="print" msgid="7987949243936577207">"Imprimir"</string>
     <string name="print_all" msgid="4011022762279519941">"Imprimir todo"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Administrar cuentas"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Ajustes generales"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Ajustes"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Más opciones"</string>
 </resources>

diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 4cdac04..8b40bea 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Salvesta mustand"</string>
     <string name="discard" msgid="4905982179911608430">"Loobu"</string>
     <string name="compose" msgid="2602861958391035523">"Koosta"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Koostamine"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Vasta"</item>
     <item msgid="2767793214788399009">"Vasta kõigile"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Üht või mitut faili ei lisatud. Limiit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Faili ei lisatud. Saavutatud limiit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Faili ei saanud manustada."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Manuse loast keelduti."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Lisage vähemalt üks saaja."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Saaja viga"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Kas soovite sõnumi saata?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Tagasiside saatmine"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Meilivestluse teisaldamine"</item>
+    <item quantity="other" msgid="6639576653114141743">"Teisalda <xliff:g id="ID_1">%1$d</xliff:g> meilivestlust"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"Osalejale <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> teemal <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kuupäeval <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"Osalejale <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> teemal <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kell <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"loetud vestlus"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Kuva üksikasjad&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Üksikasjade peitmine"</string>
     <string name="to_message_header" msgid="3954385178027011919">"saajad: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"pimekoopia: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Kuva saatja <xliff:g id="NAME">%1$s</xliff:g> kontaktandmed"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Kuva kontaktandmed"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> vanemat sõnumit"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> vanema kirja laadimine"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Saatja:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Vasta:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Saaja: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Meili kaust"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Kaustade muutmine"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Teisalda:"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Otsing"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Otsi e-posti hulgast"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Häälega otsimist ei toetata selles seadmes."</string>
     <string name="network_error" msgid="5931164247644972255">"Ühendus puudub"</string>
     <string name="retry" msgid="916102442074217293">"Proovi uuesti"</string>
     <string name="load_more" msgid="8702691358453560575">"Laadi rohkem"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Hääletu"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Vaiketoiming"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Arhiveerimise ja kustutamise toimingud"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arhiivimine"</item>
-    <item msgid="2567465476369142505">"Kustutamine"</item>
+    <item msgid="954772302016538814">"Kuva ainult arhiveerimine"</item>
+    <item msgid="7212690302706180254">"Kuva ainult kustutamine"</item>
+    <item msgid="2539051197590685708">"Kuva arhiveerimine ja kustutamine"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arhiivimine"</item>
-    <item msgid="6088164268501960435">"Kustutamine"</item>
+    <item msgid="6877416142040695022">"Kuva ainult arhiveerimine"</item>
+    <item msgid="1510017057984222376">"Kuva ainult kustutamine"</item>
+    <item msgid="3196207224108008441">"Kuva arhiveerimine ja kustutamine"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Vaiketoiming"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Arhiveerimise ja kustutamise toimingud"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Vasta kõigile"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Kasuta vaikeseadena sõnumitele vastamisel"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Pühkimistoimingud"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Arhiveerimine pühkides"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Kustutamine pühkides"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Meilivestluste loendis"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Saatja pilt"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Kuvatakse vestluste loendis nime kõrval"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Kausta ikoon"</string>
     <string name="add_account" msgid="5905863370226612377">"Lisa konto"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Nõuandest loobumine"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automaatne sünkroonimine on välja lülitatud. Puudutage sisselülitamiseks."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Konto sünkroonimine on välja lülitatud. Lülitage see sisse &lt;a href=\'http://www.example.com\'&gt;konto seadetes.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Jaotises <xliff:g id="OUTBOX">%2$s</xliff:g> on <xliff:g id="NUMBER">%1$s</xliff:g> saatmata sõnumit"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Kas lülitada automaatne sünkroonimine sisse?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Kõikides rakendustes ja kontodel (mitte ainult Gmailis) tehtud muudatused sünkroonitakse veebi, teiste seadmete ja seadmega <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"tahvelarvuti"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Lülita sisse"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Kuva <xliff:g id="NUMBER">%1$s</xliff:g> kausta"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Kuva veel <xliff:g id="NUMBER">%1$s</xliff:g> kausta"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Peida kaustad"</string>
     <string name="print" msgid="7987949243936577207">"Printimine"</string>
     <string name="print_all" msgid="4011022762279519941">"Prindi kõik"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Kontode haldamine"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Üldseaded"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Seaded"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Rohkem valikuid"</string>
 </resources>

diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 4fcfc91..e08c3b5 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Gorde zirriborroa"</string>
     <string name="discard" msgid="4905982179911608430">"Baztertu"</string>
     <string name="compose" msgid="2602861958391035523">"Idatzi"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Idatzi"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Erantzun"</item>
     <item msgid="2767793214788399009">"Erantzun guztiei"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Ez dira fitxategi bat edo gehiago erantsi. Muga: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Ez da fitxategia erantsi. <xliff:g id="MAXSIZE">%1$s</xliff:g> muga gainditu da."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Ezin izan da fitxategia erantsi."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Eranskinerako baimena ukatu da."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Gehitu gutxienez hartzaile bat."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Hartzailearen errorea"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Mezua bidali nahi duzu?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Bidali iritzia"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Eraman elkarrizketa"</item>
+    <item quantity="other" msgid="6639576653114141743">"Eraman <xliff:g id="ID_1">%1$d</xliff:g> elkarrizketa"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"Jasotzailea: <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>. Gaia: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="DATE">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"Jasotzailea: <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>. Gaia: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="TIME">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"elkarrizketa irakurri duzu"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ikusi xehetasunak&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ezkutatu xehetasunak"</string>
     <string name="to_message_header" msgid="3954385178027011919">"hartzailea: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Erakutsi <xliff:g id="NAME">%1$s</xliff:g> kontaktuaren informazioa"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Erakutsi kontaktuaren informazioa"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mezu zaharrago"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> mezu zaharrago kargatzen"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Igorlea:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Erantzun honi:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Hartzailea: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Postako karpeta"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Aldatu karpetaz"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Eraman hona:"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Bilatu"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Bilatu postan"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Gailu honetan bilaketak ezin dira ahoz egin."</string>
     <string name="network_error" msgid="5931164247644972255">"Ez dago konexiorik"</string>
     <string name="retry" msgid="916102442074217293">"Saiatu berriro"</string>
     <string name="load_more" msgid="8702691358453560575">"Kargatu gehiago"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Isila"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Ekintza lehenetsia"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Artxibatzeko eta ezabatzeko ekintzak"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Artxibatu"</item>
-    <item msgid="2567465476369142505">"Ezabatu"</item>
+    <item msgid="954772302016538814">"Erakutsi artxibatzeko aukera soilik"</item>
+    <item msgid="7212690302706180254">"Erakutsi ezabatzeko aukera soilik"</item>
+    <item msgid="2539051197590685708">"Erakutsi artxibatzeko eta ezabatzeko aukerak"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Artxibatu"</item>
-    <item msgid="6088164268501960435">"Ezabatu"</item>
+    <item msgid="6877416142040695022">"Erakutsi artxibatzeko aukera soilik"</item>
+    <item msgid="1510017057984222376">"Erakutsi ezabatzeko aukera soilik"</item>
+    <item msgid="3196207224108008441">"Erakutsi artxibatzeko eta ezabatzeko aukerak"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Ekintza lehenetsia"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Artxibatzeko eta ezabatzeko ekintzak"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Erantzun guztiei"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Erabili balio lehenetsi gisa mezuen erantzunetan"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Hatza pasatuta gauzatzen diren ekintzak"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Artxibatzeko, pasatu hatza"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Ezabatzeko, pasatu hatza"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Elkarrizketa-zerrendan"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Igorlearen irudia"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Erakutsi izenaren ondoan elkarrizketen zerrendan"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Karpetaren ikonoa"</string>
     <string name="add_account" msgid="5905863370226612377">"Gehitu kontua"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Baztertu aholkua"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automatikoki sinkronizatzeko aukera desaktibatuta dago. Aktibatzeko, ukitu hau."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Kontua sinkronizatzeko aukera desaktibatuta dago. Aktiba ezazu &lt;a href=\'http://www.example.com\'&gt;Kontuaren ezarpenak&lt;/a&gt; atalean."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Bidali gabeko <xliff:g id="NUMBER">%1$s</xliff:g> mezu daude <xliff:g id="OUTBOX">%2$s</xliff:g>n"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Sinkronizazio automatikoa aktibatu nahi duzu?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Aplikazio eta kontu guztietan (ez soilik Gmail) egiten dituzun aldaketak webgunearekin, zure beste gailuekin eta <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>rekin sinkronizatuko dira."</string>
     <string name="phone" msgid="4142617042507912053">"telefonoa"</string>
     <string name="tablet" msgid="4593581125469224791">"tableta"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Aktibatu"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Erakutsi <xliff:g id="NUMBER">%1$s</xliff:g> karpeta"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Erakutsi <xliff:g id="NUMBER">%1$s</xliff:g> karpeta gehiago"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ezkutatu karpetak"</string>
     <string name="print" msgid="7987949243936577207">"Inprimatu"</string>
     <string name="print_all" msgid="4011022762279519941">"Inprimatu guztiak"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Kudeatu kontuak"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Ezarpen orokorrak"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Ezarpenak"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Aukera gehiago"</string>
 </resources>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c3eff93..331dbd9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"ذخیره پیش‌نویس"</string>
     <string name="discard" msgid="4905982179911608430">"دور انداختن"</string>
     <string name="compose" msgid="2602861958391035523">"نوشتن نامه"</string>
-    <string name="compose_title" msgid="5673376086133995913">"نوشتن نامه"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"پاسخ"</item>
     <item msgid="2767793214788399009">"پاسخ به همه"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"یک یا چند فایل پیوست نشده است. حداکثر ظرفیت <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"فایل پیوست نشد. فراتر از حداکثر ظرفیت <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"پیوست فایل انجام نشد."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"مجوز برای این پیوست رد شد."</string>
     <string name="recipient_needed" msgid="319816879398937214">"حداقل یک گیرنده اضافه کنید."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"خطای گیرنده"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"پیام ارسال شود؟"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"ارسال بازخورد"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"انتقال مکالمه"</item>
+    <item quantity="other" msgid="6639576653114141743">"انتقال <xliff:g id="ID_1">%1$d</xliff:g> مکالمه"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> درباره <xliff:g id="SUBJECT">%3$s</xliff:g>،‏ <xliff:g id="SNIPPET">%4$s</xliff:g> در تاریخ <xliff:g id="DATE">%5$s</xliff:g>،‏ <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> درباره <xliff:g id="SUBJECT">%3$s</xliff:g>،‏ <xliff:g id="SNIPPET">%4$s</xliff:g> ساعت <xliff:g id="TIME">%5$s</xliff:g>،‏ <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"مکالمه خوانده شده است"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"‏<xliff:g id="DATE">%1$s</xliff:g> ‏&lt;a href=\'http://www.example.com\'&gt;مشاهده جزئیات&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"پنهان کردن جزئیات"</string>
     <string name="to_message_header" msgid="3954385178027011919">"به <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"رونوشت مخفی: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"نمایش اطلاعات تماس برای <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"نمایش اطلاعات مخاطب"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> پیام قدیمی‌تر"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"در حال بارگیری <xliff:g id="COUNT">%1$d</xliff:g> پیام قدیمی‌تر"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"از:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"پاسخ به:"</string>
     <string name="to_heading" msgid="3495203282540398336">"به: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"پوشه ایمیل"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"تغییر پوشه‌ها"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"انتقال به"</string>
-    <string name="search_hint" msgid="7060626585689391003">"جستجو"</string>
+    <string name="search_hint" msgid="4916671414132334289">"جستجوی نامه"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"جستجوی صوتی در این دستگاه پشتیبانی نمی‌شود."</string>
     <string name="network_error" msgid="5931164247644972255">"اتصالی موجود نیست"</string>
     <string name="retry" msgid="916102442074217293">"سعی مجدد"</string>
     <string name="load_more" msgid="8702691358453560575">"بارگیری بیشتر"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"بیصدا"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"اقدام پیش‌فرض"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"عملکردهای بایگانی و حذف"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"بایگانی"</item>
-    <item msgid="2567465476369142505">"حذف"</item>
+    <item msgid="954772302016538814">"فقط نمایش بایگانی"</item>
+    <item msgid="7212690302706180254">"فقط نمایش حذف"</item>
+    <item msgid="2539051197590685708">"نمایش بایگانی و حذف"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"بایگانی"</item>
-    <item msgid="6088164268501960435">"حذف"</item>
+    <item msgid="6877416142040695022">"فقط نمایش بایگانی"</item>
+    <item msgid="1510017057984222376">"فقط نمایش حذف"</item>
+    <item msgid="3196207224108008441">"نمایش بایگانی و حذف"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"اقدام پیش‌فرض"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"عملکردهای بایگانی و حذف"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"پاسخ به همه"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"به‌ عنوان پیش‌فرض برای پاسخ‌ به پیام‌ها استفاده شود"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"اقداماتی با کشیدن سریع انگشت"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"کشیدن انگشت روی صفحه برای بایگانی کردن"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"برای حذف با انگشت روی صفحه بکشید"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"در لیست مکالمه"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"تصویر فرستنده"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"نمایش در کنار نام در فهرست مکالمه"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"نماد پوشه"</string>
     <string name="add_account" msgid="5905863370226612377">"افزودن حساب"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"رد کردن نکته راهنما"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"همگام‌سازی حساب غیرفعال است. برای فعال کردن آن را لمس کنید."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"‏همگام‌سازی حساب غیرفعال است. آن را در &lt;a href=\'http://www.example.com\'&gt;تنظیمات حساب&lt;/a&gt; فعال کنید."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> پیام ارسال نشده در <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"همگام‌سازی خودکار روشن شود؟"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"‏تغییراتی که در تمام برنامه‌ها و حساب‌ها ایجاد می‌کنید نه فقط Gmail، بین وب، سایر دستگاه‌هایتان و <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> شما همگام‌سازی می‌شود."</string>
     <string name="phone" msgid="4142617042507912053">"تلفن"</string>
     <string name="tablet" msgid="4593581125469224791">"رایانه لوحی"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"روشن کردن"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"نمایش <xliff:g id="NUMBER">%1$s</xliff:g> پوشه"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"نمایش <xliff:g id="NUMBER">%1$s</xliff:g> پوشه بیشتر"</string>
     <string name="hide_folders" msgid="7618891933409521283">"پنهان کردن پوشه‌ها"</string>
     <string name="print" msgid="7987949243936577207">"چاپ"</string>
     <string name="print_all" msgid="4011022762279519941">"چاپ همه"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"مدیریت حساب‌ها"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"تنظیمات کلی"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"تنظیمات"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"گزینه‌های بیشتر"</string>
 </resources>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fa7bd6f..a638357 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Tallenna luonnos"</string>
     <string name="discard" msgid="4905982179911608430">"Hylkää"</string>
     <string name="compose" msgid="2602861958391035523">"Viestin kirj."</string>
-    <string name="compose_title" msgid="5673376086133995913">"Kirjoita"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Vastaa"</item>
     <item msgid="2767793214788399009">"Vastaa kaikille"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Vähintään yhtä tiedostoa ei liitetty. Raja <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Tiedostoa ei liitetty. Raja (<xliff:g id="MAXSIZE">%1$s</xliff:g> ) saavutettu."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Tiedostoa ei voi liittää."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Liitteen käyttöoikeus hylättiin."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Lisää vähintään yksi vastaanottaja."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Vastaanottajavirhe"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Lähetetäänkö viesti?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Lähetä palautetta"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Siirrä keskustelu"</item>
+    <item quantity="other" msgid="6639576653114141743">"Siirrä <xliff:g id="ID_1">%1$d</xliff:g> keskustelua"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> aiheesta <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> päiväys <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> aiheesta <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kello <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"keskustelu on luettu"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Näytä tiedot&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Piilota tiedot"</string>
     <string name="to_message_header" msgid="3954385178027011919">"vast.ott. <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"piilokopio: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Näytä henkilön <xliff:g id="NAME">%1$s</xliff:g> yhteystiedot"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Näytä yhteystiedot"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> vanhempaa viestiä"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Ladataan <xliff:g id="COUNT">%1$d</xliff:g> vanhempaa viestiä"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Lähettäjä:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Vastausos.:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Vast.ott.: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Sähköpostikansio"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Vaihda kansiota"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Siirrä kohteeseen"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Haku"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Haku viesteistä"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Tämä laite ei tue äänihakua."</string>
     <string name="network_error" msgid="5931164247644972255">"Ei yhteyttä"</string>
     <string name="retry" msgid="916102442074217293">"Yritä uudelleen"</string>
     <string name="load_more" msgid="8702691358453560575">"Lataa lisää"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Äänetön"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Oletustoiminto"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Arkistointi- ja poistotoiminnot"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arkistoi"</item>
-    <item msgid="2567465476369142505">"Poista"</item>
+    <item msgid="954772302016538814">"Näytä vain arkistointi"</item>
+    <item msgid="7212690302706180254">"Näytä vain poisto"</item>
+    <item msgid="2539051197590685708">"Näytä arkistointi ja poisto"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arkistoi"</item>
-    <item msgid="6088164268501960435">"Poista"</item>
+    <item msgid="6877416142040695022">"Näytä vain arkistointi"</item>
+    <item msgid="1510017057984222376">"Näytä vain poisto"</item>
+    <item msgid="3196207224108008441">"Näytä arkistointi ja poisto"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Oletustoiminto"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Arkistointi- ja poistotoiminnot"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Vastaa kaikille"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Käytä oletuksena vastauksissa"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Pyyhkäisytoiminnot"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Arkistoi liu\'uttamalla"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Poista liu\'uttamalla"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Keskusteluluettelossa"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Lähettäjän kuva"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Näytä nimen vieressä keskusteluluettelossa"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Kansiokuvake"</string>
     <string name="add_account" msgid="5905863370226612377">"Lisää tili"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Hylkää vinkki"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Tilin synkronointi ei ole käytössä. Ota se käyttöön koskettamalla."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Tilin synkronointi on pois käytöstä. Ota se käyttöön &lt;a href=\'http://www.esimerkki.fi\'&gt;tilin asetuksista.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g> lähettämätöntä viestiä"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Otetaanko automaattinen synkronointi käyttöön?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Gmailiin ja kaikkiin muihin sovelluksiin ja tileihin tekemäsi muutokset synkronoidaan seuraavissa kohteissa: verkko, muut laitteet ja <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"puhelin"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet-laite"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Ota käyttöön"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Näytä <xliff:g id="NUMBER">%1$s</xliff:g> kansiota"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Näytä <xliff:g id="NUMBER">%1$s</xliff:g> kansiota lisää"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Piilota kansiot"</string>
     <string name="print" msgid="7987949243936577207">"Tulosta"</string>
     <string name="print_all" msgid="4011022762279519941">"Tulosta kaikki"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Tilien hallinnointi"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Yleiset asetukset"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Asetukset"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Lisäasetukset"</string>
 </resources>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ae419aa..9e73920 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Enregistrer le brouillon"</string>
     <string name="discard" msgid="4905982179911608430">"Supprimer"</string>
     <string name="compose" msgid="2602861958391035523">"Nouveau message"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Nouveau"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Répondre"</item>
     <item msgid="2767793214788399009">"Répondre à tous"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Un ou plusieurs fichiers n\'ont pas été joints. La limite est de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Le fichier n\'a pas été joint. Limite de <xliff:g id="MAXSIZE">%1$s</xliff:g> atteinte."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Impossible de joindre le fichier."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Autorisation refusée pour la pièce jointe."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Vous devez indiquer au moins un destinataire."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erreur de destinataire"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Envoyer le message?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Envoyer un commentaire"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Déplacer la conversation"</item>
+    <item quantity="other" msgid="6639576653114141743">"Déplacer <xliff:g id="ID_1">%1$d</xliff:g> conversations"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> à propos de <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> le <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> à propos de <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> à <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversation lue"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Afficher les détails&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Masquer les détails"</string>
     <string name="to_message_header" msgid="3954385178027011919">"à <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"cci : "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Afficher les coordonnées de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Afficher les coordonnées de l\'expéditeur"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> messages plus anciens"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Chargement de <xliff:g id="COUNT">%1$d</xliff:g> messages plus anciens en cours..."</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Langue source :"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Répondre à :"</string>
     <string name="to_heading" msgid="3495203282540398336">"À : "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Dossier de courriel"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Modifier les dossiers"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Placer dans"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Recherche"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Rechercher dans les courriels"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"La recherche vocale n\'est pas prise en charge sur cet appareil."</string>
     <string name="network_error" msgid="5931164247644972255">"Aucune connexion"</string>
     <string name="retry" msgid="916102442074217293">"Réessayer"</string>
     <string name="load_more" msgid="8702691358453560575">"Plus"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g> : <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Mode silencieux"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Action par défaut"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Actions d\'archivage et de suppression"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archiver"</item>
-    <item msgid="2567465476369142505">"Supprimer"</item>
+    <item msgid="954772302016538814">"N\'afficher que le bouton « Archiver »"</item>
+    <item msgid="7212690302706180254">"N\'afficher que le bouton « Supprimer »"</item>
+    <item msgid="2539051197590685708">"Afficher les boutons « Archiver » et « Supprimer »"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archiver"</item>
-    <item msgid="6088164268501960435">"Supprimer"</item>
+    <item msgid="6877416142040695022">"N\'afficher que le bouton « Archiver »"</item>
+    <item msgid="1510017057984222376">"N\'afficher que le bouton « Supprimer »"</item>
+    <item msgid="3196207224108008441">"Afficher les boutons « Archiver » et « Supprimer »"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Action par défaut"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Actions d\'archivage et de suppression"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Répondre à tous"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Utiliser ce paramètre par défaut pour les réponses"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Balayages"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Faire glisser les éléments pour les archiver"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Faire glisser les éléments pour les supprimer"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Dans la liste des conversations"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Image de l\'expéditeur"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Afficher à côté du nom dans la liste des conversations"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Icône de dossier"</string>
     <string name="add_account" msgid="5905863370226612377">"Ajouter un compte"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Masquer le conseil"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"La synchronisation est désactivée. Touchez pour l\'activer."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"La synchronisation des comptes est désactivée. Activez-la dans les &lt;a href=\'http://www.example.com\'&gt;paramètres du compte&lt;/a&gt;."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> message(s) non envoyé(s) dans <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Activer la synchronisation automatique?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Les modifications que vous apporterez dans l\'ensemble des applications et des comptes, pas seulement dans Gmail, seront synchronisées avec le Web, vos autres appareils et votre <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"téléphone"</string>
     <string name="tablet" msgid="4593581125469224791">"tablette"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Activer"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Afficher <xliff:g id="NUMBER">%1$s</xliff:g> dossiers"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Afficher <xliff:g id="NUMBER">%1$s</xliff:g> autres dossiers"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Masquer les dossiers"</string>
     <string name="print" msgid="7987949243936577207">"Imprimer"</string>
     <string name="print_all" msgid="4011022762279519941">"Tout imprimer"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Gérer les comptes"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Paramètres généraux"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Paramètres"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Plus d\'options"</string>
 </resources>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2a63154..b711c2b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Enregistrer le brouillon"</string>
     <string name="discard" msgid="4905982179911608430">"Supprimer"</string>
     <string name="compose" msgid="2602861958391035523">"Nouveau message"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Rédiger"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Répondre"</item>
     <item msgid="2767793214788399009">"Répondre à tous"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Un ou plusieurs fichiers n\'ont pas été joints. La limite est de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Le fichier n\'a pas été joint. Limite de <xliff:g id="MAXSIZE">%1$s</xliff:g> atteinte."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Impossible de joindre le fichier."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Autorisation refusée pour la pièce jointe."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Ajoutez au moins un destinataire."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erreur de destinataire"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Envoyer le message ?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Envoyer des commentaires"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Déplacer la conversation"</item>
+    <item quantity="other" msgid="6639576653114141743">"Déplacer <xliff:g id="ID_1">%1$d</xliff:g> conversations"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> à propos de \"<xliff:g id="SUBJECT">%3$s</xliff:g>\", <xliff:g id="SNIPPET">%4$s</xliff:g> le <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> à propos de \"<xliff:g id="SUBJECT">%3$s</xliff:g>\", <xliff:g id="SNIPPET">%4$s</xliff:g> à <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversation lue"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Afficher les détails&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Masquer les informations détaillées"</string>
     <string name="to_message_header" msgid="3954385178027011919">"à <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"cci : "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Afficher les coordonnées de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Afficher les coordonnées de l\'expéditeur"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> messages plus anciens"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Chargement de <xliff:g id="COUNT">%1$d</xliff:g> messages plus anciens en cours..."</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"De :"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Adresse de réponse :"</string>
     <string name="to_heading" msgid="3495203282540398336">"À : "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Dossier \"E-mail\""</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Modifier les dossiers"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Déplacer vers"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Rechercher"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Rechercher dans les messages"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"La recherche vocale n\'est pas disponible sur cet appareil."</string>
     <string name="network_error" msgid="5931164247644972255">"Aucune connexion"</string>
     <string name="retry" msgid="916102442074217293">"Réessayer"</string>
     <string name="load_more" msgid="8702691358453560575">"Afficher plus"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g> : <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Mode silencieux"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Action par défaut"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Actions d\'archivage et de suppression"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archiver"</item>
-    <item msgid="2567465476369142505">"Supprimer"</item>
+    <item msgid="954772302016538814">"N\'afficher que le bouton \"Archiver\""</item>
+    <item msgid="7212690302706180254">"N\'afficher que le bouton \"Supprimer\""</item>
+    <item msgid="2539051197590685708">"Afficher les boutons \"Archiver\" et \"Supprimer\""</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archiver."</item>
-    <item msgid="6088164268501960435">"Supprimer."</item>
+    <item msgid="6877416142040695022">"N\'afficher que le bouton \"Archiver\""</item>
+    <item msgid="1510017057984222376">"N\'afficher que le bouton \"Supprimer\""</item>
+    <item msgid="3196207224108008441">"Afficher les boutons \"Archiver\" et \"Supprimer\""</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Action par défaut"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Actions d\'archivage et de suppression"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Répondre à tous"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Utiliser ce paramètre par défaut pour les réponses"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Balayages"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Faire glisser pour archiver"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Faire glisser pour supprimer"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Dans la liste des conversations"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Image de l\'expéditeur"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Afficher à côté du nom dans la liste des conversations"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Icône Dossier"</string>
     <string name="add_account" msgid="5905863370226612377">"Ajouter un compte"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Masquer le conseil"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"La synchronisation automatique est désactivée. Appuyez ici pour l\'activer."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"La synchronisation de compte est désactivée. Activez-la dans &lt;a href=\'http://www.example.com\'&gt;Paramètres de compte.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> message(s) non envoyé(s) dans <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Activer la synchronisation automatique ?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Les modifications que vous apporterez dans l\'ensemble des applications et des comptes, pas seulement dans Gmail, seront synchronisées avec le Web, vos autres appareils et votre <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"téléphone"</string>
     <string name="tablet" msgid="4593581125469224791">"tablette"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Activer"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Afficher <xliff:g id="NUMBER">%1$s</xliff:g> dossiers"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Afficher <xliff:g id="NUMBER">%1$s</xliff:g> autres dossiers"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Masquer les dossiers"</string>
     <string name="print" msgid="7987949243936577207">"Imprimer"</string>
     <string name="print_all" msgid="4011022762279519941">"Tout imprimer"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Gérer les comptes"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Paramètres généraux"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Paramètres"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Autres options"</string>
 </resources>

diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 7c9998f..6942d2b 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Gardar borrador"</string>
     <string name="discard" msgid="4905982179911608430">"Descartar"</string>
     <string name="compose" msgid="2602861958391035523">"Redactar"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Redactar"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Responder"</item>
     <item msgid="2767793214788399009">"Responder a todos"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Non se anexaron un ou máis ficheiros. Límite: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Non se anexou o ficheiro. Alcanzouse o límite de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Non se puido anexar o ficheiro."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Permiso denegado para o anexo."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Engade polo menos un destinatario."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erro de destinatario"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Enviar mensaxe?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar comentarios"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Mover conversa"</item>
+    <item quantity="other" msgid="6639576653114141743">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversas"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> acerca de <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> o <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> acerca de <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ás <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversa lida"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ver detalles&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalles"</string>
     <string name="to_message_header" msgid="3954385178027011919">"para <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"cco: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Mostrar información de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Mostrar información do contacto"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensaxes máis antigas"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Cargando <xliff:g id="COUNT">%1$d</xliff:g> mensaxes máis antigas"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"De:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Responder a:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Cartafol de correo electrónico"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Cambiar cartafoles"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Mover a"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Buscar"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Buscar correo"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"A busca por voz non se admite neste dispositivo."</string>
     <string name="network_error" msgid="5931164247644972255">"Sen conexión"</string>
     <string name="retry" msgid="916102442074217293">"Tentar de novo"</string>
     <string name="load_more" msgid="8702691358453560575">"Cargar máis"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silencio"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Acción predeterminada"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Accións de arquivar e eliminar"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arquivar"</item>
-    <item msgid="2567465476369142505">"Eliminar"</item>
+    <item msgid="954772302016538814">"Mostrar só arquivar"</item>
+    <item msgid="7212690302706180254">"Mostrar só eliminar"</item>
+    <item msgid="2539051197590685708">"Mostrar arquivar e eliminar"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arquiva"</item>
-    <item msgid="6088164268501960435">"Elimina"</item>
+    <item msgid="6877416142040695022">"Mostrar só arquivar"</item>
+    <item msgid="1510017057984222376">"Mostra só eliminar"</item>
+    <item msgid="3196207224108008441">"Mostrar arquivar e eliminar"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Acción predeterminada"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Accións de arquivar e eliminar"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Usar como opción predeterminada para responder mensaxes"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Accións de pasar o dedo"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Pasa o dedo para arquivar"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Pasa o dedo para eliminar"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Na lista de conversas"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Imaxe do remitente"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Mostrar ao lado do nome na lista de conversas"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Icona do cartafol"</string>
     <string name="add_account" msgid="5905863370226612377">"Engadir conta"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Rexeitar consello"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"A sincronización automática está desactivada. Toca para activala."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"A sincronización da conta está desactivada. Actívaa en &lt;a href=\'http://www.example.com\'&gt;Configuración da conta.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> mensaxes non enviadas en <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Activar a sincronización automática?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Os cambios que fas en todas as aplicacións e contas, non só en Gmail, sincronizaranse entre a web, os demais dispositivos e o <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"teléfono"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Activar"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Mostrar <xliff:g id="NUMBER">%1$s</xliff:g> cartafoles"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Mostrar <xliff:g id="NUMBER">%1$s</xliff:g> cartafoles máis"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ocultar cartafoles"</string>
     <string name="print" msgid="7987949243936577207">"Imprimir"</string>
     <string name="print_all" msgid="4011022762279519941">"Imprimir todo"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Xestionar contas"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Configuración xeral"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Configuración"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Máis opcións"</string>
 </resources>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e209a66..ade194e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"अधूरा ईमेल सहेजें"</string>
     <string name="discard" msgid="4905982179911608430">"हटाएं"</string>
     <string name="compose" msgid="2602861958391035523">"लिखें"</string>
-    <string name="compose_title" msgid="5673376086133995913">"लिखें"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"जवाब दें"</item>
     <item msgid="2767793214788399009">"सभी को जवाब दें"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"एक या अधिक फ़ाइलें अटैचमेंट नहीं हुईं. सीमा <xliff:g id="MAXSIZE">%1$s</xliff:g> की है."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"फ़ाइल अटैचमेंट नहीं हुई. <xliff:g id="MAXSIZE">%1$s</xliff:g> सीमा पूरी हो गई."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"फ़ाइल अनुलग्न नहीं की जा सकी."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"अटैचमेंट के लिए अनुमति अस्वीकृत."</string>
     <string name="recipient_needed" msgid="319816879398937214">"कम से कम एक प्राप्तकर्ता जोड़ें."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"प्राप्तकर्ता त्रुटि"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"संदेश भेजें?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"सुझाव भेजें"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"बातचीत ले जाएं"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> बातचीत ले जाएं"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="SUBJECT">%3$s</xliff:g> के बारे में <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="DATE">%5$s</xliff:g> पर <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="SUBJECT">%3$s</xliff:g> के बारे में <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="TIME">%5$s</xliff:g> पर <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"वार्तालाप पढ़ा गया"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;विवरण देखें&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"विवरणों को छिपाएं"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> को"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> की संपर्क जानकारी दिखाएं"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"संपर्क जानकारी दिखाएं"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> पुराने संदेश"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> पुराने संदेश लोड हो रहा हैं"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"प्रेषक:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"उत्तर पता:"</string>
     <string name="to_heading" msgid="3495203282540398336">"प्रति: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ईमेल फ़ोल्डर"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"फ़ोल्डर बदलें"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"इसमें ले जाएं"</string>
-    <string name="search_hint" msgid="7060626585689391003">"खोजें"</string>
+    <string name="search_hint" msgid="4916671414132334289">"मेल खोजें"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"इस उपकरण पर ध्‍वनि खोज सुविधा उपलब्‍ध नहीं है."</string>
     <string name="network_error" msgid="5931164247644972255">"कोई कनेक्शन नहीं"</string>
     <string name="retry" msgid="916102442074217293">"पुन: प्रयास करें"</string>
     <string name="load_more" msgid="8702691358453560575">"अधिक लोड करें"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"मौन"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"डिफ़ॉल्ट कार्रवाई"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"संगृहीत करें और हटाएं कार्यवाही"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"संग्रह"</item>
-    <item msgid="2567465476369142505">"हटाएं"</item>
+    <item msgid="954772302016538814">"केवल संगृहीत करें दिखाएं"</item>
+    <item msgid="7212690302706180254">"केवल हटाएं दिखाएं"</item>
+    <item msgid="2539051197590685708">"संगृहीत करें और हटाएं दिखाएं"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"संग्रह"</item>
-    <item msgid="6088164268501960435">"हटाएं"</item>
+    <item msgid="6877416142040695022">"केवल संगृहीत करें दिखाएं"</item>
+    <item msgid="1510017057984222376">"केवल हटाएं दिखाएं"</item>
+    <item msgid="3196207224108008441">"संगृहीत करें और हटाएं दिखाएं"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"डिफ़ॉल्ट कार्रवाई"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"संगृहीत करें और हटाएं कार्यवाही"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"सभी को जवाब दें"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"संदेश के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"स्वाइप कार्रवाइयां"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"संगृहीत करने के लिए स्वाइप करें"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"हटाने के लिए स्वाइप करें"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"बातचीत की सूची में"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"प्रेषक का चित्र"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"बातचीत सूची में नाम के पास दिखाएं"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"फ़ोल्डर आइकन"</string>
     <string name="add_account" msgid="5905863370226612377">"खाता जोड़ें"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"युक्ति ख़ारिज करें"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"स्‍वतः समन्‍वयन बंद है. चालू करने के लिए स्पर्श करें."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"खाता समन्वयन बंद है. &lt;a href=\'http://www.example.com\'&gt;खाता सेटिंग&lt;/a&gt; में चालू करें"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> में <xliff:g id="NUMBER">%1$s</xliff:g> अप्रेषित"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"स्वत:-समन्वयन चालू करें?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"आपके द्वारा न केवल Gmail में, बल्कि सभी ऐप्स  और खातों में किए जाने वाले बदलाव, वेब, आपके अन्य उपकरणों, और आपके <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> के बीच समन्वयित किए जाएंगे."</string>
     <string name="phone" msgid="4142617042507912053">"फ़ोन"</string>
     <string name="tablet" msgid="4593581125469224791">"टेबलेट"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"चालू करें"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> फ़ोल्डर दिखाएं"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"<xliff:g id="NUMBER">%1$s</xliff:g> और फ़ोल्डर दिखाएं"</string>
     <string name="hide_folders" msgid="7618891933409521283">"फ़ोल्डर छिपाएं"</string>
     <string name="print" msgid="7987949243936577207">"प्रिंट करें"</string>
     <string name="print_all" msgid="4011022762279519941">"सभी प्रिंट करें"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"खाते प्रबंधित करें"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"सामान्य सेटिंग"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"सेटिंग"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"और विकल्प"</string>
 </resources>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index d82bd3f..cd1f17c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Spremi skicu"</string>
     <string name="discard" msgid="4905982179911608430">"Zanemari"</string>
     <string name="compose" msgid="2602861958391035523">"Nova poruka"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Nova"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Odgovor"</item>
     <item msgid="2767793214788399009">"Odgovori svima"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Jedna ili više datoteka nije priloženo. Ograničenje je <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Datoteka nije priložena. Dosegnuto je ograničenje od <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Nije moguće priložiti datoteku."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Dozvola za privitak odbijena je."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Dodajte barem jednog primatelja."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Pogreška primatelja"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Poslati poruku?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Pošaljite povratne informacije"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Premjesti razgovor"</item>
+    <item quantity="other" msgid="6639576653114141743">"Premjesti sljedeći broj razgovora: <xliff:g id="ID_1">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> o temi <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> dana <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> o temi <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> u <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"razgovor je pročitan"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Prikaz pojedinosti&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Sakrij detalje"</string>
     <string name="to_message_header" msgid="3954385178027011919">"prima <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"skp: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Prikaži podatke o kontaktu za <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Prikaži podatke o kontaktu"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Broj starijih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Učitavanje <xliff:g id="COUNT">%1$d</xliff:g> starijih poruka"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Šalje:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Prima:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Prima: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Mapa e-pošte"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Promjena mapa"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Premještanje"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Pretraživanje"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Pretraži poštu"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Uređaj ne podržava glasovno pretraživanje."</string>
     <string name="network_error" msgid="5931164247644972255">"Nema veze"</string>
     <string name="retry" msgid="916102442074217293">"Pokušajte ponovo"</string>
     <string name="load_more" msgid="8702691358453560575">"Učitaj više"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Bešumno"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Zadana radnja"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Radnje arhiviranja i brisanja"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arhiviraj"</item>
-    <item msgid="2567465476369142505">"Izbriši"</item>
+    <item msgid="954772302016538814">"Prikaži samo arhiviranje"</item>
+    <item msgid="7212690302706180254">"Prikaži samo brisanje"</item>
+    <item msgid="2539051197590685708">"Prikaži arhiviranje i brisanje"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arhiviraj"</item>
-    <item msgid="6088164268501960435">"Izbriši"</item>
+    <item msgid="6877416142040695022">"Prikaži samo arhiviranje"</item>
+    <item msgid="1510017057984222376">"Prikaži samo brisanje"</item>
+    <item msgid="3196207224108008441">"Prikaži arhiviranje i brisanje"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Zadana radnja"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Radnje arhiviranja i brisanja"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Odgovori svima"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Upotrijebi kao zadano za odgovore na poruke"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Povlačenje prstom"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Prijeđite prstom da biste arhivirali"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Prijeđite prstom da biste izbrisali"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Na popisu razgovora"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Slika pošiljatelja"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Prikaži pored imena na popisu razgovora"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ikona mape"</string>
     <string name="add_account" msgid="5905863370226612377">"Dodaj račun"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Odbacivanje savjeta"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automatska sinkronizacija je isključena. Dodirnite za uključivanje."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Sinkronizacija računa je isključena. Uključite je u &lt;a href=\'http://www.example.com\'&gt;Postavkama računa.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Broj neposlanih poruka u mapi <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Želite li uključiti automatsku sinkronizaciju?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Promjene koje unesete na svim aplikacijama i računima, a ne samo na Gmailu, sinkronizirat će se na webu, vašim ostalim uređajima i vašem uređaju <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Uključi"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Prikaži ovoliko mapa: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Prikaži još mapa (<xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Sakrij mape"</string>
     <string name="print" msgid="7987949243936577207">"Ispis"</string>
     <string name="print_all" msgid="4011022762279519941">"Ispiši sve"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Upravljanje računima"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Opće postavke"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Postavke"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Dodatne opcije"</string>
 </resources>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1ac448f..19dcda8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Piszkozat mentése"</string>
     <string name="discard" msgid="4905982179911608430">"Elvetés"</string>
     <string name="compose" msgid="2602861958391035523">"Levélírás"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Levélírás"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Válasz"</item>
     <item msgid="2767793214788399009">"Válasz mindnek"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Egy vagy több fájl nem lett csatolva. A korlát <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"A fájl nem lett csatolva. Elérte a(z) <xliff:g id="MAXSIZE">%1$s</xliff:g> korlátot."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"A fájlt nem lehet csatolni."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"A mellékletre vonatkozó jogosultság le van tiltva."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Vegyen fel legalább egy címzettet."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Hiba a címzettnél"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Elküldi az üzenetet?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Visszajelzés"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Beszélgetés áthelyezése"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> beszélgetés áthelyezése"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> a következővel kapcsolatban: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ezen a napon: <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> a következővel kapcsolatban: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ekkor: <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"beszélgetés elolvasva"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Részletek megtekintése&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Részletek elrejtése"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> részére"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"titkos m.: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> elérhetőségi adatainak megjelenítése"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Névjegyinformációk megjelenítése"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> régebbi üzenet"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> korábbi üzenet betöltése"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Feladó:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Válaszcím:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Címzett: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"E-mail mappa"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Mappaváltás"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Áthelyezés ide:"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Keresés"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Keresés a levelek között"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Az eszköz nem támogatja a hangkeresést."</string>
     <string name="network_error" msgid="5931164247644972255">"Nincs kapcsolat"</string>
     <string name="retry" msgid="916102442074217293">"Újra"</string>
     <string name="load_more" msgid="8702691358453560575">"Továbbiak betöltése"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Néma"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Alapértelmezett művelet"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"{0}Archiválási és törlési műveletek{/0}"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archiválás"</item>
-    <item msgid="2567465476369142505">"Törlés"</item>
+    <item msgid="954772302016538814">"Csak az archiválás felajánlása"</item>
+    <item msgid="7212690302706180254">"Csak a törlés felajánlása"</item>
+    <item msgid="2539051197590685708">"Az archiválás és a törlés felajánlása"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archiválás"</item>
-    <item msgid="6088164268501960435">"Törlés"</item>
+    <item msgid="6877416142040695022">"Csak az archiválás felajánlása"</item>
+    <item msgid="1510017057984222376">"Csak a törlés felajánlása"</item>
+    <item msgid="3196207224108008441">"Az archiválás és a törlés felajánlása"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Alapértelmezett művelet"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Archiválási és törlési műveletek"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Válasz mindenkinek"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Használat alapértelmezettként válaszüzenetekhez"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Húzási műveletek"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Csúsztassa ujját az archiváláshoz"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Törléshez csúsztassa az ujját"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Beszélgetéslistán"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Feladó képe"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Megjelenítés a név mellett a beszélgetések listájában"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Mappa ikon"</string>
     <string name="add_account" msgid="5905863370226612377">"Fiók hozzáadása"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Tipp elvetése"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Az automatikus szinkronizálás ki van kapcsolva. Koppintson ide a bekapcsoláshoz."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"A fiókszinkronizálás ki van kapcsolva. Kapcsolja be itt: &lt;a href=\'http://www.example.com\'&gt;Fiókbeállítások.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> nem elküldött levél van itt: <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Bekapcsolja az automatikus szinkronizálást?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Az összes alkalmazásban és fiókban (nem csak a Gmailben) végrehajtott módosítások szinkronizálva lesznek az internet, az egyéb eszközök és a <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> között."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"táblagép"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Bekapcsolás"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> mappa megjelenítése"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"További <xliff:g id="NUMBER">%1$s</xliff:g> mappa megjelenítése"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Mappák elrejtése"</string>
     <string name="print" msgid="7987949243936577207">"Nyomtatás"</string>
     <string name="print_all" msgid="4011022762279519941">"Az összes nyomtatása"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Fiókok kezelése"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Általános beállítások"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Beállítások"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"További lehetőségek"</string>
 </resources>

diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 2bb8229..753f9e4 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Սևագիրը պահել"</string>
     <string name="discard" msgid="4905982179911608430">"Հրաժարվել"</string>
     <string name="compose" msgid="2602861958391035523">"Գրել"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Գրել"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Պատասխանել"</item>
     <item msgid="2767793214788399009">"Պատասխանել բոլորին"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Մեկ կամ ավելի ֆայլեր չեն կցվել: Սահմանափակում <xliff:g id="MAXSIZE">%1$s</xliff:g>:"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Ֆայլը կցված չէ: <xliff:g id="MAXSIZE">%1$s</xliff:g>-ի սահմանը լրացել է:"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Ֆայլը կցել չհաջողվեց:"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Այս ֆայլը կցելու թույլտվություն չունեք:"</string>
     <string name="recipient_needed" msgid="319816879398937214">"Ավելացնել առնվազն մեկ ստացող:"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Ստացողի սխալ"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Ուղարկե՞լ հաղորդագրությունը:"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Ուղարկել կարծիք"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Տեղափոխել խոսակցությունը"</item>
+    <item quantity="other" msgid="6639576653114141743">"Տեղափոխել <xliff:g id="ID_1">%1$d</xliff:g> խոսակցությունները"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>-ի մասին, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>-ին, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>-ի <xliff:g id="SUBJECT">%3$s</xliff:g> մասին, <xliff:g id="SNIPPET">%4$s</xliff:g> ժամը <xliff:g id="TIME">%5$s</xliff:g>-ին, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"խոսակցությունը ընթերցված է"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Մանրամասներ&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Թաքցնել մանրամասները"</string>
     <string name="to_message_header" msgid="3954385178027011919">"Ստացող՝ <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"ծպճ՝ "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Ցուցադրել <xliff:g id="NAME">%1$s</xliff:g>-ի կոնտակտային տվյալները"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Ցույց տալ կոնտակտային տեղեկությունները"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ավելի հին հաղորդագրություն"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Բեռնվում է <xliff:g id="COUNT">%1$d</xliff:g> հին հաղորդագրություն"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Ուղարկող`"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Պատասխանել"</string>
     <string name="to_heading" msgid="3495203282540398336">"Ստացող՝ "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Փոստային թղթապանակ"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Փոխել թղթապանակները"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Տեղափոխել"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Որոնել"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Որոնել նամակ"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Ձայնային որոնումը չի աջակցվում այս սարքի վրա:"</string>
     <string name="network_error" msgid="5931164247644972255">"Կապ չկա"</string>
     <string name="retry" msgid="916102442074217293">"Կրկին փորձել"</string>
     <string name="load_more" msgid="8702691358453560575">"Բեռնել ավելին"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>. <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Լուռ"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Կանխադրված գործողություն"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Արխիվացնել &amp; ջնջել գործողությունները"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Արխիվ"</item>
-    <item msgid="2567465476369142505">"Ջնջել"</item>
+    <item msgid="954772302016538814">"Ցուցադրել միայն արխիվացումը"</item>
+    <item msgid="7212690302706180254">"Ցուցադրել միայն ջնջելը"</item>
+    <item msgid="2539051197590685708">"Ցույց տալ արխիվը &amp; ջնջել"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Արխիվ"</item>
-    <item msgid="6088164268501960435">"Ջնջել"</item>
+    <item msgid="6877416142040695022">"Ցուցադրել միայն արխիվացումը"</item>
+    <item msgid="1510017057984222376">"Ցույց տալ միայն ջնջելը"</item>
+    <item msgid="3196207224108008441">"Ցույց տալ արխիվը &amp; ջնջել"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Կանխադրված գործողություն"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Արխիվացնել &amp; ջնջել գործողությունները"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Պատասխանել բոլորին"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Օգտագործել որպես լռելյայն բոլոր պատասխանների համար"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Սահահարվածել գործողություններին"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Սահահարվածեք արխիվացնելու համար"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Սահահարվածեք` ջնջելու համար"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Զրույցի ցանկում"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Ուղարկողի պատկերը"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Ցուցադրել անվան կողքին խոսակցության ցանկում"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Թղթապանակի պատկերակ"</string>
     <string name="add_account" msgid="5905863370226612377">"Ավելացնել հաշիվ"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Անտեսել հուշումը"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Ինքնուրույն համաժամեցումն անջատված է: Միացնելու համար հպեք:"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Հաշվի համաժամեցումն անջատված է: Միացրեք այն &lt;a href=\'http://www.example.com\'&gt;Հաշվի կարգավորումներում:&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> չուղարկված՝ <xliff:g id="OUTBOX">%2$s</xliff:g>-ում"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Միացնե՞լ ինքնահամաժամեցումը:"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Ոչ միայն Gmail-ում, այլև մյուս բոլոր հավելվածներում և հաշիվներում ձեր կատարած փոփոխությունները կհամաժամեցվեն ցանցի, ձեր մյուս սարքերի և ձեր  <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>-ի միջև:"</string>
     <string name="phone" msgid="4142617042507912053">"հեռախոսահամար"</string>
     <string name="tablet" msgid="4593581125469224791">"գրասալիկ"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Միացնել"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Ցույց տալ <xliff:g id="NUMBER">%1$s</xliff:g> թղթապանակ"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Ցույց տալ ևս <xliff:g id="NUMBER">%1$s</xliff:g> թղթապանակ"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Թաքցնել թղթապանակները"</string>
     <string name="print" msgid="7987949243936577207">"Տպել"</string>
     <string name="print_all" msgid="4011022762279519941">"Տպել ամբողջը"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Կառավարեք հաշիվները"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Ընդհանուր կարգավորումներ"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Կարգավորումներ"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Հավելյալ ընտրանքներ"</string>
 </resources>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 967410c..cf8775d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Simpan draf"</string>
     <string name="discard" msgid="4905982179911608430">"Buang"</string>
     <string name="compose" msgid="2602861958391035523">"Tulis"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Tulis"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Balas"</item>
     <item msgid="2767793214788399009">"Balas semua"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Satu atau beberapa file tidak dilampirkan. Batas <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"File tidak dilampirkan. Batas <xliff:g id="MAXSIZE">%1$s</xliff:g> tercapai."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Tidak dapat melampirkan file."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Izin ditolak untuk lampiran tersebut."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Tambahkan setidaknya satu penerima."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Kesalahan penerima"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Kirim pesan?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Kirim masukan"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Pindahkan percakapan"</item>
+    <item quantity="other" msgid="6639576653114141743">"Pindahkan <xliff:g id="ID_1">%1$d</xliff:g> percakapan"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> tentang <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pada tanggal <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> tentang <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pukul <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"percakapan telah dibaca"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Tampilkan detail&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Sembunyikan detail"</string>
     <string name="to_message_header" msgid="3954385178027011919">"ke <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Tampilkan informasi kontak untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Tampilkan informasi kontak"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> pesan lebih lama"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Memuat <xliff:g id="COUNT">%1$d</xliff:g> pesan lebih lama"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Dari:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Balas-ke:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Kepada: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Folder email"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Ganti folder"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Pindahkan ke"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Penelusuran"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Telusuri email"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Penelusuran suara tidak didukung pada perangkat ini."</string>
     <string name="network_error" msgid="5931164247644972255">"Tidak ada sambungan"</string>
     <string name="retry" msgid="916102442074217293">"Coba lagi"</string>
     <string name="load_more" msgid="8702691358453560575">"Muat lainnya"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Tidak Berbunyi"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Tindakan default"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Tindakan mengarsipkan dan &amp; menghapus"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arsipkan"</item>
-    <item msgid="2567465476369142505">"Hapus"</item>
+    <item msgid="954772302016538814">"Hanya tampilkan yang diarsipkan"</item>
+    <item msgid="7212690302706180254">"Hanya tampilkan yang dihapus"</item>
+    <item msgid="2539051197590685708">"Tampilkan yang diarsipkan &amp; dihapus"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arsipkan"</item>
-    <item msgid="6088164268501960435">"Hapus"</item>
+    <item msgid="6877416142040695022">"Hanya tampilkan yang diarsipkan"</item>
+    <item msgid="1510017057984222376">"Hanya tampilkan yang dihapus"</item>
+    <item msgid="3196207224108008441">"Tampilkan yang diarsipkan &amp; dihapus"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Tindakan default"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Tindakan mengarsipkan dan &amp; menghapus"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Balas ke semua"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Gunakan sebagai default untuk balasan pesan"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Tindakan sapu"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Gesek untuk mengarsipkan"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Gesek untuk menghapus"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Dalam daftar percakapan"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Gambar pengirim"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Tampilkan di samping nama dalam daftar percakapan"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ikon folder"</string>
     <string name="add_account" msgid="5905863370226612377">"Tambahkan akun"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Tutup kiat"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Sinkronisasi otomatis dinonaktifkan. Sentuh untuk mengaktifkannya."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Sinkronisasi akun dinonaktifkan. Aktifkan di &lt;a href=\'http://www.example.com\'&gt;Setelan akun.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> tidak terkirim di <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Aktifkan sinkronisasi otomatis?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Perubahan yang Anda lakukan pada semua aplikasi dan akun, bukan hanya Gmail, akan disinkronkan antara web, perangkat Anda lainnya, dan <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"ponsel"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Aktifkan"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Tampilkan <xliff:g id="NUMBER">%1$s</xliff:g> folder"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Tampilkan <xliff:g id="NUMBER">%1$s</xliff:g> folder lagi"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Sembunyikan folder"</string>
     <string name="print" msgid="7987949243936577207">"Cetak"</string>
     <string name="print_all" msgid="4011022762279519941">"Cetak semua"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Kelola Akun"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Setelan umum"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Setelan"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Opsi lainnya"</string>
 </resources>

diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index c348922..ea649b5 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Vista drög"</string>
     <string name="discard" msgid="4905982179911608430">"Fleygja"</string>
     <string name="compose" msgid="2602861958391035523">"Skrifa póst"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Skrifa"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Svara"</item>
     <item msgid="2767793214788399009">"Svara öllum"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Ein eða fleiri skrár voru ekki hengdar við. Hámarkið er <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Skráin var ekki hengd við. <xliff:g id="MAXSIZE">%1$s</xliff:g> hámarki náð."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Ekki var hægt að hengja skrána við."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Heimild neitað fyrir viðhengið."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Bættu að minnsta kosti einum viðtakanda við."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Villa í viðtakanda"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Senda skeyti?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Senda ábendingu"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Færa samtal"</item>
+    <item quantity="other" msgid="6639576653114141743">"Færa <xliff:g id="ID_1">%1$d</xliff:g> samtöl"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> um <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> um <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> klukkan <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"samtal lesið"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Skoða upplýsingar&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Fela upplýsingar"</string>
     <string name="to_message_header" msgid="3954385178027011919">"til <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"falið afrit: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Sýna samskiptaupplýsingar fyrir <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Sýna samskiptaupplýsingar"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> eldri skeyti"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Hleður <xliff:g id="COUNT">%1$d</xliff:g> eldri skeyti"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Frá:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Svarnetfang:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Til: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Tölvupóstsmappa"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Skipta um möppu"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Færa í"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Leita"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Leita í pósti"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Raddleit er ekki studd í þessu tæki."</string>
     <string name="network_error" msgid="5931164247644972255">"Engin tenging"</string>
     <string name="retry" msgid="916102442074217293">"Reyna aftur"</string>
     <string name="load_more" msgid="8702691358453560575">"Hlaða fleiri"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Hljóðlaust"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Sjálfgefin aðgerð"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Aðgerðir til að setja í geymslu og eyða"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Setja í geymslu"</item>
-    <item msgid="2567465476369142505">"Eyða"</item>
+    <item msgid="954772302016538814">"Sýna aðeins geymslu"</item>
+    <item msgid="7212690302706180254">"Sýna aðeins eyðingu"</item>
+    <item msgid="2539051197590685708">"Sýna valkosti fyrir geymslu og eyðingu"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Setja í geymslu"</item>
-    <item msgid="6088164268501960435">"Eyða"</item>
+    <item msgid="6877416142040695022">"Sýna aðeins geymslu"</item>
+    <item msgid="1510017057984222376">"Sýna aðeins valkost fyrir eyðingu"</item>
+    <item msgid="3196207224108008441">"Sýna geymslu og eyðingu"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Sjálfgefin aðgerð"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Aðgerðir til að setja í geymslu og eyða"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Svara öllum"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Nota sem sjálfgefið þegar skeytum er svarað"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Strokaðgerðir"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Strjúka til að setja í geymslu"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Strjúka til að eyða"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Á samtalalista"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Mynd sendanda"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Sýna við hlið nafns í samtalalista"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Möpputákn"</string>
     <string name="add_account" msgid="5905863370226612377">"Bæta reikningi við"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Hunsa ábendingu"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Slökkt er á sjálfvirkri samstillingu. Snertu til að kveikja á henni."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Slökkt er á samstillingu reikningsins. Kveiktu á henni í &lt;a href=\'http://www.example.com\'&gt;reikningsstillingunum.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> ósend í <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Kveikja á sjálfvirkri samstillingu?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Breytingar sem þú gerir á öllum forritum og reikningum, ekki bara Gmail, verða samstilltar á milli vefs, annarra tækja og <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"sími"</string>
     <string name="tablet" msgid="4593581125469224791">"spjaldtölva"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Kveikja"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Sýna <xliff:g id="NUMBER">%1$s</xliff:g> möppur"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Sýna <xliff:g id="NUMBER">%1$s</xliff:g> möppur í viðbót"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Fela möppur"</string>
     <string name="print" msgid="7987949243936577207">"Prenta"</string>
     <string name="print_all" msgid="4011022762279519941">"Prenta allt"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Stjórna reikningum"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Almennar stillingar"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Stillingar"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Fleiri valkostir"</string>
 </resources>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index e7eb1f4..5cdfe07 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Salva bozza"</string>
     <string name="discard" msgid="4905982179911608430">"Elimina"</string>
     <string name="compose" msgid="2602861958391035523">"Scrivi"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Scrivi"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Rispondi"</item>
     <item msgid="2767793214788399009">"Rispondi a tutti"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Uno o più file non allegati. Limite di <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"File non allegato. Limite di <xliff:g id="MAXSIZE">%1$s</xliff:g> raggiunto."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Impossibile allegare il file."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Autorizzazione negata per l\'allegato."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Aggiungi almeno un destinatario."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Errore destinatario"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Inviare il messaggio?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Invia feedback"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Sposta conversazione"</item>
+    <item quantity="other" msgid="6639576653114141743">"Sposta <xliff:g id="ID_1">%1$d</xliff:g> conversazioni"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> in merito a <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> in data <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> in merito a <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> alle <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversazione letta"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Vedi dettagli&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Nascondi dettagli"</string>
     <string name="to_message_header" msgid="3954385178027011919">"a <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Ccn: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Mostra informazioni di contatto di <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Mostra informazioni di contatto"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> messaggi meno recenti"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Caricamento di <xliff:g id="COUNT">%1$d</xliff:g> messaggi meno recenti in corso..."</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Da:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Rispondi a:"</string>
     <string name="to_heading" msgid="3495203282540398336">"A: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Cartella Email"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Cambia cartelle"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Sposta in"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Cerca"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Cerca nella posta"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"La ricerca vocale non è supportata su questo dispositivo."</string>
     <string name="network_error" msgid="5931164247644972255">"Nessuna connessione"</string>
     <string name="retry" msgid="916102442074217293">"Riprova"</string>
     <string name="load_more" msgid="8702691358453560575">"Carica altro"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silenzioso"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Azione predefinita"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Azioni Archivia ed Elimina"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archivia"</item>
-    <item msgid="2567465476369142505">"Elimina"</item>
+    <item msgid="954772302016538814">"Mostra solo Archivia"</item>
+    <item msgid="7212690302706180254">"Mostra solo Elimina"</item>
+    <item msgid="2539051197590685708">"Mostra Archivia ed Elimina"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archivia"</item>
-    <item msgid="6088164268501960435">"Elimina"</item>
+    <item msgid="6877416142040695022">"Mostra solo Archivia"</item>
+    <item msgid="1510017057984222376">"Mostra solo Elimina"</item>
+    <item msgid="3196207224108008441">"Mostra Archivia ed Elimina"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Azione predefinita"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Azioni Archivia ed Elimina"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Rispondi a tutti"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Usa come predefinito per le risposte ai messaggi"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Azioni di scorrimento"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Fai scorrere il dito per archiviare"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Fai scorrere il dito per eliminare"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"In elenco di conversazioni"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Immagine mittente"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Mostra accanto al nome nell\'elenco di conversazioni"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Icona cartella"</string>
     <string name="add_account" msgid="5905863370226612377">"Aggiungi account"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Ignora suggerimento"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"La sincronizzazione automatica è disattivata. Tocca per attivarla."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"La sincronizzazione dell\'account è disattivata. Attivala in &lt;a href=\'http://www.example.com\'&gt;Impostazioni account.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> non inviati in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Attivare la sincronizzazione automatica?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Le modifiche apportate a tutti gli account (non solo Gmail) e le app verranno sincronizzate tra il Web, gli altri tuoi dispositivi e il tuo <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefono"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Attiva"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Mostra <xliff:g id="NUMBER">%1$s</xliff:g> cartelle"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Mostra <xliff:g id="NUMBER">%1$s</xliff:g> cartelle in più"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Nascondi cartelle"</string>
     <string name="print" msgid="7987949243936577207">"Stampa"</string>
     <string name="print_all" msgid="4011022762279519941">"Stampa tutto"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Gestisci account"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Impostazioni generali"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Impostazioni"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Altre opzioni"</string>
 </resources>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1a3d7bf..1f61d43 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"שמור טיוטה"</string>
     <string name="discard" msgid="4905982179911608430">"מחק"</string>
     <string name="compose" msgid="2602861958391035523">"כתוב הודעה"</string>
-    <string name="compose_title" msgid="5673376086133995913">"כתוב"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"השב"</item>
     <item msgid="2767793214788399009">"השב לכולם"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"קובץ אחד או יותר לא צורפו. המגבלה היא <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"הקובץ לא צורף. המגבלה היא <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"לא ניתן היה לצרף קובץ."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"ההרשאה נדחתה עבור הקובץ המצורף."</string>
     <string name="recipient_needed" msgid="319816879398937214">"הוסף לפחות נמען אחד."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"שגיאת נמען"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"האם לשלוח את ההודעה?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"שלח משוב"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"העבר שיחה"</item>
+    <item quantity="other" msgid="6639576653114141743">"העבר <xliff:g id="ID_1">%1$d</xliff:g> שיחות"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> על <xliff:g id="SUBJECT">%3$s</xliff:g>‏, <xliff:g id="SNIPPET">%4$s</xliff:g> בתאריך <xliff:g id="DATE">%5$s</xliff:g>‏, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> על <xliff:g id="SUBJECT">%3$s</xliff:g>‏, <xliff:g id="SNIPPET">%4$s</xliff:g> בשעה <xliff:g id="TIME">%5$s</xliff:g>‏, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"השיחה נקראה"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"‏<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;פרטים&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"הסתר פרטים"</string>
     <string name="to_message_header" msgid="3954385178027011919">"אל <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"עותק מוסתר: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"הצג פרטי איש קשר של <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"הצג פרטי איש קשר"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות ישנות יותר"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"טוען <xliff:g id="COUNT">%1$d</xliff:g> הודעות ישנות יותר"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"מ:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"השב ל:"</string>
     <string name="to_heading" msgid="3495203282540398336">"אל: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"תיקיית דוא\"ל"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"שנה תיקיות"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"העבר אל"</string>
-    <string name="search_hint" msgid="7060626585689391003">"חיפוש"</string>
+    <string name="search_hint" msgid="4916671414132334289">"חפש בדואר"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"חיפוש קולי אינו נתמך במכשיר זה."</string>
     <string name="network_error" msgid="5931164247644972255">"אין חיבור"</string>
     <string name="retry" msgid="916102442074217293">"נסה שוב"</string>
     <string name="load_more" msgid="8702691358453560575">"טען עוד"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: ‏<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"שקט"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"פעולת ברירת מחדל"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"פעולות העברה לארכיון ומחיקה"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"העברה לארכיון"</item>
-    <item msgid="2567465476369142505">"מחיקה"</item>
+    <item msgid="954772302016538814">"הצג העברה לארכיון בלבד"</item>
+    <item msgid="7212690302706180254">"הצג מחיקה בלבד"</item>
+    <item msgid="2539051197590685708">"הצג העברה לארכיון ומחיקה"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"העברה לארכיון"</item>
-    <item msgid="6088164268501960435">"מחיקה"</item>
+    <item msgid="6877416142040695022">"הצג העברה לארכיון בלבד"</item>
+    <item msgid="1510017057984222376">"הצג מחיקה בלבד"</item>
+    <item msgid="3196207224108008441">"הצג העברה לארכיון ומחיקה"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"פעולת ברירת מחדל"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"פעולות העברה לארכיון ומחיקה"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"השב לכולם"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"השתמש כברירת מחדל עבור תשובה להודעות"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"פעולות החלקה"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"החלק כדי להעביר לארכיון"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"החלק כדי למחוק"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"ברשימת השיחות"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"תמונת שולח"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"הצג לצד השם ברשימת השיחות"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"סמל תיקיה"</string>
     <string name="add_account" msgid="5905863370226612377">"הוסף חשבון"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"סגור את הטיפ"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"הסנכרון האוטומטי כבוי. גע כדי להפעיל אותו."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"‏סנכרון החשבון כבוי. הפעל אותו ב&lt;a href=\'http://www.example.com\'&gt;הגדרות חשבון.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> לא נשלחו ב<xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"האם להפעיל סנכרון אוטומטי?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"‏שינויים שתבצע בכל האפליקציות והחשבונות, ולא רק ב-Gmail, יסונכרנו בין האינטרנט, המכשירים האחרים שלך וה<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> שלך."</string>
     <string name="phone" msgid="4142617042507912053">"טלפון"</string>
     <string name="tablet" msgid="4593581125469224791">"טאבלט"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"הפעל"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"הצג <xliff:g id="NUMBER">%1$s</xliff:g> תיקיות"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"הצג <xliff:g id="NUMBER">%1$s</xliff:g> תיקיות נוספות"</string>
     <string name="hide_folders" msgid="7618891933409521283">"הסתר תיקיות"</string>
     <string name="print" msgid="7987949243936577207">"הדפס"</string>
     <string name="print_all" msgid="4011022762279519941">"הדפס הכל"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"ניהול חשבונות"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"הגדרות כלליות"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"הגדרות"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"אפשרויות נוספות"</string>
 </resources>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 796a576..8245729 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"下書きを保存"</string>
     <string name="discard" msgid="4905982179911608430">"破棄"</string>
     <string name="compose" msgid="2602861958391035523">"作成"</string>
-    <string name="compose_title" msgid="5673376086133995913">"作成"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"返信"</item>
     <item msgid="2767793214788399009">"全員に返信"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ファイルを1件以上添付できません。上限は<xliff:g id="MAXSIZE">%1$s</xliff:g>です。"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ファイルを添付できません。上限の<xliff:g id="MAXSIZE">%1$s</xliff:g>に達しています。"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ファイルを添付できませんでした。"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"添付ファイルが許可されませんでした。"</string>
     <string name="recipient_needed" msgid="319816879398937214">"宛先を入力してください。"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"宛先エラー"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"メッセージの送信"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"ご意見、ご感想"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"1件のスレッドを移動"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g>件のスレッドを移動"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>が<xliff:g id="DATE">%5$s</xliff:g>に<xliff:g id="SUBJECT">%3$s</xliff:g>について送信。抜粋: <xliff:g id="SNIPPET">%4$s</xliff:g>（<xliff:g id="READSTATE">%6$s</xliff:g>）"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>が<xliff:g id="TIME">%5$s</xliff:g>に<xliff:g id="SUBJECT">%3$s</xliff:g>について送信。抜粋: <xliff:g id="SNIPPET">%4$s</xliff:g>（<xliff:g id="READSTATE">%6$s</xliff:g>）"</string>
     <string name="read_string" msgid="5495929677508576520">"既読のスレッド"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g>&lt;a href=\'http://www.example.com\'&gt;詳細を表示&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"詳細を表示しない"</string>
     <string name="to_message_header" msgid="3954385178027011919">"To: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g>の連絡先情報を表示"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"連絡先情報を表示"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"これ以前のメッセージ<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> 件の古いメッセージを読み込んでいます"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"From:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"返信先:"</string>
     <string name="to_heading" msgid="3495203282540398336">"To: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"メールフォルダ"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"フォルダを変更"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"移動"</string>
-    <string name="search_hint" msgid="7060626585689391003">"検索"</string>
+    <string name="search_hint" msgid="4916671414132334289">"メールを検索"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"この端末は音声検索に対応していません。"</string>
     <string name="network_error" msgid="5931164247644972255">"接続なし"</string>
     <string name="retry" msgid="916102442074217293">"再試行"</string>
     <string name="load_more" msgid="8702691358453560575">"もっと読み込む"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"マナーモード"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"デフォルトの動作"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"アーカイブ/削除操作"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"アーカイブ"</item>
-    <item msgid="2567465476369142505">"削除"</item>
+    <item msgid="954772302016538814">"アーカイブのみを表示"</item>
+    <item msgid="7212690302706180254">"削除のみを表示"</item>
+    <item msgid="2539051197590685708">"アーカイブと削除を表示"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"アーカイブ"</item>
-    <item msgid="6088164268501960435">"削除"</item>
+    <item msgid="6877416142040695022">"アーカイブのみを表示"</item>
+    <item msgid="1510017057984222376">"削除のみを表示"</item>
+    <item msgid="3196207224108008441">"アーカイブと削除を表示"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"デフォルトの動作"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"アーカイブ/削除操作"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"全員に返信"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"返信時のデフォルトとして使用する"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"スワイプの動作"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"スワイプしてアーカイブ"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"スワイプして削除"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"スレッドリスト内"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"送信者の画像"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"スレッドリストの名前の横に表示する"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"フォルダアイコン"</string>
     <string name="add_account" msgid="5905863370226612377">"アカウントを追加"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"ヒントを表示しない"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"自動同期がオフになっています。タップしてオンにしてください。"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"アカウントの同期がオフになっています。[&lt;a href=\'http://www.example.com\'&gt;アカウントの設定&lt;/a&gt;]でオンにしてください。"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>内の未送信件数: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"自動同期をONにしますか？"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Gmailだけでなく、すべてのアプリとアカウントへの変更は、ウェブ、その他の端末、お使いの<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>の間で同期されます。"</string>
     <string name="phone" msgid="4142617042507912053">"携帯電話"</string>
     <string name="tablet" msgid="4593581125469224791">"タブレット"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"ONにする"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g>個のフォルダを表示"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"他<xliff:g id="NUMBER">%1$s</xliff:g>個のフォルダを表示"</string>
     <string name="hide_folders" msgid="7618891933409521283">"フォルダを表示しない"</string>
     <string name="print" msgid="7987949243936577207">"印刷"</string>
     <string name="print_all" msgid="4011022762279519941">"すべて印刷"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"アカウントの管理"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"全般設定"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"設定"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"その他のオプション"</string>
 </resources>

diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 776cd46..cad9481 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"მონახაზის შენახვა"</string>
     <string name="discard" msgid="4905982179911608430">"გაუქმება"</string>
     <string name="compose" msgid="2602861958391035523">"შექმნა"</string>
-    <string name="compose_title" msgid="5673376086133995913">"შექმნა"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"პასუხი"</item>
     <item msgid="2767793214788399009">"პასუხი ყველას"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ვერ მოხერხდა ერთი ან რამდენიმე ფაილის მიმაგრება. ლიმიტი <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ფაილის მიმაგრება ვერ მოხერხდა. ამოწურულია <xliff:g id="MAXSIZE">%1$s</xliff:g> ზომის ლიმიტი."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ფაილის მიბმა ვერ მოხერხდა."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"დანართის ნებართვა უარყოფილია."</string>
     <string name="recipient_needed" msgid="319816879398937214">"დაამატეთ ერთი ადრესატი მაინც."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"მიმღების შეცდომა"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"გავგზავნო წერილი?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"უკუკავშირი"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"მიმოწერის გადატანა"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> მიმოწერის გადატანა"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g>-ის შესახებ, <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="DATE">%5$s</xliff:g>-ში, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g>-ის შესახებ, <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="TIME">%5$s</xliff:g>-ში, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"მიმოწერა წაკითხულია"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"დეტალების დამალვა"</string>
     <string name="to_message_header" msgid="3954385178027011919">"მიმღები: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"უხილავი ასლი: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g>-ის საკონტაქტო ინფორმაციის ნახვა"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"კონტაქტის ინფორმაციის ჩვენება"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ძველი შეტყობინება"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"მიმდინარეობს <xliff:g id="COUNT">%1$d</xliff:g> ძველი წერილის ჩამოტვირთვა"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"გამგზავნი:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"პასუხი:"</string>
     <string name="to_heading" msgid="3495203282540398336">"მიმღები: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ელფოსტის საქაღალდე"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"საქაღალდეების შეცვლა"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"გადაადგილება"</string>
-    <string name="search_hint" msgid="7060626585689391003">"ძიება"</string>
+    <string name="search_hint" msgid="4916671414132334289">"ძიება ფოსტაში"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"ამ მოწყობილობაზე ხმოვანი ძიება მხარდაჭერილი არ არის."</string>
     <string name="network_error" msgid="5931164247644972255">"კავშირი არ არის"</string>
     <string name="retry" msgid="916102442074217293">"ხელახალი მცდელობა"</string>
     <string name="load_more" msgid="8702691358453560575">"მეტის ჩატვირთვა"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"ჩუმი"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"ნაგულისხმევი ქმედება"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"დაარქივების და წაშლის მოქმედებები"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"დაარქივება"</item>
-    <item msgid="2567465476369142505">"წაშლა"</item>
+    <item msgid="954772302016538814">"მხოლოდ არქივის ჩვენება"</item>
+    <item msgid="7212690302706180254">"მხოლოდ წაშლის ჩვენება"</item>
+    <item msgid="2539051197590685708">"დაარქივების და წაშლის ჩვენება"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"დაარქივება"</item>
-    <item msgid="6088164268501960435">"წაშლა"</item>
+    <item msgid="6877416142040695022">"მხოლოდ არქივის ჩვენება"</item>
+    <item msgid="1510017057984222376">"მხოლოდ წაშლის ჩვენება"</item>
+    <item msgid="3196207224108008441">"დაარქივების და წაშლის ჩვენება"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"ნაგულისხმევი ქმედება"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"დაარქივების და წაშლის მოქმედებები"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"პასუხი ყველას"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"გამოიყენე ნაგულისხმევად შეტყობინებების პასუხში"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"გადაფურცვლის მოქმედებები"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"გადაფურცვლა დასაარქივებლად"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"გადაფურცლეთ წასაშლელად"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"მიმოწერის სიაში"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"გამგზავნის სურათი"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"მიმოწერების სიაში სახელის გვერდით ჩვენება"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"საქაღალდის ხატულა"</string>
     <string name="add_account" msgid="5905863370226612377">"ანგარიშის დამატება"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"რჩევის დახურვა"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"ავტო-სინქრონიზაცია გამორთულია. შეეხეთ, რომ ჩართოთ."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"ანგარიშის სინქრონიზაცია გამორთულია. ჩართეთ ის &lt;a href=\'http://www.example.com\'&gt;ანგარიშის პარამეტრებში.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> გასაგზავნი <xliff:g id="OUTBOX">%2$s</xliff:g>-ში"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"ჩაირთოს ავტომატური სინქრონიზაცია?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"ცვლილებები, რომლებსაც თქვენ ახორციელებთ ყველა აპსა და ანგარიშში, და არა მხოლოდ Gmail-ში, სინქრონიზებული იქნება ვებს, თქვენს სხვა მოწყობილობებსა და <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>-ს შორის."</string>
     <string name="phone" msgid="4142617042507912053">"ტელეფონი"</string>
     <string name="tablet" msgid="4593581125469224791">"ტაბლეტი"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"ჩართვა"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> საქაღალდის ჩვენება"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"<xliff:g id="NUMBER">%1$s</xliff:g> სხვა საქაღალდის ჩვენება"</string>
     <string name="hide_folders" msgid="7618891933409521283">"საქაღალდეების დამალვა"</string>
     <string name="print" msgid="7987949243936577207">"ამობეჭდვა"</string>
     <string name="print_all" msgid="4011022762279519941">"ყველას ბეჭდვა"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"ანგარიშების მართვა"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"ძირითადი პარამეტრები"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"პარამეტრები"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"დამატებითი პარამეტრები"</string>
 </resources>

diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 49dc941..c039008 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml

@@ -30,8 +30,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Жоба жазбаны сақтау"</string>
     <string name="discard" msgid="4905982179911608430">"Жою"</string>
     <string name="compose" msgid="2602861958391035523">"Жазу"</string>
-    <!-- no translation found for compose_title (5673376086133995913) -->
-    <skip />
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Жауап беру"</item>
     <item msgid="2767793214788399009">"Барл. жау. беру"</item>
@@ -46,8 +44,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Бір немесе бірнеше файл тіркелмеді. Шегі: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Файл тіркелмеді. <xliff:g id="MAXSIZE">%1$s</xliff:g> шегіне жеттіңіз."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Файлды тіркеу мүмкін болмады."</string>
-    <!-- no translation found for attachment_permission_denied (2274397783497640486) -->
-    <skip />
     <string name="recipient_needed" msgid="319816879398937214">"Кемінде бір алушыны қосыңыз."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Алушы қатесі"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Хабарды жіберу қажет пе?"</string>
@@ -137,6 +133,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Пікір жіберу"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Сөйлесімді жылжыту"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> сөйлесімді жылжыту"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g> туралы, <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="DATE">%5$s</xliff:g> күні, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g> туралы, <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="TIME">%5$s</xliff:g> уақытында, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"сөйлесім оқылды"</string>
@@ -224,14 +224,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Мәліметтерді көру&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Мәліметтерді жасыру"</string>
     <string name="to_message_header" msgid="3954385178027011919">"Алушы: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <!-- no translation found for bcc_header_for_recipient_summary (1834716758549842454) -->
-    <skip />
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> үшін контакт туралы ақпаратты көрсету"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Контакт туралы ақпаратты көрсету"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ескі хабар"</item>
   </plurals>
-    <!-- no translation found for super_collapsed_loading_content_description:other (678491885491918982) -->
     <string name="from_heading" msgid="48290556829713090">"Кімнен:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Жауап беру:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Кімге: "</string>
@@ -289,12 +286,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Электрондық пошта қалтасы"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Қалталарды өзгерту"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Мынаған жылжыту:"</string>
-    <!-- no translation found for search_hint (7060626585689391003) -->
-    <skip />
+    <string name="search_hint" msgid="4916671414132334289">"Поштадан іздеу"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <!-- no translation found for voice_search_not_supported (8493517060419469738) -->
-    <skip />
     <string name="network_error" msgid="5931164247644972255">"Байланыс жоқ"</string>
     <string name="retry" msgid="916102442074217293">"Қайталау"</string>
     <string name="load_more" msgid="8702691358453560575">"Тағы жүктеу"</string>
@@ -361,18 +355,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Дыбыссыз"</string>
-    <!-- no translation found for preference_removal_action_title (3128186577060329884) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (7381624742404593351) -->
-    <!-- no translation found for prefEntries_removal_action:1 (2567465476369142505) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (4080896545573973751) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (6088164268501960435) -->
-    <!-- no translation found for prefDialogTitle_removal_action (7914272565548361304) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Мұрағаттау және жою әрекеттері"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="954772302016538814">"Мұрағаттауды ғана көрсету"</item>
+    <item msgid="7212690302706180254">"Жоюды ғана көрсету"</item>
+    <item msgid="2539051197590685708">"Мұрағаттау және жоюды көрсету"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="6877416142040695022">"Мұрағаттауды ғана көрсету"</item>
+    <item msgid="1510017057984222376">"Жоюды ғана көрсету"</item>
+    <item msgid="3196207224108008441">"Мұрағаттау және жоюды көрсету"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Мұрағаттау және жою әрекеттері"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Барлығына жауап беру"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Хабар жауаптары үшін әдепкі ретінде пайдалану"</string>
-    <!-- no translation found for preference_swipe_title (2073613840893904205) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Мұрағаттау үшін жанаңыз"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Жою үшін жанаңыз"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Сөйлесімдер тізімінде"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Жіберуші суреті"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Сөйлесімдер тізімінде аттың жанында көрсету"</string>
@@ -391,18 +389,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Қалта белгішесі"</string>
     <string name="add_account" msgid="5905863370226612377">"Есептік жазба қосу"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Кеңесті жабу"</string>
-    <!-- no translation found for auto_sync_off (3691189864057581214) -->
-    <skip />
-    <!-- no translation found for account_sync_off (5720018952998097061) -->
-    <skip />
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> қалтасында <xliff:g id="NUMBER">%1$s</xliff:g> жіберілмеген"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Автоматты синхрондауды қосу қажет пе?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Сіз Gmail ғана емес, барлық қолданбалар мен есептік жазбаларға енгізетін өзгерістер веб, сіздің басқа құрылғыларыңыз және сіздің <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> арасында синхрондалады."</string>
     <string name="phone" msgid="4142617042507912053">"телефон"</string>
     <string name="tablet" msgid="4593581125469224791">"планшет"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Қосу"</string>
-    <!-- no translation found for show_n_more_folders (1005879825500056552) -->
-    <skip />
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Қосымша <xliff:g id="NUMBER">%1$s</xliff:g> қалта көрсету"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Қалталарды жасыру"</string>
     <string name="print" msgid="7987949243936577207">"Басып шығару"</string>
     <string name="print_all" msgid="4011022762279519941">"Барлығын басып шығару"</string>
@@ -484,6 +477,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Есептік жазбаларды басқару"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Жалпы параметрлер"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Параметрлер"</string>
-    <!-- no translation found for overflow_description (7886090597023240426) -->
-    <skip />
 </resources>

diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index ba1d550..84f59e5 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"រក្សាទុកសេចក្តីព្រាង"</string>
     <string name="discard" msgid="4905982179911608430">"បោះបង់"</string>
     <string name="compose" msgid="2602861958391035523">"សរសេរសារ"</string>
-    <string name="compose_title" msgid="5673376086133995913">"តែង"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"ឆ្លើយតប"</item>
     <item msgid="2767793214788399009">"ឆ្លើយតបទាំងអស់"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"មិនបានភ្ជាប់ឯកសារមួយ ឬច្រើន។ កំណត់ <xliff:g id="MAXSIZE">%1$s</xliff:g> ។"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"មិនបានភ្ជាប់ឯកសារ។ បានដល់ដែនកំណត់ <xliff:g id="MAXSIZE">%1$s</xliff:g> ។"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"មិនអាចភ្ជាប់ឯកសារបានទេ។"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"សិទ្ធិត្រូវបានបដិសេធសម្រាប់ឯកសារភ្ជាប់នេះ។"</string>
     <string name="recipient_needed" msgid="319816879398937214">"បន្ថែមអ្នកទទួលយ៉ាងហោចណាស់ម្នាក់។"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"កំហុសអ្នកទទួល"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"ផ្ញើសារ?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"ផ្ញើមតិប្រតិកម្ម"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"ផ្លាស់ទីការសន្ទនា"</item>
+    <item quantity="other" msgid="6639576653114141743">"ផ្លាស់ទីការសន្ទនា <xliff:g id="ID_1">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> អំពី <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> នៅ <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> អំពី <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> នៅម៉ោង <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"អានការសន្ទនា"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;មើលព័ត៌មានលម្អិត&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"លាក់ព័ត៌មានលម្អិត"</string>
     <string name="to_message_header" msgid="3954385178027011919">"ទៅ <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"ចម្លងជាសម្ងាត់ជូន៖ "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"បង្ហាញព័ត៌មានទំនាក់ទំនងសម្រាប់ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"បង្ហាញព័ត៌មានទំនាក់ទំនង"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"សារចាស់ជាង <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"កំពុងផ្ទុកសារចាស់ៗ <xliff:g id="COUNT">%1$d</xliff:g>"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"ពី៖"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"ឆ្លើយតបទៅ៖"</string>
     <string name="to_heading" msgid="3495203282540398336">"ទៅ៖ "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ថតអ៊ីមែល"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"ប្ដូរថត"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"ផ្លាស់ទីទៅ"</string>
-    <string name="search_hint" msgid="7060626585689391003">"ស្វែងរក"</string>
+    <string name="search_hint" msgid="4916671414132334289">"ស្វែងរកអ៊ីមែល"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"ការស្វែងរកជាសំឡេងមិនត្រូវបានគាំទ្រនៅលើឧបករណ៍នេះទេ។"</string>
     <string name="network_error" msgid="5931164247644972255">"គ្មានការតភ្ជាប់"</string>
     <string name="retry" msgid="916102442074217293">"ព្យាយាមឡើងវិញ"</string>
     <string name="load_more" msgid="8702691358453560575">"ផ្ទុកច្រើនទៀត"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"ស្ងាត់"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"សកម្មភាពលំនាំដើម"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"ប័ណ្ណសារ &amp; សកម្មភាពលុប"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"ប័ណ្ណសារ"</item>
-    <item msgid="2567465476369142505">"លុប"</item>
+    <item msgid="954772302016538814">"បង្ហាញតែប័ណ្ណសារ"</item>
+    <item msgid="7212690302706180254">"បង្ហាញតែបានលុប"</item>
+    <item msgid="2539051197590685708">"បង្ហាញប័ណ្ណសារ &amp; លុប"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"ប័ណ្ណសារ"</item>
-    <item msgid="6088164268501960435">"លុប"</item>
+    <item msgid="6877416142040695022">"បង្ហាញតែប័ណ្ណសារ"</item>
+    <item msgid="1510017057984222376">"បង្ហាញតែបានលុប"</item>
+    <item msgid="3196207224108008441">"បង្ហាញប័ណ្ណសារ &amp; លុប"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"សកម្មភាពលំនាំដើម"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"សកម្មភាពប័ណ្ណសារ &amp; លុប"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"ឆ្លើយតបទាំងអស់"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"ប្រើជាលំនាំដើមសម្រាប់ការឆ្លើយតបសារ"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"សកម្មភាពអូស"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"អូសដើម្បីទុកក្នុងប័ណ្ណសារ"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"អូសដើម្បីលុប"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"នៅក្នុងបញ្ជីសន្ទនា"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"រូបភាពអ្នកផ្ញើ"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"បង្ហាញឈ្មោះនៅចំហៀងនៅក្នុងបញ្ជីសន្ទនា"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"រូបតំណាងថត"</string>
     <string name="add_account" msgid="5905863370226612377">"បន្ថែមគណនី"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"បោះបង់ព័ត៌មានជំនួយ"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"ការធ្វើសមកាលកម្មដោយស្វ័យប្រវត្តិបានបិទ។ ប៉ះដើម្បីបើក។"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"ការធ្វើសមកាលកម្មគណនីបានបិទ។ បើកនៅក្នុង &lt;a href=\'http://www.example.com\'&gt;ការកំណត់គណនី&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"មិនបានផ្ញើ <xliff:g id="NUMBER">%1$s</xliff:g> ក្នុងមិនផ្ញើនៅក្នុង <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"បើកសមកាលកម្មដោយស្វ័យប្រវត្តិឬ?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"ការផ្លាស់ប្ដូរដែលអ្នកបានធ្វើលើកម្មវិធីទាំងអស់ និងគណនីមិនមែនគ្រាន់តែជា Gmail ទេ នឹងត្រូវបានធ្វើសមកាលកម្មរវាងបណ្ដាញឧបករណ៍ផ្សេងទៀត និង <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> របស់អ្នក។"</string>
     <string name="phone" msgid="4142617042507912053">"ទូរស័ព្ទ"</string>
     <string name="tablet" msgid="4593581125469224791">"ថេប្លេត"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"បើក"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"បង្ហាញថត <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"បង្ហាញថត <xliff:g id="NUMBER">%1$s</xliff:g> ទៀត"</string>
     <string name="hide_folders" msgid="7618891933409521283">"លាក់ថត"</string>
     <string name="print" msgid="7987949243936577207">"បោះពុម្ព"</string>
     <string name="print_all" msgid="4011022762279519941">"បោះពុម្ពទាំងអស់"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"គ្រប់គ្រងគណនី"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"ការកំណត់ទូទៅ"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"កំណត់"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"ជម្រើសច្រើនទៀត"</string>
 </resources>

diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index f05527d..1923b25 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"ಡ್ರಾಫ್ಟ್‌‌  ಉಳಿಸಿ"</string>
     <string name="discard" msgid="4905982179911608430">"ತಿರಸ್ಕರಿಸು"</string>
     <string name="compose" msgid="2602861958391035523">"ರಚಿಸಿ"</string>
-    <string name="compose_title" msgid="5673376086133995913">"ರಚಿಸಿ"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"ಪ್ರತ್ಯುತ್ತರ"</item>
     <item msgid="2767793214788399009">"ಎಲ್ಲರಿಗೂ ಪ್ರತ್ಯುತ್ತರಿಸು"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ಒಂದು ಅಥವಾ ಹೆಚ್ಚಿನ ಫೈಲ್‍ಗಳನ್ನು ಲಗತ್ತಿಸಲಾಗಿಲ್ಲ. ಮಿತಿ <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ಫೈಲ್ ಅನ್ನು ಲಗತ್ತಿಸಲಾಗಿಲ್ಲ. <xliff:g id="MAXSIZE">%1$s</xliff:g> ಮಿತಿಯನ್ನು ತಲುಪಿದೆ."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ಫೈಲ್ ಅನ್ನು ಲಗತ್ತಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"ಲಗತ್ತಿಗಾಗಿ ಅನುಮತಿಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ."</string>
     <string name="recipient_needed" msgid="319816879398937214">"ಕನಿಷ್ಠ ಒಬ್ಬ ಸ್ವೀಕೃತದಾರರನ್ನಾದರೂ ಸೇರಿಸಿ"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"ಸ್ವೀಕರಿಸುವವರ ದೋಷ"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"ಸಂದೇಶ ಕಳುಹಿಸುವುದೇ?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"ಸಂವಾದವನ್ನು ಸರಿಸು"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> ಸಂವಾದಗಳನ್ನು ಸರಿಸು"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g> ರಂದು <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ಕುರಿತು"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g> ಗೆ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ಕುರಿತು"</string>
     <string name="read_string" msgid="5495929677508576520">"ಸಂವಾದವನ್ನು ಓದಿದೆ"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"ವಿವರಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> ಅವರಿಗೆ"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> ಗಾಗಿ ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"ಸಂಪರ್ಕ ಮಾಹಿತಿ ತೋರಿಸು"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ಹಳೆಯ ಸಂದೇಶಗಳು"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"ಇವರಿಂದ:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"ಇದಕ್ಕೆ-ಪ್ರತ್ಯುತ್ತರಿಸಿ"</string>
     <string name="to_heading" msgid="3495203282540398336">"ಗೆ: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ಇಮೇಲ್ ಫೋಲ್ಡರ್"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"ಫೋಲ್ಡರ್‍ಗಳನ್ನು ಬದಲಿಸಿ"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"ಇದಕ್ಕೆ ವರ್ಗಾಯಿಸು"</string>
-    <string name="search_hint" msgid="7060626585689391003">"ಹುಡುಕಿ"</string>
+    <string name="search_hint" msgid="4916671414132334289">"ಮೇಲ್ ಹುಡುಕಿ"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"ಈ ಸಾಧನದಲ್ಲಿ ಧ್ವನಿ ಹುಡುಕಾಟವನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
     <string name="network_error" msgid="5931164247644972255">"ಯಾವುದೇ ಸಂಪರ್ಕವಿಲ್ಲ"</string>
     <string name="retry" msgid="916102442074217293">"ಮರುಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="load_more" msgid="8702691358453560575">"ಇನ್ನಷ್ಟು ಲೋಡ್ ಮಾಡಿ"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"ಶಾಂತ"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"ಡೀಫಾಲ್ಟ್ ಕ್ರಮ"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"ಆರ್ಕೈವ್ &amp; ಕ್ರಿಯೆಗಳನ್ನು ಅಳಿಸಿ"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"ಆರ್ಕೈವ್"</item>
-    <item msgid="2567465476369142505">"ಅಳಿಸು"</item>
+    <item msgid="954772302016538814">"ಆರ್ಕೈವ್ ಮಾತ್ರ ತೋರಿಸು"</item>
+    <item msgid="7212690302706180254">"ಅಳಿಸು ಮಾತ್ರ ತೋರಿಸು"</item>
+    <item msgid="2539051197590685708">"ಆರ್ಕೈವ್ &amp; ಅಳಿಸು ಅನ್ನು ತೋರಿಸು"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"ಆರ್ಕೈವ್"</item>
-    <item msgid="6088164268501960435">"ಅಳಿಸು"</item>
+    <item msgid="6877416142040695022">"ಆರ್ಕೈವ್ ಮಾತ್ರ ತೋರಿಸು"</item>
+    <item msgid="1510017057984222376">"ಅಳಿಸು ಮಾತ್ರ ತೋರಿಸು"</item>
+    <item msgid="3196207224108008441">"ಆರ್ಕೈವ್ ತೋರಿಸು &amp; ಅಳಿಸು"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"ಡೀಫಾಲ್ಟ್ ಕ್ರಮ"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"ಕ್ರಿಯೆಗಳನ್ನು ಆರ್ಕೈವ್ ಮಾಡಿ &amp; ಅಳಿಸಿ"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"ಎಲ್ಲರಿಗೂ ಪ್ರತ್ಯುತ್ತರಿಸು"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"ಸಂದೇಶ ಪ್ರತ್ಯುತ್ತರಗಳಿಗಾಗಿ ಡೀಫಾಲ್ಟ್ ಆಗಿ ಬಳಸಿ"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"ಸ್ವೈಪ್ ಕ್ರಮಗಳು"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"ಆರ್ಕೈವ್ ಮಾಡಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"ಅಳಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"ಸಂವಾದ ಪಟ್ಟಿಯಲ್ಲಿ"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"ಕಳುಹಿಸಿದವರ ಚಿತ್ರ"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"ಸಂವಾದ ಪಟ್ಟಿಯಲ್ಲಿ ಪಕ್ಕದಲ್ಲಿನ ಹೆಸರನ್ನು ತೋರಿಸು"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"ಫೋಲ್ಡರ್ ಐಕಾನ್"</string>
     <string name="add_account" msgid="5905863370226612377">"ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"ಸಲಹೆ ವಜಾಗೊಳಿಸು"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"ಸ್ವಯಂಚಾಲಿತ ಸಿಂಕ್ ಆಫ್ ಆಗಿದೆ. ಆನ್ ಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"ಖಾತೆ ಸಿಂಕ್ ಆಫ್ ಆಗಿದೆ. &lt; href=\'http://www.example.com\'&gt;Account settings.&lt;/a&gt; ನಲ್ಲಿ ಆನ್ ಮಾಡಿ"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> ನಲ್ಲಿ <xliff:g id="NUMBER">%1$s</xliff:g> ಕಳುಹಿಸದಿರುವ"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"ಸ್ವಯಂ-ಸಿಂಕ್‌ ಆನ್‌‌ ಮಾಡುವುದೇ?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"ಕೇವಲ Gmail ಮಾತ್ರವಲ್ಲ, ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‍‍ಗಳು ಮತ್ತು ಖಾತೆಗಳಿಗೆ ನೀವು ಮಾಡುವ ಬದಲಾವಣೆಗಳು, ವೆಬ್, ನಿಮ್ಮ ಇತರೆ ಸಾಧನಗಳು, ಮತ್ತು ನಿಮ್ಮ <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ನ ಮದ್ಯ ಸಿಂಕ್ರೊನೈಜ್ ಆಗುತ್ತವೆ."</string>
     <string name="phone" msgid="4142617042507912053">"ಫೋನ್"</string>
     <string name="tablet" msgid="4593581125469224791">"ಟ್ಯಾಬ್ಲೆಟ್‌‌"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"ಆನ್ ಮಾಡು"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> ಫೋಲ್ಡರ್‌ಗಳನ್ನು ತೋರಿಸು"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"<xliff:g id="NUMBER">%1$s</xliff:g> ಹೆಚ್ಚಿನ ಫೋಲ್ಡರ್‍ಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="hide_folders" msgid="7618891933409521283">"ಫೋಲ್ಡರ್‍ಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
     <string name="print" msgid="7987949243936577207">"ಮುದ್ರಿಸು"</string>
     <string name="print_all" msgid="4011022762279519941">"ಎಲ್ಲವನ್ನೂ ಮುದ್ರಿಸು"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"ಖಾತೆಗಳನ್ನು ನಿರ್ವಹಿಸು"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
 </resources>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0b390d5..871fa0b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"임시보관함에 저장"</string>
     <string name="discard" msgid="4905982179911608430">"삭제"</string>
     <string name="compose" msgid="2602861958391035523">"편지쓰기"</string>
-    <string name="compose_title" msgid="5673376086133995913">"편지쓰기"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"답장"</item>
     <item msgid="2767793214788399009">"전체답장"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"하나 이상의 파일이 첨부되지 못했습니다. 한도는 <xliff:g id="MAXSIZE">%1$s</xliff:g>입니다."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"파일이 첨부되지 않습니다. <xliff:g id="MAXSIZE">%1$s</xliff:g> 한도에 도달했습니다."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"파일을 첨부할 수 없습니다."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"첨부파일에 대한 권한이 거부되었습니다."</string>
     <string name="recipient_needed" msgid="319816879398937214">"받는 사람을 한 명 이상 추가하세요."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"수신자 오류"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"메일을 전송하시겠습니까?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"의견 보내기"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"대화 이동"</item>
+    <item quantity="other" msgid="6639576653114141743">"대화 <xliff:g id="ID_1">%1$d</xliff:g>개 이동"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"받는사람: <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, 제목 및 내용: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>, 날짜: <xliff:g id="DATE">%5$s</xliff:g>, 읽기 상태: <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"받는사람: <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, 제목 및 내용: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>, 시간: <xliff:g id="TIME">%5$s</xliff:g>, 읽기 상태: <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"대화 읽음"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;세부정보 보기&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"세부정보 숨기기"</string>
     <string name="to_message_header" msgid="3954385178027011919">"받는사람: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"숨은참조: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g>님에 대한 연락처 정보 표시"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"연락처 정보 표시"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"이전 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"이전 메일 <xliff:g id="COUNT">%1$d</xliff:g>개 로드 중"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"보낸사람:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"답장:"</string>
     <string name="to_heading" msgid="3495203282540398336">"받는사람: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"이메일 폴더"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"폴더 변경"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"이동"</string>
-    <string name="search_hint" msgid="7060626585689391003">"검색"</string>
+    <string name="search_hint" msgid="4916671414132334289">"메일 검색"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"음성 검색은 이 기기에서 지원되지 않습니다."</string>
     <string name="network_error" msgid="5931164247644972255">"연결되지 않음"</string>
     <string name="retry" msgid="916102442074217293">"다시 시도"</string>
     <string name="load_more" msgid="8702691358453560575">"추가 로드"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"무음"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"기본 작업"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"보관처리 및 삭제 작업"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"보관처리"</item>
-    <item msgid="2567465476369142505">"삭제"</item>
+    <item msgid="954772302016538814">"보관처리만 표시"</item>
+    <item msgid="7212690302706180254">"삭제만 표시"</item>
+    <item msgid="2539051197590685708">"보관처리 및 삭제 모두 표시"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"보관처리"</item>
-    <item msgid="6088164268501960435">"삭제"</item>
+    <item msgid="6877416142040695022">"보관처리만 표시"</item>
+    <item msgid="1510017057984222376">"삭제만 표시"</item>
+    <item msgid="3196207224108008441">"보관처리 및 삭제 모두 표시"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"기본 작업"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"보관처리 및 삭제 작업"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"전체답장"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"메일 답장 시 기본값으로 사용"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"스와이프 작업"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"스와이프하여 보관처리"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"스와이프하여 삭제"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"대화 목록"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"발신자 이미지"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"대화 목록에서 이름 옆에 표시"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"폴더 아이콘"</string>
     <string name="add_account" msgid="5905863370226612377">"계정 추가"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"도움말 닫기"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"자동 동기화가 사용 중지되어 있습니다. 터치하여 사용 설정해 주세요."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"계정 동기화가 사용 중지되어 있습니다. &lt;a href=\'http://www.example.com\'&gt;계정 설정&lt;/a&gt;에서 사용 설정해 주세요."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>에 보내지 않은 메일 <xliff:g id="NUMBER">%1$s</xliff:g>개 있음"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"자동 동기화를 사용하시겠습니까?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Gmail뿐만 아니라 모든 앱 및 계정의 변경사항이 웹, 다른 기기, <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> 간에 동기화됩니다."</string>
     <string name="phone" msgid="4142617042507912053">"휴대전화"</string>
     <string name="tablet" msgid="4593581125469224791">"태블릿"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"사용"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g>개 폴더 표시"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"<xliff:g id="NUMBER">%1$s</xliff:g>개 폴더 더보기"</string>
     <string name="hide_folders" msgid="7618891933409521283">"폴더 숨기기"</string>
     <string name="print" msgid="7987949243936577207">"인쇄"</string>
     <string name="print_all" msgid="4011022762279519941">"모두 인쇄"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"계정 관리"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"일반 설정"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"설정"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"옵션 더보기"</string>
 </resources>

diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 43b205c..8c71d49 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml

@@ -30,8 +30,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Сомону сактоо"</string>
     <string name="discard" msgid="4905982179911608430">"Жарактан чгруу"</string>
     <string name="compose" msgid="2602861958391035523">"Жазуу"</string>
-    <!-- no translation found for compose_title (5673376086133995913) -->
-    <skip />
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Жооп берүү"</item>
     <item msgid="2767793214788399009">"Баары жооп бер"</item>
@@ -46,8 +44,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Бир же бир нече файл тиркелген жок. Белгиленген эң жогорку чек <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Файл тиркелген жок. Белгиленген эң жогорку <xliff:g id="MAXSIZE">%1$s</xliff:g> чекке жетти."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Файл тиркелген жок."</string>
-    <!-- no translation found for attachment_permission_denied (2274397783497640486) -->
-    <skip />
     <string name="recipient_needed" msgid="319816879398937214">"Жок дегенде бир алуучуну кошуңуз."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Алуучунун катасы"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Билдирүү жөнөтүлсүнбү?"</string>
@@ -137,6 +133,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Жооп иретинде пикир жөнөтүү"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Маекти жылдыруу"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> маекти жылдыруу"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> тууралуу <xliff:g id="DATE">%5$s</xliff:g>, күнү <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> тууралуу саат <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"маек окулган"</string>
@@ -224,14 +224,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Чоо-жайын карап көрүү&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Чоо-жайларды жашыруу"</string>
     <string name="to_message_header" msgid="3954385178027011919">"кимге <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <!-- no translation found for bcc_header_for_recipient_summary (1834716758549842454) -->
-    <skip />
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> байланышынын маалыматы көрсөтүлсүн"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Байланыштын маалыматы көрсөтүлсүн"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> мурунку билдирүү"</item>
   </plurals>
-    <!-- no translation found for super_collapsed_loading_content_description:other (678491885491918982) -->
     <string name="from_heading" msgid="48290556829713090">"Кимден:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Төмөнкүгө жооп:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Кимге: "</string>
@@ -289,12 +286,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Электрондук почта папкасы"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Папкаларды өзгөртүү"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Төмөнкүгө жылдыруу"</string>
-    <!-- no translation found for search_hint (7060626585689391003) -->
-    <skip />
+    <string name="search_hint" msgid="4916671414132334289">"Кат издөө"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <!-- no translation found for voice_search_not_supported (8493517060419469738) -->
-    <skip />
     <string name="network_error" msgid="5931164247644972255">"Туташкан жок"</string>
     <string name="retry" msgid="916102442074217293">"Дагы аракет кылуу"</string>
     <string name="load_more" msgid="8702691358453560575">"Дагы жүктөө"</string>
@@ -361,18 +355,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Үнсүз"</string>
-    <!-- no translation found for preference_removal_action_title (3128186577060329884) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (7381624742404593351) -->
-    <!-- no translation found for prefEntries_removal_action:1 (2567465476369142505) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (4080896545573973751) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (6088164268501960435) -->
-    <!-- no translation found for prefDialogTitle_removal_action (7914272565548361304) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Архивдөө &amp; аракеттерди жок кылуу"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="954772302016538814">"Архивдөө гана көрсөтүлсүн"</item>
+    <item msgid="7212690302706180254">"Жок кылуу гана көрсөтүлсүн"</item>
+    <item msgid="2539051197590685708">"Архивдөө же жок кылуу көрсөтүлсүн"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="6877416142040695022">"Архив гана көрсөтүлсүн"</item>
+    <item msgid="1510017057984222376">"Жок кылуу гана көрсөтүлсүн"</item>
+    <item msgid="3196207224108008441">"Архивдөө же жок кылуу көрсөтүлсүн"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Архивдөө &amp; аракеттерди жок кылуу"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Баарына жооп берүү"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Билдирүү жооптору үчүн демейки катары колдонуу"</string>
-    <!-- no translation found for preference_swipe_title (2073613840893904205) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Архивдөө үчүн серпип коюңуз"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Жок кылуу үчүн серпип коюңуз"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Маектер тизмесинде"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Жөнөтүүчүнүн сүрөтү"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Маектешүү тизмесинин жанында маектешүүчүлөрдүн ысымын көрсөтүү"</string>
@@ -391,18 +389,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Папка сүрөтчөсү"</string>
     <string name="add_account" msgid="5905863370226612377">"Каттоо эсебин кошуу"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Кеңешти этибарга албоо"</string>
-    <!-- no translation found for auto_sync_off (3691189864057581214) -->
-    <skip />
-    <!-- no translation found for account_sync_off (5720018952998097061) -->
-    <skip />
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> ичинен <xliff:g id="NUMBER">%1$s</xliff:g> жөнөтүлө элек"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Авто-шайкештештирүү күйгүзүлсүнбү?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Gmail\'де гана эмес, бардык колдонмолордо жана каттоо эсептеринде жасалган өзгөртүүлөр желе, башка түзмөктөр жана сиздин <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ортолорунда шайкештештирилет."</string>
     <string name="phone" msgid="4142617042507912053">"телефон"</string>
     <string name="tablet" msgid="4593581125469224791">"планшет"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Күйгүзүү"</string>
-    <!-- no translation found for show_n_more_folders (1005879825500056552) -->
-    <skip />
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Дагы <xliff:g id="NUMBER">%1$s</xliff:g> папка көрсөтүлсүн"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Папкаларды жашыруу"</string>
     <string name="print" msgid="7987949243936577207">"Басып чыгаруу"</string>
     <string name="print_all" msgid="4011022762279519941">"Баарын басып чыгаруу"</string>
@@ -484,6 +477,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Каттоо эсептерин башкаруу"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Жалпы жөндөөлөр"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Жөндөөлөр"</string>
-    <!-- no translation found for overflow_description (7886090597023240426) -->
-    <skip />
 </resources>

diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 18792a8..345aa10 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"ບັນທຶກສະບັບຮ່າງ"</string>
     <string name="discard" msgid="4905982179911608430">"ຍົກເລີກ"</string>
     <string name="compose" msgid="2602861958391035523">"ຂຽນອີເມວ"</string>
-    <string name="compose_title" msgid="5673376086133995913">"ຂຽນອີເມວ"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"ຕອບກັບ"</item>
     <item msgid="2767793214788399009">"ຕອບກັບທັງຫມົດ"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ນຶ່ງ ຫຼື ຫຼາຍກວ່ານຶ່ງໄຟລ໌ບໍ່ຖືກແນບ ເນື່ອງຈາກລະບົບຈຳກັດໄວ້ທີ່ <xliff:g id="MAXSIZE">%1$s</xliff:g> ໄຟລ໌."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ບໍ່ໄດ້ແນບໄຟລ໌ເທື່ອເນື່ອງຈາກຄົບກຳນົດທີ່ຈຳກັດໄວ້ <xliff:g id="MAXSIZE">%1$s</xliff:g> ໄຟລ໌ແລ້ວ."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ບໍ່ສາມາດແນບໄຟລ໌ໄດ້."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"ການອະນຸຍາດຖືກປະຕິເສດສຳລັບໄຟລ໌ແນບນີ້"</string>
     <string name="recipient_needed" msgid="319816879398937214">"ເພີ່ມຢ່າງຫນ້ອຍນຶ່ງຜູ່ຮັບ."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"ຂໍ້ຜິດພາດຜູ່ຮັບ"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"ສົ່ງອີເມວບໍ່?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"ສົ່ງຄຳຕິຊົມ"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"ຍ້າຍການສົນທະນາ"</item>
+    <item quantity="other" msgid="6639576653114141743">"ຍ້າຍການສົນທະນາ <xliff:g id="ID_1">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> ກ່ຽວກັບ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ເມື່ອ <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> ກ່ຽວກັບ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ເມື່ອ <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"ອ່ານການສົນທະນາແລ້ວ"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;ເບິ່ງລາຍລະອຽດ&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"ເຊື່ອງລາຍລະອຽດ"</string>
     <string name="to_message_header" msgid="3954385178027011919">"ເຖິງ <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"ສະແດງລາຍລະອຽດຜູ່ຕິດຕໍ່ສຳລັບ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"ສະແດງຂໍ້ມູນຕິດຕໍ່"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຄວາມເກົ່າ"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"ກຳລັງໂຫລດ <xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຄວາມທີ່ເກົ່າກວ່າ"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"ຈາກ:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"ຕອບກັບຫາ:"</string>
     <string name="to_heading" msgid="3495203282540398336">"ເຖິງ: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ໂຟນເດີອີເມວ"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"ປ່ຽນໂຟນເດີ"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"ຍ້າຍໄປ"</string>
-    <string name="search_hint" msgid="7060626585689391003">"ຊອກຫາ"</string>
+    <string name="search_hint" msgid="4916671414132334289">"ຊອກອີເມວ"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"ການຊອກຫາດ້ວຍສຽງບໍ່ຮອງຮັບສຳລັບອຸປະກອນນີ້."</string>
     <string name="network_error" msgid="5931164247644972255">"ບໍ່ມີການເຊື່ອມຕໍ່"</string>
     <string name="retry" msgid="916102442074217293">"ລອງໃໝ່"</string>
     <string name="load_more" msgid="8702691358453560575">"ໂຫລດເພີ່ມເຕີມ"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"ປິດສຽງ"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"ຄຳສັ່ງເລີ່ມຕົ້ນ"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"ການເກັບເຂົ້າແຟ້ມ &amp; ການລຶບ"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"ຈັດເກັບ"</item>
-    <item msgid="2567465476369142505">"ລຶບ"</item>
+    <item msgid="954772302016538814">"ສະແດງສະເພາະອັນທີ່ຖືກຈັດເກັບ"</item>
+    <item msgid="7212690302706180254">"ສະແດງການລຶບເທົ່ານັ້ນ"</item>
+    <item msgid="2539051197590685708">"ສະແດງການຈັດເກັບເຂົ້າແຟ້ມ &amp; ການລຶບ"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"ຈັດເກັບ"</item>
-    <item msgid="6088164268501960435">"ລຶບ"</item>
+    <item msgid="6877416142040695022">"ສະແດງສະເພາະອັນທີ່ຖືກຈັດເກັບ"</item>
+    <item msgid="1510017057984222376">"ສະແດງການລຶບເທົ່ານັ້ນ"</item>
+    <item msgid="3196207224108008441">"ສະແດງການຈັດເກັບເຂົ້າແຟ້ມ &amp; ການລຶບ"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"ຄຳສັ່ງເລີ່ມຕົ້ນ"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"ການເກັບເຂົ້າແຟ້ມ &amp; ການລຶບ"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"ຕອບກັບທັງຫມົດ"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"ໃຊ້ເປັນຄ່າເລີ່ມຕົ້ນສຳລັບການຕອບກັບຂໍ້ຄວາມ"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"ຄຳສັ່ງປັດອອກຂ້າງ"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"ປັດອອກຂ້າງເພື່ອເກັບເຂົ້າແຟ້ມ"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"ປັດອອກຂ້າງເພື່ອລຶບ"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"ໃນລາຍການບົດສົນທະນາ"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"ຮູບຜູ່ສົ່ງ"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"ສະແດງທາງຂ້າງຊື່ໃນລາຍການສົນທະນາ"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"ໄອຄອນໂຟນເດີ"</string>
     <string name="add_account" msgid="5905863370226612377">"ເພີ່ມບັນຊີ"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"ປິດຄຳແນະນຳ"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"ການຊິ້ງຂໍ້ມູນອັດຕະໂນມັດຖືກປິດໄວ້. ກະລຸນາແຕະເພື່ອເປີດມັນ."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"ການຊິ້ງຂໍ້ມູນບັນຊີຖືກປິດໄວ້. ທ່ານສາມາດເປີດມັນໄດ້ທີ່ &lt;a href=\'http://www.example.com\'&gt;ການຕັ້ງຄ່າບັນຊີ.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> ອີເມວທີ່ຍັງບໍ່ໄດ້ສົ່ງໃນ <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"ປິດການຊິ້ງຂໍ້ມູນອັດຕະໂນມັດ?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"ການປ່ຽນແປງທີ່ທ່ານເຮັດໃນທຸກແອັບຯ ແລະທຸກບັນຊີບໍ່ສະເພາະພຽງແຕ່ Gmail ຈະໄດ້ຮັບການຊິ້ງຂໍ້ມູນລະຫວ່າງເວັບໄຊ ແລະອຸປະກອນອື່ນໆຂອງທ່ານ ຮວມທັງ <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ຂອງທ່ານນຳ."</string>
     <string name="phone" msgid="4142617042507912053">"ໂທລະສັບ"</string>
     <string name="tablet" msgid="4593581125469224791">"ແທັບເລັດ"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"ເປີດສຽງ"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"ສະແດງ <xliff:g id="NUMBER">%1$s</xliff:g> ໂຟນເດີ"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"ສະແດງ <xliff:g id="NUMBER">%1$s</xliff:g> ໂຟນເດີເພີ່ມເຕີມ"</string>
     <string name="hide_folders" msgid="7618891933409521283">"ເຊື່ອງໂຟນເດີ"</string>
     <string name="print" msgid="7987949243936577207">"ພິມ"</string>
     <string name="print_all" msgid="4011022762279519941">"ພິມອອກທັງໝົດ"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"ຈັດການບັນຊີ"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"ການຕັ້ງຄ່າທົ່ວໄປ"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"ການຕັ້ງຄ່າ"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"ໂຕເລືອກເພີ່ມເຕີມ"</string>
 </resources>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 88e27e2..c1e07c1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Išsaugoti juodraštį"</string>
     <string name="discard" msgid="4905982179911608430">"Atmesti"</string>
     <string name="compose" msgid="2602861958391035523">"Sukurti"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Sukurti"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Atsakyti"</item>
     <item msgid="2767793214788399009">"Atsakyt visiems"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Mažiausiai vienas failas nepridėtas. Apribojimas <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Failas nepridėtas. Pasiektas <xliff:g id="MAXSIZE">%1$s</xliff:g> apribojimas."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Nepavyko pridėti failo."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Priedo leidimas uždraustas."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Pridėkite bent vieną gavėją."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Gavėjo klaida"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Siųsti pranešimą?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Siųsti atsiliepimus"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Perkelti pokalbį"</item>
+    <item quantity="other" msgid="6639576653114141743">"Perkelti <xliff:g id="ID_1">%1$d</xliff:g> pokalbius (-ių)"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> apie „<xliff:g id="SUBJECT">%3$s</xliff:g>“, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="DATE">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> apie „<xliff:g id="SUBJECT">%3$s</xliff:g>“, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="TIME">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"pokalbis perskaitytas"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Peržiūrėti išsamią informaciją&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Slėpti išsamią informaciją"</string>
     <string name="to_message_header" msgid="3954385178027011919">"kam: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Rodyti <xliff:g id="NAME">%1$s</xliff:g> kontaktinę informaciją"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Rodyti kontaktinę informaciją"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Senesnių pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Įkeliama senesnių pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Nuo:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Atsakyti:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Kam: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"El. pašto aplankas"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Keisti aplankus"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Perkelti į"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Paieška"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Ieškoti el. pašte"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Šiame įrenginyje nepalaikoma Paieška balsu."</string>
     <string name="network_error" msgid="5931164247644972255">"Nėra ryšio"</string>
     <string name="retry" msgid="916102442074217293">"Bandyti dar kartą"</string>
     <string name="load_more" msgid="8702691358453560575">"Įkelti daugiau"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Tylus"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Numatytasis veiksmas"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Archyvavimas ir ištrynimas"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archyvuoti"</item>
-    <item msgid="2567465476369142505">"Ištrinti"</item>
+    <item msgid="954772302016538814">"Rodyti tik archyvą"</item>
+    <item msgid="7212690302706180254">"Rodyti tik ištrintus"</item>
+    <item msgid="2539051197590685708">"Rodyti archyvą ir ištrintus"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archyvuoti"</item>
-    <item msgid="6088164268501960435">"Ištrinti"</item>
+    <item msgid="6877416142040695022">"Rodyti tik archyvą"</item>
+    <item msgid="1510017057984222376">"Rodyti tik ištrintus"</item>
+    <item msgid="3196207224108008441">"Rodyti archyvą ir ištrintus"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Numatytasis veiksmas"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Archyvavimas ir ištrynimas"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Atsakyti visiems"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Naudoti kaip numatytąjį atsakant į pranešimus"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Perbraukimo veiksmai"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Perbraukite, kad archyvuotumėte"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Perbraukite, kad ištrintumėte"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Pokalbių sąraše"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Siuntėjo vaizdas"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Rodyti šalia vardo pokalbių sąraše"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Aplanko piktograma"</string>
     <string name="add_account" msgid="5905863370226612377">"Pridėti paskyrą"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Atsisakyti patarimo"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automatinis sinchronizavimas išjungtas. Palieskite, kad įjungtumėte."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Paskyros sinchronizavimas išjungtas. Įjunkite jį &lt;a href=\'http://www.example.com\'&gt;„Paskyros nustatymuose“.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"„<xliff:g id="OUTBOX">%2$s</xliff:g>“ esančių neišsiųstų elementų: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Įjungti automatinį sinchronizavimą?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Pakeitimai, atliekami visose programose ir paskyrose, o ne tik „Gmail“, bus sinchronizuojami žiniatinklyje, kituose įrenginiuose ir <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefone"</string>
     <string name="tablet" msgid="4593581125469224791">"planšetiniame kompiuteryje"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Įjungti"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Rodyti <xliff:g id="NUMBER">%1$s</xliff:g> aplank."</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Rodyti aplankų: dar <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Slėpti aplankus"</string>
     <string name="print" msgid="7987949243936577207">"Spausdinti"</string>
     <string name="print_all" msgid="4011022762279519941">"Spausdinti viską"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Tvarkyti paskyras"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Bendrieji nustatymai"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Nustatymai"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Daugiau parinkčių"</string>
 </resources>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3f76f65..8b80f8e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Saglabāt melnrakstu"</string>
     <string name="discard" msgid="4905982179911608430">"Atmest"</string>
     <string name="compose" msgid="2602861958391035523">"Rakstīt"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Rakstīt"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Atbildēt"</item>
     <item msgid="2767793214788399009">"Atbildēt visiem"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Viens vai vairāki faili nav pievienoti. Maksimālais lielums ir <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Fails nav pievienots. Ir sasniegts ierobežojums (<xliff:g id="MAXSIZE">%1$s</xliff:g>)."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Nevarēja pievienot failu."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Pielikuma atļauja ir noraidīta."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Pievienojiet vismaz vienu adresātu."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Adresāta kļūda"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Vai sūtīt ziņojumu?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Sūtīt atsauksmes"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Pārvietot sarunu"</item>
+    <item quantity="other" msgid="6639576653114141743">"Pārvietot <xliff:g id="ID_1">%1$d</xliff:g> sarunu(-as)"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> par šādu tematu: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>)"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> par šādu tematu <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (plkst. <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>)"</string>
     <string name="read_string" msgid="5495929677508576520">"saruna ir izlasīta"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Skatīt detalizētu informāciju&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Slēpt datus"</string>
     <string name="to_message_header" msgid="3954385178027011919">"kam: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Diskr. k.: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Rādīt sūtītāja <xliff:g id="NAME">%1$s</xliff:g> kontaktinformāciju"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Rādīt kontaktinformāciju"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> vecāki ziņojumi"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Notiek <xliff:g id="COUNT">%1$d</xliff:g> vecāku ziņojumu ielāde"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"No:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Atbildēt:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Kam: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Mape “E-pasts”"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Mapju mainīšana"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Pārvietošana"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Meklēt"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Meklēt vēstulēs"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Meklēšana ar balsi netiek atbalstīta šajā ierīcē."</string>
     <string name="network_error" msgid="5931164247644972255">"Nav savienojuma"</string>
     <string name="retry" msgid="916102442074217293">"Mēģināt vēlreiz"</string>
     <string name="load_more" msgid="8702691358453560575">"Ielādēt vēl"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Klusums"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Noklusējuma darbība"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Arhivēšanas un dzēšanas darbības"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arhivēt"</item>
-    <item msgid="2567465476369142505">"Dzēst"</item>
+    <item msgid="954772302016538814">"Rādīt tikai arhivēšanas darbību"</item>
+    <item msgid="7212690302706180254">"Rādīt tikai dzēšanas darbību"</item>
+    <item msgid="2539051197590685708">"Rādīt arhivēšanas un dzēšanas darbību"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arhivēt"</item>
-    <item msgid="6088164268501960435">"Dzēst"</item>
+    <item msgid="6877416142040695022">"Rādīt tikai arhivēšanas darbību"</item>
+    <item msgid="1510017057984222376">"Rādīt tikai dzēšanas darbību"</item>
+    <item msgid="3196207224108008441">"Rādīt arhivēšanas un dzēšanas darbību"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Noklusējuma darbība"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Arhivēšanas un dzēšanas darbības"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Atbildēt visiem"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Izmantot kā noklusējumu, atbildot uz ziņojumiem"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Vilkšanas darbības"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Vilkt, lai arhivētu"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Vilkt, lai dzēstu"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Sarunu sarakstā"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Sūtītāja attēls"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Rādīt blakus vārdam sarunu sarakstā"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Mapes ikona"</string>
     <string name="add_account" msgid="5905863370226612377">"Pievienot kontu"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Noraidīt padomu"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automātiskā sinhronizācija ir izslēgta. Pieskarieties, lai to ieslēgtu."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Konta sinhronizēšana ir izslēgta. Ieslēdziet to &lt;a href=\'http://www.example.com\'&gt;konta iestatījumos&lt;/a&gt;."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> nenosūtīti ziņojumi sadaļā <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Vai ieslēgt automātisko sinhronizāciju?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Izmaiņas, ko veicāt visām lietotnēm un kontiem (ne tikai Gmail), tiks sinhronizētas tīmeklī, citās jūsu ierīcēs un šādā jūsu ierīcē: <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"tālrunis"</string>
     <string name="tablet" msgid="4593581125469224791">"planšetdators"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Ieslēgt"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Rādīt <xliff:g id="NUMBER">%1$s</xliff:g> mapi(-es)"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Rādīt vēl <xliff:g id="NUMBER">%1$s</xliff:g> mapes"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Paslēpt mapes"</string>
     <string name="print" msgid="7987949243936577207">"Drukāt"</string>
     <string name="print_all" msgid="4011022762279519941">"Drukāt visu"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Pārvaldīt kontus"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Vispārīgie iestatījumi"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Iestatījumi"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Vairāk iespēju"</string>
 </resources>

diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 36eb924..ede3805 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml

@@ -30,8 +30,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Зачувај нацрт"</string>
     <string name="discard" msgid="4905982179911608430">"Отфрли"</string>
     <string name="compose" msgid="2602861958391035523">"Состави"</string>
-    <!-- no translation found for compose_title (5673376086133995913) -->
-    <skip />
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Одговори"</item>
     <item msgid="2767793214788399009">"Одговори на сите"</item>
@@ -46,8 +44,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Една или повеќе датотеки не се прикачени. Ограничување <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Датотеката не е прикачена. <xliff:g id="MAXSIZE">%1$s</xliff:g> граница е достигната."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Не можеше да се прикачи датотека."</string>
-    <!-- no translation found for attachment_permission_denied (2274397783497640486) -->
-    <skip />
     <string name="recipient_needed" msgid="319816879398937214">"Додај најмалку еден примач."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Грешка на примач"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Испрати порака?"</string>
@@ -137,6 +133,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Испраќај повратни информации"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Премести разговор"</item>
+    <item quantity="other" msgid="6639576653114141743">"Премести <xliff:g id="ID_1">%1$d</xliff:g> разговори"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> за <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> на <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> за <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> во <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"разговорот е прочитан"</string>
@@ -224,14 +224,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Прикажи детали&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Сокриј детали"</string>
     <string name="to_message_header" msgid="3954385178027011919">"до <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <!-- no translation found for bcc_header_for_recipient_summary (1834716758549842454) -->
-    <skip />
     <string name="contact_info_string" msgid="6484930184867405276">"Прикажи информации за контакт за <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Прикажи информации за контакт"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> постари пораки"</item>
   </plurals>
-    <!-- no translation found for super_collapsed_loading_content_description:other (678491885491918982) -->
     <string name="from_heading" msgid="48290556829713090">"Од:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Одговори на:"</string>
     <string name="to_heading" msgid="3495203282540398336">"До: "</string>
@@ -289,12 +286,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Папка за е-пошта"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Промени папки"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Премести во"</string>
-    <!-- no translation found for search_hint (7060626585689391003) -->
-    <skip />
+    <string name="search_hint" msgid="4916671414132334289">"Пребарај пошта"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <!-- no translation found for voice_search_not_supported (8493517060419469738) -->
-    <skip />
     <string name="network_error" msgid="5931164247644972255">"Нема поврзување"</string>
     <string name="retry" msgid="916102442074217293">"Обиди се повторно"</string>
     <string name="load_more" msgid="8702691358453560575">"Вчитај повеќе"</string>
@@ -361,18 +355,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Тивко"</string>
-    <!-- no translation found for preference_removal_action_title (3128186577060329884) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (7381624742404593351) -->
-    <!-- no translation found for prefEntries_removal_action:1 (2567465476369142505) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (4080896545573973751) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (6088164268501960435) -->
-    <!-- no translation found for prefDialogTitle_removal_action (7914272565548361304) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Архивирај и избриши дејства"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="954772302016538814">"Прикажи само архива"</item>
+    <item msgid="7212690302706180254">"Прикажи само избриши"</item>
+    <item msgid="2539051197590685708">"Прикажи архива и избриши"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="6877416142040695022">"Прикажи само архива"</item>
+    <item msgid="1510017057984222376">"Прикажи само избриши"</item>
+    <item msgid="3196207224108008441">"Прикажи архива и избриши"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Архивирај и избриши дејства"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Одговори на сите"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Користи како стандард за одговарање пораки"</string>
-    <!-- no translation found for preference_swipe_title (2073613840893904205) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Помини со прст за да се архивира"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Помини со прст за да избришеш"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Во список на разговор"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Слика на испраќач"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Прикажи покрај името во списокот со разговори"</string>
@@ -391,18 +389,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Икона на папка"</string>
     <string name="add_account" msgid="5905863370226612377">"Додај сметка"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Отфрли совет"</string>
-    <!-- no translation found for auto_sync_off (3691189864057581214) -->
-    <skip />
-    <!-- no translation found for account_sync_off (5720018952998097061) -->
-    <skip />
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> не се испратени во <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Вклучи автоматско синхронизирање?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Промените што ги правите на сите апликации и сметки, не само на Gmail, ќе се синхронизираат на интернет, на останатите ваши уреди и на вашиот <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"телефон"</string>
     <string name="tablet" msgid="4593581125469224791">"таблет"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Вклучи"</string>
-    <!-- no translation found for show_n_more_folders (1005879825500056552) -->
-    <skip />
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Прикажи <xliff:g id="NUMBER">%1$s</xliff:g> повеќе папки"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Сокриј папки"</string>
     <string name="print" msgid="7987949243936577207">"Печати"</string>
     <string name="print_all" msgid="4011022762279519941">"Печати сѐ"</string>
@@ -484,6 +477,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Управувај со сметки"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Општи поставки"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Поставки"</string>
-    <!-- no translation found for overflow_description (7886090597023240426) -->
-    <skip />
 </resources>

diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 0b8d3ec..ae78e53 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"ഡ്രാഫ്റ്റ് സംരക്ഷിക്കുക"</string>
     <string name="discard" msgid="4905982179911608430">"നിരസിക്കുക"</string>
     <string name="compose" msgid="2602861958391035523">"രചിക്കുക"</string>
-    <string name="compose_title" msgid="5673376086133995913">"രചിക്കുക"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"മറുപടി നൽകുക"</item>
     <item msgid="2767793214788399009">"എല്ലാവർക്കും മറുപടി നൽകുക"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ഒന്നോ അതിലധികമോ ഫയലുകൾ അറ്റാച്ചുചെയ്‌തിട്ടില്ല. പരിധി <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ഫയൽ അറ്റാച്ചുചെയ്‌തില്ല. <xliff:g id="MAXSIZE">%1$s</xliff:g> പരിധിയിലെത്തി."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ഫയൽ അറ്റാച്ചുചെയ്യാനായില്ല."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"അറ്റാച്ചുമെന്റിനായുള്ള അനുമതി നിരസിച്ചു."</string>
     <string name="recipient_needed" msgid="319816879398937214">"ഒരു സ്വീകർത്താവിനെയെങ്കിലും ചേർക്കുക."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"സ്വീകർത്താവിന്റെ ഭാഗത്തെ പിശക്"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"സന്ദേശം അയയ്‌ക്കണോ?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"ഫീഡ്‌ബാക്ക് അയയ്‌ക്കുക"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"സംഭാഷണം നീക്കുക"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> സംഭാഷണങ്ങൾ നീക്കുക"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="DATE">%5$s</xliff:g>-ന് <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> എന്നതിനെക്കുറിച്ച് <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> എന്നതിനെക്കുറിച്ചുള്ള <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>,  <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>-ന്"</string>
     <string name="read_string" msgid="5495929677508576520">"സംഭാഷണം വായിച്ചു"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;വിശദാംശങ്ങൾ കാണുക&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"വിശദാംശങ്ങള്‍ മറയ്‌ക്കുക‍‌"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> എന്നിവർക്ക്"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> എന്നയാളെ ബന്ധപ്പെടാനുള്ള വിവരം കാണിക്കുക"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"ബന്ധപ്പെടാനുള്ള വിവരം കാണിക്കുക"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> പഴയ സന്ദേശങ്ങൾ"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> പഴയ സന്ദേശങ്ങൾ ലോഡുചെയ്യുന്നു"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"അയച്ചയാൾ:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"ഇതിലേക്ക് മറുപടി അയയ്ക്കുക:"</string>
     <string name="to_heading" msgid="3495203282540398336">"സ്വീകർത്താവ്: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ഇമെയിൽ ഫോൾഡർ"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"ഫോൾഡറുകൾ മാറ്റുക"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"ഇതിലേക്ക് നീക്കുക"</string>
-    <string name="search_hint" msgid="7060626585689391003">"തിരയുക"</string>
+    <string name="search_hint" msgid="4916671414132334289">"മെയിൽ തിരയുക"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"ഈ ഉപകരണത്തിൽ വോയ്‌സ് തിരയൽ പിന്തുണയ്‌ക്കില്ല."</string>
     <string name="network_error" msgid="5931164247644972255">"കണക്ഷനൊന്നുമില്ല"</string>
     <string name="retry" msgid="916102442074217293">"വീണ്ടും ശ്രമിക്കുക"</string>
     <string name="load_more" msgid="8702691358453560575">"കൂടുതൽ ലോഡ് ചെയ്യുക"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"നിശബ്‌ദം"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"സ്ഥിര പ്രവർത്തനം"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"ആർക്കൈവുചെയ്യുക &amp; ഇല്ലാതാക്കുക പ്രവർത്തനങ്ങൾ"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"ആര്‍ക്കൈവുചെയ്യുക"</item>
-    <item msgid="2567465476369142505">"ഇല്ലാതാക്കുക"</item>
+    <item msgid="954772302016538814">"ആർക്കൈവുചെയ്‌തവ മാത്രം കാണിക്കുക"</item>
+    <item msgid="7212690302706180254">"ഇല്ലാതാക്കിയവ മാത്രം കാണിക്കുക"</item>
+    <item msgid="2539051197590685708">"ആർക്കൈവുചെയ്‌തവയും ഇല്ലാതാക്കിയവയും കാണിക്കുക"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"ആര്‍ക്കൈവുചെയ്യുക"</item>
-    <item msgid="6088164268501960435">"ഇല്ലാതാക്കുക"</item>
+    <item msgid="6877416142040695022">"ആർക്കൈവുചെയ്‌തവ മാത്രം കാണിക്കുക"</item>
+    <item msgid="1510017057984222376">"ഇല്ലാതാക്കിയവ മാത്രം കാണിക്കുക"</item>
+    <item msgid="3196207224108008441">"ആർക്കൈവുചെയ്‌തവയും ഇല്ലാതാക്കിയവയും കാണിക്കുക"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"സ്ഥിര പ്രവർത്തനം"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"പ്രവർത്തനങ്ങൾ ആർക്കവുചെയ്യുക &amp; ഇല്ലാതാക്കുക"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"എല്ലാവർക്കും മറുപടി നൽകുക"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"സന്ദേശത്തിനുള്ള മറുപടികൾക്ക് സ്ഥിരമായി ഉപയോഗിക്കുക"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"സ്വൈപ്പ് പ്രവർത്തനങ്ങൾ"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"ആർക്കൈവുചെയ്യാൻ സ്വൈപ്പുചെയ്യുക"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"ഇല്ലാതാക്കാൻ സ്വൈപ്പുചെയ്യുക"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"സംഭാഷണ ലിസ്റ്റിൽ"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"അയച്ചയാളുടെ ചിത്രം"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"സംഭാഷണ ലിസ്റ്റിന് സമീപം പേര് കാണിക്കുക"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"ഫോൾഡർ ഐക്കൺ"</string>
     <string name="add_account" msgid="5905863370226612377">"അക്കൗണ്ട് ചേർക്കുക"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"നുറുങ്ങ് നിരസിക്കുക"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"യാന്ത്രിക സമന്വയം ഓഫാണ്. ഓണാക്കാൻ സ്‌പർശിക്കുക."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"അക്കൗണ്ട് സമന്വയം ഓഫാണ്. &lt;a href=\'http://www.example.com\'&gt;അക്കൗണ്ട് ക്രമീകരണങ്ങൾ.&lt;/a&gt; എന്നതിൽ ഓണാക്കുക"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>-ൽ <xliff:g id="NUMBER">%1$s</xliff:g> എണ്ണം അയച്ചിട്ടില്ല"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"യാന്ത്രിക സമന്വയം ഓൺ ചെയ്യണോ?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"എല്ലാ അപ്ലിക്കേഷനുകളിലും അക്കൗണ്ടുകളിലും നിങ്ങൾ വരുത്തുന്ന മാറ്റങ്ങൾ Gmail-ൽ മാത്രമല്ല, വെബിലും മറ്റ് ഉപകരങ്ങൾക്കും നിങ്ങളുടെ <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> എന്നതിനിടയിലും സമന്വയിപ്പിക്കപ്പെടും."</string>
     <string name="phone" msgid="4142617042507912053">"ഫോണ്‍"</string>
     <string name="tablet" msgid="4593581125469224791">"ടാബ്‌ലെറ്റ്"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"ഓൺ ചെയ്യുക"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> ഫോൾഡറുകൾ കാണിക്കുക"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"<xliff:g id="NUMBER">%1$s</xliff:g>-ലധികം ഫോൾഡറുകൾ കാണിക്കുക"</string>
     <string name="hide_folders" msgid="7618891933409521283">"ഫോൾഡറുകൾ മറയ്‌ക്കുക"</string>
     <string name="print" msgid="7987949243936577207">"പ്രിന്റുചെയ്യുക"</string>
     <string name="print_all" msgid="4011022762279519941">"എല്ലാം പ്രിന്റുചെയ്യുക"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"അക്കൗണ്ടുകൾ നിയന്ത്രിക്കുക"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"പൊതുക്രമീകരണങ്ങൾ"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"ക്രമീകരണങ്ങൾ"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"കൂടുതൽ ഓപ്‌ഷനുകൾ"</string>
 </resources>

diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 1a41343..3317e7d 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Ноорог хадгалах"</string>
     <string name="discard" msgid="4905982179911608430">"Устг"</string>
     <string name="compose" msgid="2602861958391035523">"Мэйл бичих"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Бичих"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Хариулах"</item>
     <item msgid="2767793214788399009">"Бүгдэд хариу илгээх"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Нэг буюу хэд хэдэн файл хавсрагдаагүй. Хязгаар <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Файлыг хавсаргасангүй. <xliff:g id="MAXSIZE">%1$s</xliff:g> хязгаарт хүрсэн."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Файлыг хавсаргаж чадсангүй."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Хавсралтын зөвшөөрөл өгөөгүй."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Ядаж нэг хүлээн авагч нэмнэ үү."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Хүлээн авагчийн алдаа"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Зурвас илгээх үү?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Санал хүсэл илгээх"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Харилцааг зөөх"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> харилцааг зөөх"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>-н тухай, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>-д, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>-н тухай, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g>-д, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"харилцааг уншсан"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Дэлгэрэнгүй үзэх&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Дэлгэрэнгүйг далдлах"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> руу"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g>-н харилцагчийн мэдээллийг харуулах"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Харилцагчийн мэдээллийг харуулах"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> хуучин мессежүүд"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Хуучин <xliff:g id="COUNT">%1$d</xliff:g> зурвас ачаалж байна"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Хэнээс:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Хариу илгээх:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Хэнд: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Имэйл фолдер"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Фолдеруудыг өөрчлөх"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Зөөх"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Хайх"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Имэйл хайх"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Дуун хайлт энэ төхөөрөмж дээр дэмжигдээгүй байна."</string>
     <string name="network_error" msgid="5931164247644972255">"Холбогдоогүй"</string>
     <string name="retry" msgid="916102442074217293">"Дахин оролдох"</string>
     <string name="load_more" msgid="8702691358453560575">"Нэмж харуул"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Чимээгүй"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Стандарт үйлдэл"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Архивлах &amp; устгах үйлдлүүд"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Архивлах"</item>
-    <item msgid="2567465476369142505">"Устгах"</item>
+    <item msgid="954772302016538814">"Зөвхөн архивлахыг харуулах"</item>
+    <item msgid="7212690302706180254">"Зөвхөн устгахыг харуулах"</item>
+    <item msgid="2539051197590685708">"Архивлах &amp; устгахыг харуулах"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Архивлах"</item>
-    <item msgid="6088164268501960435">"Устгах"</item>
+    <item msgid="6877416142040695022">"Зөвхөн архивлахыг харуулах"</item>
+    <item msgid="1510017057984222376">"Зөвхөн устгахыг харуулах"</item>
+    <item msgid="3196207224108008441">"Архивлах &amp; устгахыг харуулах"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Стандарт үйлдэл"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Архивлах &amp; устгах үйлдлүүд"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Бүгдэд хариу илгээх"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Зурвасын үндсэн хариулт болгон ашиглах"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Шудрах үйлдэл"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Архивлахын тулд шудрах"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Устгахын тулд шудрах"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Харилцааны жагсаалтад"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Илгээгчийн зураг"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Харилцааны жагсаалтад нэрний хажууд харуулах"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Хавтасны дүрс"</string>
     <string name="add_account" msgid="5905863370226612377">"Акаунт нэмэх"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Зөвлөмжийг хаах"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Автомат синк унтарсан байна. Асаах бол хүрнэ үү."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Акаунтын синк идэвхгүй байна. Үүнийг &lt;a href=\'http://www.example.com\'&gt;Акаунтын тохиргоо дотроос асаана уу.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> дотор <xliff:g id="NUMBER">%1$s</xliff:g> илгээгүй"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Автомат синкийг асаах уу?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Gmail төдөөгүй бүх апп болон акаунтад таны хийсэн өөрчлөлтүүд нь веб болон таны бусад төхөөрөмжүүд, <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> хооронд синк хийгдэх болно."</string>
     <string name="phone" msgid="4142617042507912053">"утас"</string>
     <string name="tablet" msgid="4593581125469224791">"таблет"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Асаах"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> фолдер харуулах"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Өөр <xliff:g id="NUMBER">%1$s</xliff:g> фолдер харуулах"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Фолдер нуух"</string>
     <string name="print" msgid="7987949243936577207">"Хэвлэх"</string>
     <string name="print_all" msgid="4011022762279519941">"Бүгдийг нь хэвлэх"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Акаунтуудыг удирдах"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Ерөнхий тохиргоо"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Тохиргоо"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Илүү сонголтууд"</string>
 </resources>

diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 91e8b22..004569a 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"मसुदा जतन करा"</string>
     <string name="discard" msgid="4905982179911608430">"टाकून द्या"</string>
     <string name="compose" msgid="2602861958391035523">"तयार करा"</string>
-    <string name="compose_title" msgid="5673376086133995913">"तयार करा"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"प्रत्युत्तर द्या"</item>
     <item msgid="2767793214788399009">"सर्वांना प्रत्युत्तर द्या"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"एक किंवा अधिक फायली संलग्न केल्या नाहीत. <xliff:g id="MAXSIZE">%1$s</xliff:g> मर्यादित करा."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"फाइल संलग्न केली नाही. <xliff:g id="MAXSIZE">%1$s</xliff:g> मर्यादा गाठली."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"फाईल संलग्न करू शकलो नाही."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"संलग्नकासाठी परवानगी नाकारली."</string>
     <string name="recipient_needed" msgid="319816879398937214">"किमान एक प्राप्तकर्ता जोडा."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"प्राप्तकर्ता त्रुटी"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"संदेश पाठवायचा?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"अभिप्राय पाठवा"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"संभाषण हलवा"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> संभाषणे हलवा"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> विषयी, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g> रोजी, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> विषयी, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g> वाजता, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"संभाषण वाचले"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"तपशील लपवा"</string>
     <string name="to_message_header" msgid="3954385178027011919">"प्रति <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> साठी संपर्क माहिती दर्शवा"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"संपर्क माहिती दर्शवा"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> जुने संदेश"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> जुने संदेश लोड करत आहे"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"प्रेषक:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"यांना-प्रत्युत्तर द्या:"</string>
     <string name="to_heading" msgid="3495203282540398336">"प्रति: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ईमेल फोल्डर"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"फोल्डर बदला"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"यावर हलवा"</string>
-    <string name="search_hint" msgid="7060626585689391003">"शोधा"</string>
+    <string name="search_hint" msgid="4916671414132334289">"मेल शोधा"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"या डिव्हाइसवर व्हॉइस शोध समर्थित नाही."</string>
     <string name="network_error" msgid="5931164247644972255">"कोणतेही कनेक्शन नाही"</string>
     <string name="retry" msgid="916102442074217293">"पुन्हा प्रयत्न करा"</string>
     <string name="load_more" msgid="8702691358453560575">"अधिक लोड करा"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"मूक"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"डीफॉल्ट क्रिया"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"क्रियांचे संग्रहण करा आणि हटवा"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"संग्रहण करा"</item>
-    <item msgid="2567465476369142505">"हटवा"</item>
+    <item msgid="954772302016538814">"केवळ संग्रहण दर्शवा"</item>
+    <item msgid="7212690302706180254">"केवळ हटवा दर्शवा"</item>
+    <item msgid="2539051197590685708">"संग्रहण करा आणि हटवा दर्शवा"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"संग्रहण करा"</item>
-    <item msgid="6088164268501960435">"हटवा"</item>
+    <item msgid="6877416142040695022">"केवळ संग्रहण दर्शवा"</item>
+    <item msgid="1510017057984222376">"केवळ हटवा दर्शवा"</item>
+    <item msgid="3196207224108008441">"संग्रहण करा आणि हटवा दर्शवा"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"डीफॉल्ट क्रिया"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"क्रियांचे संग्रहण करा आणि हटवा"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"सर्वांना प्रत्युत्तर द्या"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"संदेश प्रत्युत्तरांसाठी डीफॉल्ट म्हणून वापरा"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"स्वाइप क्रिया"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"संग्रहण करण्यासाठी स्वाइप करा"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"हटविण्यासाठी स्वाइप करा"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"संभाषण सूचीमध्ये"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"प्रेषक प्रतिमा"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"संभाषण सूचीमध्ये बाजूचे नाव दर्शवा"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"फोल्डर चिन्ह"</string>
     <string name="add_account" msgid="5905863370226612377">"खाते जोडा"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"टीप डिसमिस करा"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"स्वयं-संकालन बंद आहे. चालू करण्यासाठी स्पर्श करा."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"खाते संकालन बंद आहे. &lt;a href=\'http://www.example.com\'&gt;खाते सेटिंग्ज.&lt;/a&gt; मध्ये चालू करा"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> मधील <xliff:g id="NUMBER">%1$s</xliff:g> न पाठवलेले"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"स्वयं- संकालन चालू करायचे?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"फक्त Gmail मध्ये नाही, तर आपण सर्व अॅप्स आणि खात्यांमध्ये करता ते बदल, वेब, आपले अन्य डिव्हाइसेस आणि आपला <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> या दरम्यान संकालित केले जातील."</string>
     <string name="phone" msgid="4142617042507912053">"फोन"</string>
     <string name="tablet" msgid="4593581125469224791">"टॅब्लेट"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"चालू करा"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> फोल्डर दर्शवा"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"अधिक <xliff:g id="NUMBER">%1$s</xliff:g> फोल्डर दर्शवा"</string>
     <string name="hide_folders" msgid="7618891933409521283">"फोल्डर लपवा"</string>
     <string name="print" msgid="7987949243936577207">"मुद्रण करा"</string>
     <string name="print_all" msgid="4011022762279519941">"सर्व मुद्रित करा"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"खात्‍यांचे व्यवस्थापन करा"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"सामान्य सेटिंग्ज"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"सेटिंग्ज"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"अधिक पर्याय"</string>
 </resources>

diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index dba8fd6..b65acc7 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Simpan draf"</string>
     <string name="discard" msgid="4905982179911608430">"Buang"</string>
     <string name="compose" msgid="2602861958391035523">"Karang"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Karang"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Balas"</item>
     <item msgid="2767793214788399009">"Balas kepada semua"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Satu atau lebih fail tidak dilampirkan. Had <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Fail tidak dilampirkan. Had <xliff:g id="MAXSIZE">%1$s</xliff:g> telah dicapai."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Tidak dapat melampirkan fail."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Kebenaran ditolak untuk lampiran."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Tambahkan sekurang-kurangnya satu penerima."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Ralat penerima"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Hantar mesej?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Hantar maklum balas"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Alih perbualan"</item>
+    <item quantity="other" msgid="6639576653114141743">"Alih <xliff:g id="ID_1">%1$d</xliff:g> perbualan"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> mengenai <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pada <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> mengenai <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pada <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"perbualan telah dibaca"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Lihat butiran&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Sembunyikan butiran"</string>
     <string name="to_message_header" msgid="3954385178027011919">"kepada <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"skt: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Papar maklumat kenalan untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Tunjukkan maklumat kenalan"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mesej lebih lama"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Memuatkan <xliff:g id="COUNT">%1$d</xliff:g> mesej lama"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Daripada:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Balas-kpd:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Kepada: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Folder e-mel"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Tukar folder"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Alih ke"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Cari"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Cari dalam mel"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Carian suara tidak disokong pada peranti ini."</string>
     <string name="network_error" msgid="5931164247644972255">"Tiada sambungan"</string>
     <string name="retry" msgid="916102442074217293">"Cuba semula"</string>
     <string name="load_more" msgid="8702691358453560575">"Muatkan lagi"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Senyap"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Tindakan lalai"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Arkib &amp; padam tindakan"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arkib"</item>
-    <item msgid="2567465476369142505">"Padam"</item>
+    <item msgid="954772302016538814">"Tunjukkan arkib sahaja"</item>
+    <item msgid="7212690302706180254">"Tunjukkan padam sahaja"</item>
+    <item msgid="2539051197590685708">"Tunjukkan arkib &amp; padam"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arkib"</item>
-    <item msgid="6088164268501960435">"Padam"</item>
+    <item msgid="6877416142040695022">"Tunjukkan arkib sahaja"</item>
+    <item msgid="1510017057984222376">"Tunjukkan padam sahaja"</item>
+    <item msgid="3196207224108008441">"Tunjukkan arkib &amp; padam"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Tindakan lalai"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Arkib &amp; padam tindakan"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Balas kepada semua"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Gunakan sebagai tetapan lalai untuk balasan mesej"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Tindakan leret"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Leret untuk mengarkib"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Leret untuk memadam"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Dalam senarai perbualan"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Imej penghantar"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Tunjukkan di sebelah nama dalam senarai perbualan"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ikon folder"</string>
     <string name="add_account" msgid="5905863370226612377">"Tambah akaun"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Ketepikan petua"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Autosegerak dimatikan. Sentuh untuk menghidupkannya."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Penyegerakan akaun dimatikan. Hidupkan dalam &lt;a href=\'http://www.example.com\'&gt;Tetapan akaun.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> tidak dihantar dalam <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Hidupkan auto segerak?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Perubahan yang anda lakukan kepada semua apl dan akaun, bukan hanya Gmail, akan disegerakkan antara web, peranti anda yang lain dan <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> anda."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Hidupkan"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Tunjukkan <xliff:g id="NUMBER">%1$s</xliff:g> folder"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Tunjukkan <xliff:g id="NUMBER">%1$s</xliff:g> folder lagi"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Sembunyikan folder"</string>
     <string name="print" msgid="7987949243936577207">"Cetak"</string>
     <string name="print_all" msgid="4011022762279519941">"Cetak semua"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Urus Akaun"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Tetapan umum"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Tetapan"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Lagi pilihan"</string>
 </resources>

diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 0afcbf6..1f2bdc5 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"မူကြမ်းကို သိမ်းဆည်းရန်"</string>
     <string name="discard" msgid="4905982179911608430">"စွန့်ပစ်ရန်"</string>
     <string name="compose" msgid="2602861958391035523">"ရေးဖွဲ့ရန်"</string>
-    <string name="compose_title" msgid="5673376086133995913">"ရေးဖွဲ့ရန်"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"ဖြေကြားရန်"</item>
     <item msgid="2767793214788399009">"အားလုံးကို ဖြေ"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ဖိုင် တစ်ခု သို့မဟုတ် ပိုများတာကို မပူးတွဲခဲ့ပါ။ <xliff:g id="MAXSIZE">%1$s</xliff:g> ကန့်သတ်မှု။"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ဖိုင် ပူးတွဲ မပေးခဲ့ပါ။ <xliff:g id="MAXSIZE">%1$s</xliff:g> ကန့်သတ်ချက် ပြည့်သွားပြီ။"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ဖိုင်ကို မပူးတွဲနိုင်ခဲ့ပါ။"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"ပူးတွဲချက် အတွက် ခွင့်ပြုချက်ကို ငြင်းပယ်လိုက်သည်။"</string>
     <string name="recipient_needed" msgid="319816879398937214">"လက်ခံသူ အနည်းဆုံး တစ်ဦးကို ထည့်ပါ။"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"ရရှိသူ အမှား"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"စာကို ပို့ရမလား?"</string>
@@ -134,6 +132,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"တုံ့ပြန်ချက် ပို့ရန်"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"စကားဝိုင်းကို ရွှေ့ရန်"</item>
+    <item quantity="other" msgid="6639576653114141743">"စကားဝိုင်းများ <xliff:g id="ID_1">%1$d</xliff:g> ကို ရွှေ့"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> က <xliff:g id="SUBJECT">%3$s</xliff:g>၊ <xliff:g id="SNIPPET">%4$s</xliff:g> အကြောင်း <xliff:g id="DATE">%5$s</xliff:g>၊ <xliff:g id="READSTATE">%6$s</xliff:g> မှာ"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> က <xliff:g id="SUBJECT">%3$s</xliff:g>၊ <xliff:g id="SNIPPET">%4$s</xliff:g> အကြောင်း<xliff:g id="TIME">%5$s</xliff:g>၊ <xliff:g id="READSTATE">%6$s</xliff:g> မှာ"</string>
     <string name="read_string" msgid="5495929677508576520">"စကားဝိုင်းကို ဖတ်ပြီး"</string>
@@ -221,15 +223,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;သေးစိတ် ကြည့်&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"အသေးစိတ်များ ဝှက်ထားရန်"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> ထံသို့"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> အတွက် ဆက်သွယ်ရေး အချက်အလက်ကို ပြပါ။"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"ဆက်သွယ်ရေး အချက်အလက်ကို ပြရန်"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"စာ အဟောင်း <xliff:g id="COUNT">%1$d</xliff:g> ခု"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"ပိုဟောင်းသော စာ <xliff:g id="COUNT">%1$d</xliff:g>ခုကို တင်ပေးနေ"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"မှ:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"သို့ ဖြေကြားရန်:"</string>
     <string name="to_heading" msgid="3495203282540398336">"သို့: "</string>
@@ -287,10 +285,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ဖိုလ်ဒါကို အီးမေးလ် လုပ်ရန်"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"ဖိုလ်ဒါများ ပြောင်းရန်"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"သို့ ရွှေ့ရန်"</string>
-    <string name="search_hint" msgid="7060626585689391003">"ရှာဖွေရန်"</string>
+    <string name="search_hint" msgid="4916671414132334289">"စာကို ရှာရန်"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"ဒီကိရိယာ ထဲတွင် အသံဖြင့် ရှာဖွေမှုကို ပံ့ပိုးမထားပါ။"</string>
     <string name="network_error" msgid="5931164247644972255">"ချိတ်ဆက်မှု မရှိ"</string>
     <string name="retry" msgid="916102442074217293">"ထပ်စမ်းရန်"</string>
     <string name="load_more" msgid="8702691358453560575">"ထပ် တင်ရန်"</string>
@@ -357,19 +354,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"အသံတိတ်ရန်"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"ပုံသေ လုပ်ဆောင်ချက်"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"လုပ်ဆောင်ချက်များကို မော်ကွန်းတင်ရန် &amp;amp ဖျက်ရန်"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"မော်ကွန်းတင်ရန်"</item>
-    <item msgid="2567465476369142505">"ဖျက်ပစ်ရန်"</item>
+    <item msgid="954772302016538814">"မော်ကွန်းကိုသာ ပြရန်"</item>
+    <item msgid="7212690302706180254">"ဖျက်ရန်ကိုသာ ပြရန်"</item>
+    <item msgid="2539051197590685708">"မော်ကွန်းတင်မလား &amp;amp ဖျက်မလား"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"မော်ကွန်းတင်ရန်"</item>
-    <item msgid="6088164268501960435">"ဖျက်ပစ်ရန်"</item>
+    <item msgid="6877416142040695022">"မော်ကွန်းကိုသာ ပြရန်"</item>
+    <item msgid="1510017057984222376">"ဖျက်ရန်ကိုသာ ပြရန်"</item>
+    <item msgid="3196207224108008441">"မော်ကွန်းတင်ရန် &amp;amp ဖျက်ရန်"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"ပုံသေ လုပ်ဆောင်ချက်"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"မော်ကွန်းတင်ရန် &amp;amp ဖျက်ရန် လုပ်ဆောင်ချက်များ"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"အားလုံးကို ဖြေကြားရန်"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"စာ ဖြေကြားမှုများ အတွက် ပုံသေ အဖြစ် အသုံးပြုရန်"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"ပွတ်ဆွဲ လုပ်ဆောင်ချက်များ"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"မော်ကွန်းတင်ရန် ပွတ်ဆွဲပါ"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"ဖျက်ရန် ပွတ်ဆွဲပါ"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"စကားဝိုင်း စာရင်း ထဲမှာ"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"ပို့သူ ပုံ"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"စကားဝိုင်း စာရင်း ထဲမှာ အမည်၏ ဘေးမှာ ပြရန်"</string>
@@ -388,15 +388,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"ဖိုလ်ဒါ အိုင်ကွန်"</string>
     <string name="add_account" msgid="5905863370226612377">"အကောင့် ထည့်ဂရန်"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"အကြံပေးမှုကို ပယ်ရန်"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"အကောင့် စင့်က်ကို ပိတ်ထားသည်။ ဖွင့်ရန် ထိလိုက်ပါ။"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"အကောင့် စင့်က် ပိတ်ထားသည်။ &lt;a href=\'http://www.example.com\'&gt;Account settings.&lt;/a&gt; ထဲမှာ ဖွင့်ပေးပါ"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> တွင် <xliff:g id="NUMBER">%1$s</xliff:g> ကို မပို့ရသေး"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"အော်တို-စင့်က်ကို ဖွင့်ရမလား?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Gmail သာမက၊ appများ နှင့် အကောင့်များ အားလုံးထဲ သင်ပြုလုပ်ခဲ့သော အပြောင်းအလဲများကို ၀က်ဘ်၊ သင်၏ ကိရိယာများ နှင့် သင်၏<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> အကြားမှာ စင့်က်လုပ်ပေးမည်။"</string>
     <string name="phone" msgid="4142617042507912053">"ဖုန်း"</string>
     <string name="tablet" msgid="4593581125469224791">"တက်ဘလက်"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"ဖွင့်ရန်"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"ဖိုလ်ဒါ <xliff:g id="NUMBER">%1$s</xliff:g> ကို ပြရန်"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"နောက်ထပ် ဖိုလ်ဒါ <xliff:g id="NUMBER">%1$s</xliff:g> ခုကို ပြရန်"</string>
     <string name="hide_folders" msgid="7618891933409521283">"ဖိုလ်ဒါများကို ဝှက်ထားရန်"</string>
     <string name="print" msgid="7987949243936577207">"ပရင့် ထုတ်ယူရန်"</string>
     <string name="print_all" msgid="4011022762279519941">"အားလုံးကို ပရင့်ထုတ်ရန်"</string>
@@ -478,5 +476,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"အကောင့်များကို စီမံခန့်ခွဲရန်"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"အထွေထွေ ဆက်တင်များ"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"ဆက်တင်များ"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"နောက်ထပ် ရွေးစရာများ"</string>
 </resources>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4c24e10..908e228 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Lagre utkast"</string>
     <string name="discard" msgid="4905982179911608430">"Forkast"</string>
     <string name="compose" msgid="2602861958391035523">"Skriv e-post"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Skriv ny"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Svar"</item>
     <item msgid="2767793214788399009">"Svar alle"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Én eller flere av filene ble ikke vedlagt. Grensen er på <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Filen ble ikke vedlagt. Du har nådd maksgrensen på <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Kunne ikke legge ved fil."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Vedlegget ble ikke tillatt."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Legg til minst én mottaker."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Mottakerfeil"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Vil du sende e-posten?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Send tilbakemelding"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Flytt samtale"</item>
+    <item quantity="other" msgid="6639576653114141743">"Flytt <xliff:g id="ID_1">%1$d</xliff:g> samtaler"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> angående <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> den <xliff:g id="DATE">%5$s</xliff:g> – <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> angående <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kl. <xliff:g id="TIME">%5$s</xliff:g> – <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"samtalen er lest"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Se detaljer&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skjul detaljer"</string>
     <string name="to_message_header" msgid="3954385178027011919">"til <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"blindkopi: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Vis kontaktinformasjon for <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Vis kontaktinformasjon"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> eldre e-poster"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Laster inn <xliff:g id="COUNT">%1$d</xliff:g> eldre e-poster"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Fra:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Svar til:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Til: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"E-postmappe"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Bytt mappe"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Flytt til"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Søk"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Søk i e-post"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Talesøk støttes ikke på denne enheten."</string>
     <string name="network_error" msgid="5931164247644972255">"Ingen nettilkobling"</string>
     <string name="retry" msgid="916102442074217293">"Prøv igjen"</string>
     <string name="load_more" msgid="8702691358453560575">"Last inn flere"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Stille"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Standardhandling"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Handlinger for arkivering og sletting"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arkivér"</item>
-    <item msgid="2567465476369142505">"Slett"</item>
+    <item msgid="954772302016538814">"Vis bare Arkivér"</item>
+    <item msgid="7212690302706180254">"Vis bare Slett"</item>
+    <item msgid="2539051197590685708">"Vis Arkivér og Slett"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arkivér"</item>
-    <item msgid="6088164268501960435">"Slett"</item>
+    <item msgid="6877416142040695022">"Vis bare Arkivér"</item>
+    <item msgid="1510017057984222376">"Vis bare Slett"</item>
+    <item msgid="3196207224108008441">"Vis Arkivér og Slett"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Standardhandling"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Handlinger for arkivering og sletting"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Svar alle"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Bruk som standard for e-postvarsler"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Sveipehandlinger"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Sveip for å arkivere"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Sveip for å slette"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"I samtalelisten"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Avsenderbilde"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Vis ved siden av navnet i samtalelisten"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Mappeikon"</string>
     <string name="add_account" msgid="5905863370226612377">"Legg til konto"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Avslå tips"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Den automatiske synkroniseringen er slått av. Trykk hvis du vil slå den på."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Kontosynkroniseringen er slått av. Du kan slå den på i &lt;a href=\'http://www.example.com\'&gt;Kontoinnstillinger.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> usendte i <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Vil du aktivere automatisk synkronisering?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Endringer du gjør i apper og kontoer, ikke bare i Gmail, blir synkronisert mellom nettet, de andre enhetene dine og <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefonen"</string>
     <string name="tablet" msgid="4593581125469224791">"nettbrettet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Slå på"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Vis <xliff:g id="NUMBER">%1$s</xliff:g> mapper"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Vis <xliff:g id="NUMBER">%1$s</xliff:g> mapper til"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Skjul mapper"</string>
     <string name="print" msgid="7987949243936577207">"Skriv ut"</string>
     <string name="print_all" msgid="4011022762279519941">"Skriv ut alle"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Administrer kontoer"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Generelle innstillinger"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Innstillinger"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Flere alternativer"</string>
 </resources>

diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 18a27fc..7bbe5ba 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"ड्राफ्ट बचत गर्नुहोस्"</string>
     <string name="discard" msgid="4905982179911608430">"बेवास्ता गर्नुहोस्"</string>
     <string name="compose" msgid="2602861958391035523">"रचना गर्नुहोस्"</string>
-    <string name="compose_title" msgid="5673376086133995913">"रचना गर्नुहोस्"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"जवाफ पठाउनुहोस्"</item>
     <item msgid="2767793214788399009">"सबैलाई जवाफ दिनुहोस्"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"एक वा बढी फाइलहरुलाई एट्याच गरिएको छैन। <xliff:g id="MAXSIZE">%1$s</xliff:g> सीमित गर्नुहोस्।"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"फाईल संलग्न भएको छैन। <xliff:g id="MAXSIZE">%1$s</xliff:g> सीमा पुग्यो।"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"फाइल संलग्न गर्न सकेन।"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"संलग्नकको लागि अनुमति अस्वीकृत।"</string>
     <string name="recipient_needed" msgid="319816879398937214">"कम्तिमा पनि एउटा प्राप्तकर्ता थप्नुहोस्।"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"प्राप्तकर्ता त्रुटि"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"सन्देश पठाउनुहुन्छ?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"प्रतिक्रिया पठाउनुहोस्"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"कुराकानी सार्नुहोस्"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> कुराकानीहरू सार्नुहोस्"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g> बारेमा <xliff:g id="SUBJECT">%3$s</xliff:g> , <xliff:g id="SNIPPET">%4$s</xliff:g> यस <xliff:g id="DATE">%5$s</xliff:g> , <xliff:g id="READSTATE">%6$s</xliff:g>मा"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g> बारेमा <xliff:g id="SUBJECT">%3$s</xliff:g> , <xliff:g id="SNIPPET">%4$s</xliff:g> यस<xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>मा"</string>
     <string name="read_string" msgid="5495929677508576520">"कुराकानी पढाई"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;विवरणहरू हेर्नुहोस्&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"विवरण लुकाउनुहोस्"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> लाई"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g>को लागि सम्पर्क जानकारी देखाउनुहोस्"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"सम्पर्क जानकारी देखाउनुहोस्"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> पुरानो सन्देश"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> पुराना सन्देशहरू लोड गरिँदै"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"प्रेषक:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"यसमा जवाफ पठाउनुहोस्:"</string>
     <string name="to_heading" msgid="3495203282540398336">"प्रापक: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"इमेल फोल्डर"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"फोल्डरहरु परिवर्तन गर्नुहोस्"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"मा सार्नुहोस्"</string>
-    <string name="search_hint" msgid="7060626585689391003">"खोजी गर्नुहोस्"</string>
+    <string name="search_hint" msgid="4916671414132334289">"मेल खोज्नुहोस्"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"यस उपकरणमा आवाज खोजी समर्थित छैन।"</string>
     <string name="network_error" msgid="5931164247644972255">"जडान छैन"</string>
     <string name="retry" msgid="916102442074217293">"पुन:प्रयास गर्नुहोला।"</string>
     <string name="load_more" msgid="8702691358453560575">"अधिक लोड गर्नुहोस्"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"मौन"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"पूर्वनिर्धारित कार्य"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"अभिलेख र कार्य मेट्नुहोस्"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"अभिलेख"</item>
-    <item msgid="2567465476369142505">"मेटाउनुहोस्"</item>
+    <item msgid="954772302016538814">"केवल संग्रह देखाउनुहोस्"</item>
+    <item msgid="7212690302706180254">"मेट्ने मात्र देखाउनुहोस्"</item>
+    <item msgid="2539051197590685708">"अभिलेख देखाउँनुहोस्&amp; मेट्नुहोस्"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"अभिलेख"</item>
-    <item msgid="6088164268501960435">"मेटाउनुहोस्"</item>
+    <item msgid="6877416142040695022">"केवल संग्रह देखाउनुहोस्"</item>
+    <item msgid="1510017057984222376">"मेट्ने मात्र देखाउनुहोस्"</item>
+    <item msgid="3196207224108008441">"अभिलेख देखाउँनुहोस्&amp; मेट्नुहोस्"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"पूर्वनिर्धारित कार्य"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"अभिलेख र कार्य मेट्नुहोस्"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"सबैलाई जवाफ दिनुहोस्"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"सन्देश जवाफहरूको लागि पूर्वनिर्धारितको रूपमा प्रयोग गर्नुहोस्"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"कार्यहरू स्वाइप गर्नुहोस्"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"सङ्ग्रह गर्न स्वाइप गर्नुहोस्"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"मेट्नको लागि स्वाइप गर्नुहोस्"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"वार्तालाप सूचीमा"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"प्रेषक चित्र"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"कुराकानी सूचीमा पछाडिको नाम देखाउनुहोस्"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"फोल्डर आइकन"</string>
     <string name="add_account" msgid="5905863370226612377">"खाता थप्नुहोस्"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"टिप खारेज गर्नुहोस्"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"स्वचालित सिङ्क बन्द छ। खोल्नको लागि छुनुहोस्।"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"खाता सिङ्क बन्द छ। यसलाई &lt;a href=\'http://www.example.com\'&gt;Account settings.&lt;/a&gt; मा सक्षम पार्नुहोस्"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>मा नपठाइएको <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"स्वचालित सिङ्क सक्रिय पार्ने हो?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Gmail मा मात्र नभई, समपूर्ण अनुप्रयोग र खाताहरूमा तपाईँले गर्नुहुने वेब, तपाईँका अन्य उपकरणहरू र <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> मा सिङ्ख्रोनाइज हुनेछ।"</string>
     <string name="phone" msgid="4142617042507912053">"फोन"</string>
     <string name="tablet" msgid="4593581125469224791">"ट्याबलेट"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"सक्रिय पार्नुहोस्"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> फोल्डरहरू देखाउनुहोस्"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"<xliff:g id="NUMBER">%1$s</xliff:g> थप फोल्डर देखाउनुहोस्"</string>
     <string name="hide_folders" msgid="7618891933409521283">"फोल्डरहरु लुकाउनुहोस्"</string>
     <string name="print" msgid="7987949243936577207">"प्रिन्ट गर्नुहोस्"</string>
     <string name="print_all" msgid="4011022762279519941">"सबै मुद्रण गरिएको छ"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"खाताहरू व्यवस्थापन गर्नुहोस्"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"साधारण सेटिङहरू"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"सेटिङ्स"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"अरु विकल्पहरु"</string>
 </resources>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 74bafe0..c52f294 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Concept opslaan"</string>
     <string name="discard" msgid="4905982179911608430">"Weggooien"</string>
     <string name="compose" msgid="2602861958391035523">"Opstellen"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Opstellen"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Beantwoorden"</item>
     <item msgid="2767793214788399009">"Allen beantwoorden"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Een of meer bestanden niet bijgevoegd. Limiet van <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Bestand niet bijgevoegd. Limiet van <xliff:g id="MAXSIZE">%1$s</xliff:g> bereikt."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Kan bestand niet bijvoegen."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Toestemming geweigerd voor de bijlage."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Voeg ten minste één ontvanger toe."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Fout met ontvanger"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Bericht verzenden?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Feedback verzenden"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Conversatie verplaatsen"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> conversaties verplaatsen"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> over <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> op <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> over <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> om <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversatie gelezen"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Details bekijken&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Details verbergen"</string>
     <string name="to_message_header" msgid="3954385178027011919">"aan <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Contactgegevens weergeven voor <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Contactgegevens weergeven"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> oudere berichten"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> oudere berichten laden"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Van:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Antwoord:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Aan: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"E-mailmap"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Mappen wijzigen"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Verplaatsen naar"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Zoeken"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Berichten doorzoeken"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Gesproken zoekopdrachten worden niet ondersteund op dit apparaat."</string>
     <string name="network_error" msgid="5931164247644972255">"Geen verbinding"</string>
     <string name="retry" msgid="916102442074217293">"Opnieuw proberen"</string>
     <string name="load_more" msgid="8702691358453560575">"Meer laden"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Stil"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Standaardactie"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Acties voor archiveren of verwijderen"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archiveren"</item>
-    <item msgid="2567465476369142505">"Verwijderen"</item>
+    <item msgid="954772302016538814">"Alleen archief weergeven"</item>
+    <item msgid="7212690302706180254">"Alleen verwijderen weergeven"</item>
+    <item msgid="2539051197590685708">"Archief en verwijderen weergeven"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archiveren"</item>
-    <item msgid="6088164268501960435">"Verwijderen"</item>
+    <item msgid="6877416142040695022">"Alleen archief weergeven"</item>
+    <item msgid="1510017057984222376">"Alleen verwijderen weergeven"</item>
+    <item msgid="3196207224108008441">"Archief en verwijderen weergeven"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Standaardactie"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Acties voor archiveren of verwijderen"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Allen beantwoorden"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Gebruiken als standaard voor beantwoorden"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Veegacties"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Vegen om te archiveren"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Vegen om te verwijderen"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"In conversatielijst"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Afbeelding van afzender"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Weergeven naast naam in gesprekslijst"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Mappictogram"</string>
     <string name="add_account" msgid="5905863370226612377">"Account toevoegen"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Tip negeren"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automatisch synchroniseren is uitgeschakeld. Tik om dit in te schakelen."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Accountsynchronisatie is uitgeschaked. Schakel dit in bij &lt;a href=\'http://www.example.com\'&gt;Accountinstellingen.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> niet verzonden in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Automatisch synchroniseren inschakelen?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Wijzigingen die u aanbrengt in alle apps en accounts, niet alleen in Gmail, worden gesynchroniseerd tussen internet, uw andere apparaten en uw <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefoon"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Inschakelen"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> mappen weergeven"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Nog <xliff:g id="NUMBER">%1$s</xliff:g> andere mappen weergeven"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Mappen verbergen"</string>
     <string name="print" msgid="7987949243936577207">"Afdrukken"</string>
     <string name="print_all" msgid="4011022762279519941">"Alles afdrukken"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Accounts beheren"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Algemene instellingen"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Instellingen"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Meer opties"</string>
 </resources>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 73b53f9..c72f824 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Zapisz wersję roboczą"</string>
     <string name="discard" msgid="4905982179911608430">"Odrzuć"</string>
     <string name="compose" msgid="2602861958391035523">"Utwórz"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Utwórz"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Odpowiedz"</item>
     <item msgid="2767793214788399009">"Odpowiedz wszystkim"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Co najmniej jeden plik nie został dołączony. Limit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Plik nie został dołączony. Osiągnięto limit <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Nie można załączyć pliku."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Nie zezwolono na załączenie tego pliku."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Dodaj co najmniej jednego odbiorcę."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Błąd odbiorcy"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Wysłać wiadomość?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Prześlij opinię"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Przenieś wątek"</item>
+    <item quantity="other" msgid="6639576653114141743">"Przenieś <xliff:g id="ID_1">%1$d</xliff:g> wątki(ów)"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> na temat <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> w dniu <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> na temat <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> o <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"wątek został przeczytany"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Wyświetl szczegóły&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ukryj szczegóły"</string>
     <string name="to_message_header" msgid="3954385178027011919">"do <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"UDW: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Pokaż informacje kontaktowe: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Pokaż informacje kontaktowe"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Starsze wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Ładowanie <xliff:g id="COUNT">%1$d</xliff:g> starszych wiadomości"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Od:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Odp. do:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Do: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Folder Poczta"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Zmień foldery"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Przenieś do"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Szukaj"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Przeszukaj pocztę"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"To urządzenie nie obsługuje wyszukiwania głosowego."</string>
     <string name="network_error" msgid="5931164247644972255">"Brak połączenia"</string>
     <string name="retry" msgid="916102442074217293">"Ponów próbę"</string>
     <string name="load_more" msgid="8702691358453560575">"Wczytaj więcej"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Cichy"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Domyślne działanie"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Czynności archiwizuj i usuń"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archiwizuj"</item>
-    <item msgid="2567465476369142505">"Usuń"</item>
+    <item msgid="954772302016538814">"Pokaż tylko archiwizuj"</item>
+    <item msgid="7212690302706180254">"Pokaż tylko usuń"</item>
+    <item msgid="2539051197590685708">"Pokaż archiwizuj i usuń"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archiwizuj"</item>
-    <item msgid="6088164268501960435">"Usuń"</item>
+    <item msgid="6877416142040695022">"Pokaż tylko archiwizuj"</item>
+    <item msgid="1510017057984222376">"Pokaż tylko usuń"</item>
+    <item msgid="3196207224108008441">"Pokaż archiwizuj i usuń"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Domyślne działanie"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Czynności archiwizuj i usuń"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Odpowiedz wszystkim"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Używaj domyślnie do odpowiadania na wiadomości"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Działania przesuwania"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Po przesunięciu palcem archiwizuj"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Po przesunięciu palcem usuwaj"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Na liście wątków"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Zdjęcie nadawcy"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Pokaż obok imienia i nazwiska na liście wątków"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ikona folderu"</string>
     <string name="add_account" msgid="5905863370226612377">"Dodaj konto"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Zamknij wskazówkę"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automatyczna synchronizacja jest wyłączona. Kliknij, by ją włączyć."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Synchronizacja konta jest wyłączona. Włącz ją w &lt;a href=\'http://www.example.com\'&gt;ustawieniach konta&lt;/a&gt;."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Niewysłane wiadomości w folderze <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Włączyć autosynchronizację?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Synchronizacja zmian wprowadzonych przez Ciebie nie tylko w Gmailu, ale we wszystkich aplikacjach i na wszystkich kontach, obejmie internet, Twoje pozostałe urządzenia i Twój <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Włącz"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Pokaż foldery: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Pokaż więcej folderów (<xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ukryj foldery"</string>
     <string name="print" msgid="7987949243936577207">"Drukuj"</string>
     <string name="print_all" msgid="4011022762279519941">"Drukuj wszystko"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Zarządzaj kontami"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Ustawienia ogólne"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Ustawienia"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Więcej opcji"</string>
 </resources>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5adf8a6..274d7cf 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Guardar rascunho"</string>
     <string name="discard" msgid="4905982179911608430">"Descartar"</string>
     <string name="compose" msgid="2602861958391035523">"Compor"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Compor"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Responder"</item>
     <item msgid="2767793214788399009">"Responder a todos"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Um ou mais ficheiros não anexados. Limite de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Ficheiro não anexado. Limite de <xliff:g id="MAXSIZE">%1$s</xliff:g> atingido."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Não foi possível anexar o ficheiro."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Autorização negada para o anexo."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Adicione, pelo menos, um destinatário."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erro do destinatário"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Enviar mensagem?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar comentários"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Mover conversa"</item>
+    <item quantity="other" msgid="6639576653114141743">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversas"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> a <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> às <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversa lida"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ver detalhes&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalhes"</string>
     <string name="to_message_header" msgid="3954385178027011919">"para <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Mostrar informações de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Mostrar informações de contacto"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"A carregar <xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"De:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Responder a:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Pasta de emails"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Alterar pastas"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Mover para"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Pesquisar"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Pesquisar correio"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"A pesquisa por voz não é suportada neste dispositivo."</string>
     <string name="network_error" msgid="5931164247644972255">"Sem ligação"</string>
     <string name="retry" msgid="916102442074217293">"Tentar novamente"</string>
     <string name="load_more" msgid="8702691358453560575">"Carregar mais"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silencioso"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Ação predefinida"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Arquivar e eliminar ações"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arquivar"</item>
-    <item msgid="2567465476369142505">"Eliminar"</item>
+    <item msgid="954772302016538814">"Mostrar apenas arquivar"</item>
+    <item msgid="7212690302706180254">"Mostrar apenas eliminar"</item>
+    <item msgid="2539051197590685708">"Mostrar arquivar e eliminar"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arquivar"</item>
-    <item msgid="6088164268501960435">"Eliminar"</item>
+    <item msgid="6877416142040695022">"Mostrar apenas arquivar"</item>
+    <item msgid="1510017057984222376">"Mostrar apenas eliminar"</item>
+    <item msgid="3196207224108008441">"Mostrar arquivar e eliminar"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Ação predefinida"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Arquivar e eliminar ações"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Utilizar como predefinição para respostas a mensagens"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Ações de deslize rápido com o dedo"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Deslize rapidamente para arquivar"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Deslize rapidamente para eliminar"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Na lista de conversas"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Imagem do remetente"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Mostrar junto ao nome na lista de conversas"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ícone de pasta"</string>
     <string name="add_account" msgid="5905863370226612377">"Adicionar conta"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Ignorar sugestão"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"A sincronização automática está desativada. Toque para ativar."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"A sincronização de conta está desativada. Ative-a em &lt;a href=\'http://www.example.com\'&gt;Definições da conta.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> não enviada(s) na <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Ativar a sincronização automática?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"As alterações efetuadas a todas as aplicações e contas, e não apenas ao Gmail, serão sincronizadas entre a Web, os seus outros dispositivos e o <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telemóvel"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Ativar"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Mostrar <xliff:g id="NUMBER">%1$s</xliff:g> pastas"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Mostrar mais <xliff:g id="NUMBER">%1$s</xliff:g> pastas"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ocultar pastas"</string>
     <string name="print" msgid="7987949243936577207">"Imprimir"</string>
     <string name="print_all" msgid="4011022762279519941">"Imprimir tudo"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Gerir contas"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Definições gerais"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Definições"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Mais opções"</string>
 </resources>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 87262a2..13b3df4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Salvar rascunho"</string>
     <string name="discard" msgid="4905982179911608430">"Descartar"</string>
     <string name="compose" msgid="2602861958391035523">"Escrever"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Escrever"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Responder"</item>
     <item msgid="2767793214788399009">"Resp. a todos"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Um ou mais arquivos não foram anexados. Limite de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Arquivo não anexado. O limite de <xliff:g id="MAXSIZE">%1$s</xliff:g> foi atingido."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Não foi possível anexar o arquivo."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Permissão negada para o anexo."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Adicione pelo menos um destinatário."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erro de destinatário"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Enviar mensagem?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar comentários"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Mover conversa"</item>
+    <item quantity="other" msgid="6639576653114141743">"Mover <xliff:g id="ID_1">%1$d</xliff:g> conversas"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> em <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> às <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversa lida"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ver detalhes&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ocultar detalhes"</string>
     <string name="to_message_header" msgid="3954385178027011919">"para <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Cco: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Mostrar informações de contato de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Mostrar informações de contato"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Carregando <xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"De:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Res. para:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Pasta \"E-mail\""</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Alterar pastas"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Mover para"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Pesquisar"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Pesquisar e-mail"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Este dispositivo não é compatível com a pesquisa por voz."</string>
     <string name="network_error" msgid="5931164247644972255">"Sem conexão"</string>
     <string name="retry" msgid="916102442074217293">"Tentar novamente"</string>
     <string name="load_more" msgid="8702691358453560575">"Carregar mais"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silencioso"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Ação padrão"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Ações de arquivar e excluir"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arquivar"</item>
-    <item msgid="2567465476369142505">"Excluir"</item>
+    <item msgid="954772302016538814">"Mostrar somente arquivar"</item>
+    <item msgid="7212690302706180254">"Mostrar somente excluir"</item>
+    <item msgid="2539051197590685708">"Mostrar arquivar e excluir"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arquivar"</item>
-    <item msgid="6088164268501960435">"Excluir"</item>
+    <item msgid="6877416142040695022">"Mostrar somente arquivar"</item>
+    <item msgid="1510017057984222376">"Mostrar somente excluir"</item>
+    <item msgid="3196207224108008441">"Mostrar arquivar e excluir"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Ação padrão"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Ações de arquivar e excluir"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Usar como padrão para respostas de mensagens"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Limpar ações"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Deslizar para arquivar"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Deslizar para excluir"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Na lista de conversas"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Imagem do remetente"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Mostrar caixa de seleção ao lado do nome na lista de conversas"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ícone de pasta"</string>
     <string name="add_account" msgid="5905863370226612377">"Adicionar conta"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Dispensar dica"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"A sincronização automática está desativada. Toque para ativar."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"A sincronização da conta está desativada. Ative nas &lt;a href=\'http://www.example.com\'&gt;Configurações da conta.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> não enviadas em <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Ativar sincronização automática?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"As alterações em todos os aplicativos e contas, e não apenas o Gmail, serão sincronizadas entre a Web, seus outros dispositivos e seu <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefone"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Ativar"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Mostrar <xliff:g id="NUMBER">%1$s</xliff:g> pastas"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Mostrar mais <xliff:g id="NUMBER">%1$s</xliff:g> pastas"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ocultar pastas"</string>
     <string name="print" msgid="7987949243936577207">"Imprimir"</string>
     <string name="print_all" msgid="4011022762279519941">"Imprimir tudo"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Gerenciar contas"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Configurações gerais"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Configurações"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Mais opções"</string>
 </resources>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 53bcf51..c3d8877 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Salvaţi mesajul nefinal."</string>
     <string name="discard" msgid="4905982179911608430">"Renunţaţi"</string>
     <string name="compose" msgid="2602861958391035523">"Scrieţi"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Scrieți"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Răspundeţi"</item>
     <item msgid="2767793214788399009">"Răsp. tuturor"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Unul sau mai multe fişiere nu au fost ataşate. Limita maximă este de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Fişierul nu a fost ataşat. A fost atinsă limita maximă de <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Nu s-a putut ataşa fişierul."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"S-a refuzat accesul la atașament."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Adăugaţi cel puţin un destinatar."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Eroare destinatar"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Trimiteţi mesajul?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Trimiteţi feedback"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Mutaţi conversaţia"</item>
+    <item quantity="other" msgid="6639576653114141743">"Mutaţi <xliff:g id="ID_1">%1$d</xliff:g> (de) conversaţii"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> despre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pe data de <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> despre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> la <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"conversație citită"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Vedeți detalii&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ascundeți detaliile"</string>
     <string name="to_message_header" msgid="3954385178027011919">"către <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Afişaţi informaţiile de contact pentru <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Afişaţi informaţiile de contact"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje mai vechi"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Se încarcă <xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje mai vechi"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"De la:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Răsp. la:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Către: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Dosar de e-mail"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Schimbați dosarele"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Mutați în"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Căutați"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Căutaţi în e-mailuri"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Căutarea vocală nu este disponibilă pe acest dispozitiv."</string>
     <string name="network_error" msgid="5931164247644972255">"Nicio conexiune"</string>
     <string name="retry" msgid="916102442074217293">"Reîncercaţi"</string>
     <string name="load_more" msgid="8702691358453560575">"Încărcaţi mai multe"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Silențios"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Acțiune prestabilită"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Arhivați și Ștergeți"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arhivați"</item>
-    <item msgid="2567465476369142505">"Ștergeți"</item>
+    <item msgid="954772302016538814">"Afișați numai opțiunea Arhivați"</item>
+    <item msgid="7212690302706180254">"Afișați numai opțiunea Ștergeți"</item>
+    <item msgid="2539051197590685708">"Afișați opțiunile Arhivați și Ștergeți"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arhivați"</item>
-    <item msgid="6088164268501960435">"Ștergeți"</item>
+    <item msgid="6877416142040695022">"Afișați numai opțiunea Arhivați"</item>
+    <item msgid="1510017057984222376">"Afișați numai opțiunea Ștergeți"</item>
+    <item msgid="3196207224108008441">"Afișați opțiunile Arhivați și Ștergeți"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Acțiune prestabilită"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Arhivați și Ștergeți"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Răspundeți tuturor"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Utilizați ca setare prestabilită pentru răspunsurile la mesaje"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Glisați acțiunile"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Glisați pentru a arhiva"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Glisați pentru a șterge"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"În lista de conversații"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Imaginea expeditorului"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Afișați lângă nume în lista de conversații"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Pictogramă dosar"</string>
     <string name="add_account" msgid="5905863370226612377">"Adăugați un cont"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Ignorați sugestia"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Sincronizarea automată este dezactivată. Atingeți pentru a o activa."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Sincronizarea contului este dezactivată. Activați-o în &lt;a href=\'http://www.example.com\'&gt;Setările pentru cont.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> netrimise în <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Activați sincronizarea automată?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Modificările pe care le efectuați în toate aplicațiile și conturile, nu doar în Gmail, vor fi sincronizate între web, alte dispozitive ale dvs. și <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"tabletă"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Activați"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Afișați <xliff:g id="NUMBER">%1$s</xliff:g> (de) dosare"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Afișați încă <xliff:g id="NUMBER">%1$s</xliff:g> (de) dosare"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ascundeți dosarele"</string>
     <string name="print" msgid="7987949243936577207">"Printați"</string>
     <string name="print_all" msgid="4011022762279519941">"Printați tot"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Gestionaţi conturile"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Setările generale"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Setări"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Mai multe opțiuni"</string>
 </resources>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 679804a..1473bf8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Сохранить черновик"</string>
     <string name="discard" msgid="4905982179911608430">"Удалить"</string>
     <string name="compose" msgid="2602861958391035523">"Написать"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Написать"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Ответить"</item>
     <item msgid="2767793214788399009">"Ответить всем"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Не удалось прикрепить файлы: превышен лимит (<xliff:g id="MAXSIZE">%1$s</xliff:g>)."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Не удалось прикрепить файл: превышен лимит (<xliff:g id="MAXSIZE">%1$s</xliff:g>)."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Не удалось прикрепить файл."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"У вас нет прав на прикрепление этого файла"</string>
     <string name="recipient_needed" msgid="319816879398937214">"Укажите получателя."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Ошибка"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Отправить сообщение?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Отправить отзыв"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Переместить цепочку"</item>
+    <item quantity="other" msgid="6639576653114141743">"Переместить цепочки (<xliff:g id="ID_1">%1$d</xliff:g>)"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g>: <xliff:g id="PARTICIPANT">%2$s</xliff:g>. Тема: <xliff:g id="SUBJECT">%3$s</xliff:g>. Фрагмент: <xliff:g id="SNIPPET">%4$s</xliff:g>. <xliff:g id="READSTATE">%6$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>."</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g>: <xliff:g id="PARTICIPANT">%2$s</xliff:g>. Тема: <xliff:g id="SUBJECT">%3$s</xliff:g>. Фрагмент: <xliff:g id="SNIPPET">%4$s</xliff:g>. <xliff:g id="READSTATE">%6$s</xliff:g> в <xliff:g id="TIME">%5$s</xliff:g>."</string>
     <string name="read_string" msgid="5495929677508576520">"прочитано"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Подробности&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Скрыть"</string>
     <string name="to_message_header" msgid="3954385178027011919">"кому: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"скрытая: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Показать контактные данные пользователя <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Показать контактные данные"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Старых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Загрузка более старых сообщений (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"От:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Ответить:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Кому: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Папка Почты"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Изменение папок"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Перемещение"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Искать"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Поиск в почте"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"На этом устройстве голосовой поиск не поддерживается."</string>
     <string name="network_error" msgid="5931164247644972255">"Нет подключения"</string>
     <string name="retry" msgid="916102442074217293">"Повтор"</string>
     <string name="load_more" msgid="8702691358453560575">"Загрузить еще"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Без звука"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Действие по умолчанию"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Архивация или удаление"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Архивировать"</item>
-    <item msgid="2567465476369142505">"Удалять"</item>
+    <item msgid="954772302016538814">"Только архивировать"</item>
+    <item msgid="7212690302706180254">"Только удалять"</item>
+    <item msgid="2539051197590685708">"Архивировать или удалять"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Архивировать"</item>
-    <item msgid="6088164268501960435">"Удалять"</item>
+    <item msgid="6877416142040695022">"Только архивировать"</item>
+    <item msgid="1510017057984222376">"Только удалять"</item>
+    <item msgid="3196207224108008441">"Архивировать или удалять"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Действие по умолчанию"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Я предпочитаю:"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Отвечать всем"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Использовать по умолчанию для всех ответов"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"При пролистывании"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Быстрая архивация"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Быстрое удаление"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"В списке цепочек"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Фотографии отправителей"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Показывать рядом с именами в списке цепочек"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Значок папки"</string>
     <string name="add_account" msgid="5905863370226612377">"Добавить аккаунт"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Закрыть подсказку"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Автосинхронизация отключена. Нажмите, чтобы включить."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Синхронизация отключена. Ее можно включить в &lt;a href=\'http://www.example.com\'&gt;настройках аккаунта&lt;/a&gt;."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Неотправленных сообщений в папке \"<xliff:g id="OUTBOX">%2$s</xliff:g>\": <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Включить автосинхронизацию?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Изменения, которые вы вносите во все приложения и аккаунты (не только Gmail), будут синхронизироваться между Интернетом, другими вашими устройствами и вашим <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"телефоном"</string>
     <string name="tablet" msgid="4593581125469224791">"планшетным ПК"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Включить"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Показать папки (<xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Показать ещё папки (<xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Скрыть папки"</string>
     <string name="print" msgid="7987949243936577207">"Печать"</string>
     <string name="print_all" msgid="4011022762279519941">"Печатать все"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Управление аккаунтами"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Общие настройки"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Настройки"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Дополнительно"</string>
 </resources>

diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 877ed5b..bd33704 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"ක‍ටු සටහන සුරකින්න"</string>
     <string name="discard" msgid="4905982179911608430">"ඉවත ලන්න"</string>
     <string name="compose" msgid="2602861958391035523">"සකසනය"</string>
-    <string name="compose_title" msgid="5673376086133995913">"සකසනය"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"පිළිතුරු දෙන්න"</item>
     <item msgid="2767793214788399009">"සියල්ලන්ටම පිළිතුරු යවන්න"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ගොනුවක් හෝ කිහිපයක් අමුණ නැත. සිමාව <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ගොනුව ඇමිණී නැත. <xliff:g id="MAXSIZE">%1$s</xliff:g> සීමාවට ළඟා විණි."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ගොනුව ඇමිණිමට නොහැකි විය."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"ඇමිණුම සඳහා අවසරය ප්‍රතික්ෂේප කරන ලදි."</string>
     <string name="recipient_needed" msgid="319816879398937214">"අඩු තරමේ එක් ලබන්නෙක් එක් කරන්න."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"ලබන්නාගේ දෝෂයකි"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"පණිවිඩය යවන්නද?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"ප්‍රතිපෝෂණ යවන්න"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"සංවාදය ගෙන යන්න"</item>
+    <item quantity="other" msgid="6639576653114141743">"සංවාද <xliff:g id="ID_1">%1$d</xliff:g> ගෙන යන්න"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="SUBJECT">%3$s</xliff:g> <xliff:g id="SNIPPET">%4$s</xliff:g> පිළිබඳව, <xliff:g id="DATE">%5$s</xliff:g> <xliff:g id="READSTATE">%6$s</xliff:g> දින, <xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="SUBJECT">%3$s</xliff:g> <xliff:g id="SNIPPET">%4$s</xliff:g> පිළිබඳව, <xliff:g id="TIME">%5$s</xliff:g> <xliff:g id="READSTATE">%6$s</xliff:g> ට, <xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"සංවාදය කියවයි"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;විස්තර පෙන්වන්න&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"විස්තර සඟවන්න"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> වෙත"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"ර.කා.පි: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> සඳහා සම්බන්ධතා තොරතුරු පෙන්වන්න"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"සම්බන්ධතා තොරතුරු පෙන්වන්න"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"පැරණි පණිවිඩ <xliff:g id="COUNT">%1$d</xliff:g> ක්"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"පැරණි පණිවිඩ <xliff:g id="COUNT">%1$d</xliff:g> පූරණය කරමින්"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"වෙතින්:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"පිළිතුරු යවන්නේ"</string>
     <string name="to_heading" msgid="3495203282540398336">"වෙත: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ඊ-තැපැල් ෆෝල්ඩරය"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"ෆෝල්ඩර වෙනස් කරන්න"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"ගෙනයන්නේ"</string>
-    <string name="search_hint" msgid="7060626585689391003">"සෙවීම"</string>
+    <string name="search_hint" msgid="4916671414132334289">"තැපැල් සෙවීම"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"මෙම උපාංගය මත හඬ සෙවීම සහය නොදක්වයි."</string>
     <string name="network_error" msgid="5931164247644972255">"සම්බන්ධතාවය නැත"</string>
     <string name="retry" msgid="916102442074217293">"නැවත උත්සාහ කරන්න"</string>
     <string name="load_more" msgid="8702691358453560575">"තවත් පූරණය කරන්න"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"නිශ්ශබ්ද වන්න"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"සුපුරුදු ක්‍රියාව"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"සංරක්ෂණය සහ මැකීමේ ක්‍රියාවන්"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"සංරක්ෂිත කරන්න"</item>
-    <item msgid="2567465476369142505">"මකාදමන්න"</item>
+    <item msgid="954772302016538814">"සංරක්ෂිතය පමණක් පෙන්වන්න"</item>
+    <item msgid="7212690302706180254">"මැකීම පමණක් පෙන්වන්න"</item>
+    <item msgid="2539051197590685708">"සංරක්ෂණය පෙන්වන්න සහ මකන්න"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"සංරක්ෂිත කරන්න"</item>
-    <item msgid="6088164268501960435">"මකාදමන්න"</item>
+    <item msgid="6877416142040695022">"සංරක්ෂිතය පමණක් පෙන්වන්න"</item>
+    <item msgid="1510017057984222376">"මැකීම පමණක් පෙන්වන්න"</item>
+    <item msgid="3196207224108008441">"සංරක්ෂණය පෙන්වන්න සහ මකන්න"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"සුපුරුදු ක්‍රියාව"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"සංරක්ෂණය සහ මැකීමේ ක්‍රියාවන්"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"සියල්ලන්ටම ප්‍රතිඋත්තර යවන්න"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"පණිවිඩ ප්‍රතිචාර සඳහා සුපුරුදු ලෙස භාවිතා කරන්න"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"ස්වයිප් ක්‍රියා"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"සංරක්ෂිත කිරීමට ස්වයිප් කරන්න"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"මැකීමට ස්වයිප් කරන්න"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"සංවාද ලැයිස්තුව තුළ"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"යවන්නාගේ රූපය"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"සංවාද ලැයිස්තුවේ නම අසලින් පෙන්වන්න"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"ෆෝල්ඩර නිරූපකය"</string>
     <string name="add_account" msgid="5905863370226612377">"ගිණුමක් එකතු කරන්න"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"චාරිකාව අස් කරන්න"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"ස්වයංක්‍රිය සමමුහුර්තය අක්‍රිය කර ඇත. සක්‍රිය කිරීම සඳහා ස්පර්ශ කරන්න."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"ගිණුම් සමමුහුර්තනය අබලයි. &lt;a href=\'http://www.example.com\'&gt;ගිණුම් සැකසීම්&lt;/a&gt; තුළ එය සබල කරන්න."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> හි නොයැවූ <xliff:g id="NUMBER">%1$s</xliff:g> කි"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"ස්වයංක්‍රිය-සමමුහුර්ත වීම සක්‍රිය කරන්නද?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Gmail පමණක් නොව, සියලුම යෙදුම් සහ ගිණුම්වලට ඔබ කරන වෙනස්කම්, වෙබය, ඔබගේ අනෙකුත් උපාංග සහ ඔබගේ <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> අතර සමමුහුර්ත වේ."</string>
     <string name="phone" msgid="4142617042507912053">"දුරකථනය"</string>
     <string name="tablet" msgid="4593581125469224791">"ටැබ්ලට්"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"සක්‍රිය කරන්න"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"ෆෝල්ඩර <xliff:g id="NUMBER">%1$s</xliff:g> ක් පෙන්වන්න"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"තවත් ෆෝල්ඩර <xliff:g id="NUMBER">%1$s</xliff:g> ක් පෙන්වන්න"</string>
     <string name="hide_folders" msgid="7618891933409521283">"ෆෝල්ඩර සඟවන්න"</string>
     <string name="print" msgid="7987949243936577207">"මුද්‍රණ කරන්න"</string>
     <string name="print_all" msgid="4011022762279519941">"සියල්ල මුද්‍රණය කරන්න"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"ගිණුම් කළමනාකරණය කරන්න"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"සාමාන්‍ය සැකසීම්"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"සැකසීම්"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"තවත් විකල්ප"</string>
 </resources>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5192fdc..3fd388c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Uložiť koncept"</string>
     <string name="discard" msgid="4905982179911608430">"Zahodiť"</string>
     <string name="compose" msgid="2602861958391035523">"Napísať správu"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Napísať"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Odpovedať"</item>
     <item msgid="2767793214788399009">"Odp. všetkým"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Jeden alebo viacero súborov nie je priložených. Limit: <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Súbor nie je priložený. Bol dosiahnutý maximálny limit: <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Súbor sa nepodarilo pripojiť."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Prístup k prílohe bol odmietnutý"</string>
     <string name="recipient_needed" msgid="319816879398937214">"Pridajte aspoň jedného príjemcu."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Chyba príjemcu"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Chcete túto správu odoslať?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Odoslať spätnú väzbu"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Presunúť konverzáciu"</item>
+    <item quantity="other" msgid="6639576653114141743">"Presunúť konverzácie (počet: <xliff:g id="ID_1">%1$d</xliff:g>)"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> – <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> – <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> o <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"konverzácia bola prečítaná"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.sk\'&gt;Podrobnosti&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skryť podrobnosti"</string>
     <string name="to_message_header" msgid="3954385178027011919">"komu: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"skrytá: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Zobraziť informácie kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Zobraziť kontaktné informácie"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Počet starších správ: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Načítavajú sa staršie správy (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Od:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Odpovedať:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Komu: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Priečinok aplikácie E-mail"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Zmeniť priečinky"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Presunúť do"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Hľadať"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Hľadať v pošte"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Hlasové vyhľadávanie nie je na tomto zariadení podporované"</string>
     <string name="network_error" msgid="5931164247644972255">"Bez pripojenia"</string>
     <string name="retry" msgid="916102442074217293">"Skúsiť znovu"</string>
     <string name="load_more" msgid="8702691358453560575">"Načítať ďalšie"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Tichý režim"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Predvolená akcia"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Akcie archivácie a odstránenia"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Archivovať"</item>
-    <item msgid="2567465476369142505">"Odstrániť"</item>
+    <item msgid="954772302016538814">"Zobraziť iba archiváciu"</item>
+    <item msgid="7212690302706180254">"Zobraziť iba odstránenie"</item>
+    <item msgid="2539051197590685708">"Zobraziť archiváciu aj odstránenie"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Archivovať"</item>
-    <item msgid="6088164268501960435">"Odstrániť"</item>
+    <item msgid="6877416142040695022">"Zobraziť iba archiváciu"</item>
+    <item msgid="1510017057984222376">"Zobraziť iba odstránenie"</item>
+    <item msgid="3196207224108008441">"Zobraziť archiváciu aj odstránenie"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Predvolená akcia"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Akcie archivácie a odstránenia"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Odpovedať všetkým"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Použiť ako predvolenú možnosť pre odpovede na správy"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Akcie prejdenia prstom"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Archivácia posunutím prstom"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Odstrániť po prejdení prstom"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"V zozname konverzácií"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Obrázok odosielateľa"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Zobraziť vedľa mena v zozname konverzácií"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ikona priečinka"</string>
     <string name="add_account" msgid="5905863370226612377">"Pridať účet"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Zatvoriť tip"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Synchronizácia účtu je vypnutá. Klepnutím ju zapnete."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Synchronizácia účetu je vypnutá. Zapnete ju v &lt;a href=\'http://www.example.com\'&gt;Nastaveniach účtu.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Počet neodoslaných správ v priečinku <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Zapnúť automatickú synchronizáciu?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Zmeny, ktoré vykonáte vo všetkých aplikáciách a účtoch (nie iba v službe Gmail), budú synchronizované medzi webom, ďalšími zariadeniami a zariadením <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefón"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Zapnúť"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Zobraziť ďalšie priečinky (<xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Zobraziť ďalšie priečinky (počet: <xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Skryť priečinky"</string>
     <string name="print" msgid="7987949243936577207">"Tlač"</string>
     <string name="print_all" msgid="4011022762279519941">"Vytlačiť všetky"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Spravovať účty"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Všeobecné nastavenia"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Nastavenia"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Viac možností"</string>
 </resources>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1d1a483..c7a5688 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Shrani osnutek"</string>
     <string name="discard" msgid="4905982179911608430">"Zavrzi"</string>
     <string name="compose" msgid="2602861958391035523">"Novo"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Novo"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Odgovori"</item>
     <item msgid="2767793214788399009">"Odgovori vsem"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Ena ali več datotek ni priloženih. Omejitev velikosti: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Datoteka ni priložena. Dosežena je omejitev velikosti <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Datoteke ni bilo mogoče pripeti."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Ni dovoljeno za prilogo."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Dodajte vsaj enega prejemnika."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Napaka prejemnika"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Želite poslati sporočilo?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Pošljite povratne informacije"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Premakni pogovor"</item>
+    <item quantity="other" msgid="6639576653114141743">"Premakni toliko pogovorov: <xliff:g id="ID_1">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> o zadevi <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> dne <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> o zadevi <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ob <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"pogovor je bil prebran"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ogled podrobnosti&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Skrij podrobnosti"</string>
     <string name="to_message_header" msgid="3954385178027011919">"za: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"skp: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Prikaz podatkov za stik za <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Prikaži podatke za stik"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Št. starejših sporočil: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Nalaganje starejših sporočil (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Od:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Odgovori:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Za: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Mapa za e-pošto"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Spreminjanje map"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Premakni v"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Išči"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Iskanje po pošti"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Glasovno iskanje v tej napravi ni podprto."</string>
     <string name="network_error" msgid="5931164247644972255">"Ni povezave"</string>
     <string name="retry" msgid="916102442074217293">"Poskusi znova"</string>
     <string name="load_more" msgid="8702691358453560575">"Naloži več"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Tiho"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Privzeto dejanje"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Dejanji arhiviranja in brisanja"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arhiviraj"</item>
-    <item msgid="2567465476369142505">"Izbriši"</item>
+    <item msgid="954772302016538814">"Pokaži samo arhiviranje"</item>
+    <item msgid="7212690302706180254">"Pokaži samo brisanje"</item>
+    <item msgid="2539051197590685708">"Pokaži arhiviranje in brisanje"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arhiviraj"</item>
-    <item msgid="6088164268501960435">"Izbriši"</item>
+    <item msgid="6877416142040695022">"Pokaži samo arhiviranje"</item>
+    <item msgid="1510017057984222376">"Pokaži samo brisanje"</item>
+    <item msgid="3196207224108008441">"Pokaži arhiviranje in brisanje"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Privzeto dejanje"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Dejanji arhiviranja in brisanja"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Odgovori vsem"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Uporabi kot privzeto za odgovore na sporočila"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Vlečenje"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Povlecite za arhiviranje"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Povlecite za brisanje"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Na seznamu pogovorov"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Slika pošiljatelja"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Prikaz zraven imena na seznamu pogovorov"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ikona mape"</string>
     <string name="add_account" msgid="5905863370226612377">"Dodaj račun"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Opusti nasvet"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Samodejna sinhronizacija je izklopljena. Vklopite jo z dotikom."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Sinhronizacija računa je izklopljena. Vklopite jo v možnosti &lt;a href=\'http://www.example.com\'&gt;Nastavitve računa&lt;/a&gt;."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Št. neposlanih sporočil v <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Želite vklopiti samodejno sinhronizacijo?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Spremembe vseh aplikacij in računov, ne samo za Gmaila, bodo sinhronizirane med spletom, vašimi drugimi napravami in napravo <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"tablični računalnik"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Vklopi"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Prikaži toliko map: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Prikaži še toliko map: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Skrij mape"</string>
     <string name="print" msgid="7987949243936577207">"Natisni"</string>
     <string name="print_all" msgid="4011022762279519941">"Natisni vse"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Upravljanje računov"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Splošne nastavitve"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Nastavitve"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Več možnosti"</string>
 </resources>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ea30daa..4309438 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Сачувај недовршену поруку"</string>
     <string name="discard" msgid="4905982179911608430">"Одбаци"</string>
     <string name="compose" msgid="2602861958391035523">"Нова порука"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Нова пор."</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Одговори"</item>
     <item msgid="2767793214788399009">"Одговори свима"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Није приложена једна датотека или више њих. Ограничење је <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Датотека није приложена. Достигнуто је ограничење од <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Није могуће приложити датотеку."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Дозвола је одбијена за прилог."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Додајте најмање једног примаоца."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Грешка примаоца"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Желите ли да пошаљете поруку?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Пошаљи повратне информације"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Премести преписку"</item>
+    <item quantity="other" msgid="6639576653114141743">"Премести преписке (<xliff:g id="ID_1">%1$d</xliff:g>)"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> на тему <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> на тему <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> у <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"преписка је прочитана"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Прикажи детаље&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Сакриј детаље"</string>
     <string name="to_message_header" msgid="3954385178027011919">"коме: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"скривено: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Прикажи контакт информације корисника <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Прикажи контакт информације"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Старијих порука: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Учитавају се старије поруке (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Од:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Одговор на:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Коме: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Директоријум Е-пошта"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Промена директоријума"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Премештање у"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Претрага"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Претражи пошту"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Гласовна претрага није подржана на овом уређају."</string>
     <string name="network_error" msgid="5931164247644972255">"Веза није успостављена"</string>
     <string name="retry" msgid="916102442074217293">"Покушај поново"</string>
     <string name="load_more" msgid="8702691358453560575">"Учитај још"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Нечујно"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Подразумевана радња"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Радње архивирања и брисања"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Архивирај"</item>
-    <item msgid="2567465476369142505">"Избриши"</item>
+    <item msgid="954772302016538814">"Прикажи само архивирање"</item>
+    <item msgid="7212690302706180254">"Прикажи само брисање"</item>
+    <item msgid="2539051197590685708">"Прикажи архивирање и брисање"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Архивирај"</item>
-    <item msgid="6088164268501960435">"Избриши"</item>
+    <item msgid="6877416142040695022">"Приказује се само архивирање"</item>
+    <item msgid="1510017057984222376">"Приказује се само брисање"</item>
+    <item msgid="3196207224108008441">"Приказују се архивирање и брисање"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Подразумевана радња"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Радње архивирања и брисања"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Одговори свима"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Коришћење ове опције као подразумеване за одговоре на поруке"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Радње превлачења"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Архивирање листањем"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Брисање листањем"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"На листи преписки"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Слика пошиљаоца"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Приказивање поред имена на листи преписки"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Икона директоријума"</string>
     <string name="add_account" msgid="5905863370226612377">"Додај налог"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Одбацивање савета"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Аутоматска синхронизација је искључена. Додирните да бисте је укључили."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Синхронизација налога је искључена. Укључите је у &lt;a href=\'http://www.example.com\'&gt;Подешавањима налога.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Непослате поруке (<xliff:g id="NUMBER">%1$s</xliff:g>) у директоријуму <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Желите ли да укључите аутоматску синхронизацију?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Промене које обављате у свим апликацијама и налозима, а не само у Gmail-у, биће синхронизоване између веба, других уређаја и <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"телефон"</string>
     <string name="tablet" msgid="4593581125469224791">"таблет"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Укључи"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Прикажи <xliff:g id="NUMBER">%1$s</xliff:g> директоријум(а)"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Прикажи још <xliff:g id="NUMBER">%1$s</xliff:g> директоријума"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Сакриј директоријуме"</string>
     <string name="print" msgid="7987949243936577207">"Штампај"</string>
     <string name="print_all" msgid="4011022762279519941">"Одштампај све"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Управљање налозима"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Општа подешавања"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Подешавања"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Још опција"</string>
 </resources>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ac92dac..6996754 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Spara utkast"</string>
     <string name="discard" msgid="4905982179911608430">"Släng"</string>
     <string name="compose" msgid="2602861958391035523">"Skriv"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Skriv"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Svara"</item>
     <item msgid="2767793214788399009">"Svara alla"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"En eller flera filer bifogades inte. Gränsen är <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Filen bifogades inte. Du har nått gränsen på <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Det gick inte att bifoga filen."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Behörighet nekad för fastsättning."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Lägg till minst en mottagare."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Mottagningsfel"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Skicka meddelande?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Skicka feedback"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Flytta konversation"</item>
+    <item quantity="other" msgid="6639576653114141743">"Flytta <xliff:g id="ID_1">%1$d</xliff:g> konversationer"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> om <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> den <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> om <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kl. <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"konversationen är läst"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Visa information&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Dölj detaljer"</string>
     <string name="to_message_header" msgid="3954385178027011919">"till <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Hemlig kopia: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Visa kontaktuppgifter för <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Visa kontaktuppgifter"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> äldre meddelanden"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Läser in <xliff:g id="COUNT">%1$d</xliff:g> äldre meddelanden"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Från:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Svara till:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Till: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Mapp för e-post"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Byt mapp"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Flytta till"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Sök"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Sök i e-post"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Röstsökning stöds inte med den här enheten."</string>
     <string name="network_error" msgid="5931164247644972255">"Ingen anslutning"</string>
     <string name="retry" msgid="916102442074217293">"Försök igen"</string>
     <string name="load_more" msgid="8702691358453560575">"Hämta fler"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Tyst"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Standardåtgärd"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Åtgärderna arkivera och ta bort"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arkivera"</item>
-    <item msgid="2567465476369142505">"Ta bort"</item>
+    <item msgid="954772302016538814">"Visa endast arkivera"</item>
+    <item msgid="7212690302706180254">"Visa endast ta bort"</item>
+    <item msgid="2539051197590685708">"Visa arkivera och ta bort"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arkivera"</item>
-    <item msgid="6088164268501960435">"Ta bort"</item>
+    <item msgid="6877416142040695022">"Visa endast arkivera"</item>
+    <item msgid="1510017057984222376">"Visa endast ta bort"</item>
+    <item msgid="3196207224108008441">"Visa arkivera och ta bort"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Standardåtgärd"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Åtgärderna arkivera och ta bort"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Svara alla"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Använd som standard för svar på meddelanden"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Åtgärder för dra"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Dra om du vill ta bort"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Dra om du vill radera"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"I konversationslista"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Bild på avsändare"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Visa bredvid namnet i konversationslistan"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Mappikon"</string>
     <string name="add_account" msgid="5905863370226612377">"Lägg till konto"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Ta bort tips"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Automatisk synkronisering är av. Tryck för att slå på."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Kontosynkroniseringen är avstängd. Slå på den i &lt;a href=\'http://www.example.com\'&gt;Kontoinställningarna&lt;/a&gt;."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> osända meddelanden i <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Vill du aktivera automatisk synkronisering?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Ändringar som du gör i alla appar och konton, inte bara i Gmail, synkroniseras mellan webben, dina andra enheter och din <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"mobil"</string>
     <string name="tablet" msgid="4593581125469224791">"surfplatta"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Aktivera"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Visa <xliff:g id="NUMBER">%1$s</xliff:g> mappar"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Visa <xliff:g id="NUMBER">%1$s</xliff:g> mappar till"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Dölj mappar"</string>
     <string name="print" msgid="7987949243936577207">"Skriv ut"</string>
     <string name="print_all" msgid="4011022762279519941">"Skriv ut alla"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Hantera konton"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Allmänna inställningar"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Inställningar"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Fler alternativ"</string>
 </resources>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 56b11d4..b84daa2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Hifadhi rasimu"</string>
     <string name="discard" msgid="4905982179911608430">"Tupa"</string>
     <string name="compose" msgid="2602861958391035523">"Tunga"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Tunga"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Jibu"</item>
     <item msgid="2767793214788399009">"Jibu wote"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Faili moja au zaidi hazijaambatishwa. Kiwango ni <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Faili haijaambatishwa. <xliff:g id="MAXSIZE">%1$s</xliff:g> kiwango kimefikiwa."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Haikuweza kuambatisha faili."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Ruhusa ya kiambatisho imekatazwa."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Ongeza angalau mpokeaji mmoja."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Hitilafu ya mpokeaji"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Tuma ujumbe?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Tuma maoni"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Hamisha mazungumzo"</item>
+    <item quantity="other" msgid="6639576653114141743">"Hamisha mazungumzo <xliff:g id="ID_1">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g> kuhusu <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> tarehe <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g> kuhusu <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> saa <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"mazungumzo yamesomwa"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Tazama maelezo&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ficha maelezo"</string>
     <string name="to_message_header" msgid="3954385178027011919">"kwa <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"nakala fiche kwa "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Onyesha maelezo ya mawasiliano ya <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Onyesha maelezo ya mawasiliano"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> wa zamani"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Inapakia ujumbe <xliff:g id="COUNT">%1$d</xliff:g> wa awali"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Kutoka:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Jibu-kwa:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Kwa: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Folda ya barua pepe"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Badilisha folda"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Hamisha hadi"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Tafuta"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Tafuta barua pepe"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Kipengee cha kutafuta kwa kutamka hakitumiki kwenye kifaa hiki"</string>
     <string name="network_error" msgid="5931164247644972255">"Hakuna muunganisho"</string>
     <string name="retry" msgid="916102442074217293">"Jaribu tena"</string>
     <string name="load_more" msgid="8702691358453560575">"Pakia zaidi"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Kimya"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Kitendo chaguo-msingi"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Kuweka kwenye kumbukumbu na kufuta"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Weka kwenye kumbukumbu"</item>
-    <item msgid="2567465476369142505">"Futa"</item>
+    <item msgid="954772302016538814">"Onyesha kumbukumbu pekee"</item>
+    <item msgid="7212690302706180254">"Onyesha futa pekee"</item>
+    <item msgid="2539051197590685708">"Onyesha kumbukumbu na futa"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Weka kwenye kumbukumbu"</item>
-    <item msgid="6088164268501960435">"Futa"</item>
+    <item msgid="6877416142040695022">"Onyesha kumbukumbu pekee"</item>
+    <item msgid="1510017057984222376">"Onyesha futa pekee"</item>
+    <item msgid="3196207224108008441">"Onyesha kumbukumbu na futa"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Kitendo chaguo-msingi"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Kuweka kwenye kumbukumbu na kufuta"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Jibu wote"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Tumia kama chaguo-msingi la majibu ya ujumbe"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Vitendo vya kutelezesha"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Telezesha ili uweke kwenye kumbukumbu"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Telezesha ili ufute"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Katika orodha ya mazungumzo"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Picha ya mtumaji"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Onyesha kando ya jina katika orodha ya mazungumzo"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Ikoni ya folda"</string>
     <string name="add_account" msgid="5905863370226612377">"Ongeza akaunti"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Ondoa kidokezo"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Kusawazisha kiotomatiki kumezimwa. Gusa ili uwashe."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Usawazishaji wa akaunti umezimwa. Washa &lt;a href=\'http://www.example.com\'&gt;Mipangilio ya akaunti.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> ambazo hazijatumwa katika <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Unataka kuwasha usawazishaji kiotomatiki?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Mabadiliko unayofanyia programu na akaunti zote, sio tu Gmail, yatasawazishwa baina ya wavuti, vifaa vyako vingine na, <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> yako."</string>
     <string name="phone" msgid="4142617042507912053">"simu"</string>
     <string name="tablet" msgid="4593581125469224791">"kompyuta kibao"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Washa"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Onyesha folda <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Onyesha folda <xliff:g id="NUMBER">%1$s</xliff:g> zaidi"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ficha folda"</string>
     <string name="print" msgid="7987949243936577207">"Chapisha"</string>
     <string name="print_all" msgid="4011022762279519941">"Chapisha zote"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Simamia Akaunti"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Mipangilio ya jumla"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Mipangilio"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Chaguo zaidi"</string>
 </resources>

diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 2968af6..4e6ab6a 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"வரைவைச் சேமி"</string>
     <string name="discard" msgid="4905982179911608430">"விலக்கு"</string>
     <string name="compose" msgid="2602861958391035523">"எழுது"</string>
-    <string name="compose_title" msgid="5673376086133995913">"எழுது"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"பதிலளி"</item>
     <item msgid="2767793214788399009">"எல்லோருக்கும் பதிலளி"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ஒன்று அல்லது அதற்கு மேற்பட்ட கோப்புகள் இணைக்கப்படவில்லை. வரம்பு <xliff:g id="MAXSIZE">%1$s</xliff:g> ஆகும்."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"கோப்பு இணைக்கப்படவில்லை. <xliff:g id="MAXSIZE">%1$s</xliff:g> வரம்பு முடிந்தது."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"கோப்பை இணைக்க முடியவில்லை."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"இணைப்பிற்கான அனுமதி மறுக்கப்பட்டது."</string>
     <string name="recipient_needed" msgid="319816879398937214">"குறைந்தது ஒரு பெறுநரையாவது சேர்க்க வேண்டும்."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"பெறுநர் பிழை"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"செய்தியை அனுப்பவா?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"கருத்தை அனுப்பு"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"உரையாடலை நகர்த்து"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> உரையாடல்களை நகர்த்து"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> குறித்து <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> அன்று <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> குறித்து <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> க்கு அனுப்பிய <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"உரையாடல் படிக்கப்பட்டது"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;விவரங்களைக் காட்டு&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"விவரங்களை மறை"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g> க்கு அனுப்பப்பட்டது"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> க்கான தொடர்பு தகவலைக் காட்டு"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"தொடர்பு தகவலைக் காட்டு"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> பழைய செய்திகள்"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> பழைய செய்திகளை ஏற்றுகிறது"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"அனுப்புநர்:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"பதிலளிக்கவேண்டியது:"</string>
     <string name="to_heading" msgid="3495203282540398336">"பெறுநர்: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"மின்னஞ்சல் கோப்புறை"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"கோப்புறைகளை மாற்று"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"இதற்கு நகர்த்து"</string>
-    <string name="search_hint" msgid="7060626585689391003">"தேடுக"</string>
+    <string name="search_hint" msgid="4916671414132334289">"அஞ்சலில் தேடு"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"இந்தச் சாதனத்தில் குரல் தேடல் ஆதரிக்கப்படவில்லை."</string>
     <string name="network_error" msgid="5931164247644972255">"இணைப்பு இல்லை"</string>
     <string name="retry" msgid="916102442074217293">"மீண்டும் முயற்சிசெய்க"</string>
     <string name="load_more" msgid="8702691358453560575">"மேலும் ஏற்று"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"நிசப்தம்"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"இயல்புநிலை செயல்"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"காப்பிடு &amp; நீக்கு செயல்கள்"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"காப்பகப்படுத்து"</item>
-    <item msgid="2567465476369142505">"நீக்கு"</item>
+    <item msgid="954772302016538814">"காப்பிடு என்பதை மட்டும் காட்டு"</item>
+    <item msgid="7212690302706180254">"நீக்கு என்பதை மட்டும் காட்டு"</item>
+    <item msgid="2539051197590685708">"காப்பிடு &amp; நீக்கு இரண்டையும் காட்டு"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"காப்பகப்படுத்து"</item>
-    <item msgid="6088164268501960435">"நீக்கு"</item>
+    <item msgid="6877416142040695022">"காப்பிடு என்பதை மட்டும் காட்டு"</item>
+    <item msgid="1510017057984222376">"நீக்கு என்பதை மட்டும் காட்டு"</item>
+    <item msgid="3196207224108008441">"காப்பிடு &amp; நீக்கு இரண்டையும் காட்டு"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"இயல்புநிலை செயல்"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"காப்பிடு &amp; நீக்கு செயல்கள்"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"எல்லோருக்கும் பதிலளி"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"செய்தி பதிலளிப்புகளுக்கான இயல்புநிலையாகப் பயன்படுத்து"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"ஸ்வைப் செயல்கள்"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"காப்பகப்படுத்த தேய்க்கவும்"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"நீக்க ஸ்வைப் செய்யவும்"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"உரையாடல் பட்டியலில்"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"அனுப்புநரின் படம்"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"உரையாடல் பட்டியலில் பெயருக்கு அருகில் காட்டு"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"கோப்புறை ஐகான்"</string>
     <string name="add_account" msgid="5905863370226612377">"கணக்கைச் சேர்"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"உதவிக்குறிப்பை நிராகரி"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"தானாக ஒத்திசைப்பது முடக்கப்பட்டுள்ளது. இயக்குவதற்குத் தொடவும்."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"கணக்கு ஒத்திசைவு முடக்கப்பட்டுள்ளது. &lt;a href=\'http://www.example.com\'&gt;கணக்கு அமைப்புகளில்&lt;/a&gt; இயக்கவும்."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> இல் <xliff:g id="NUMBER">%1$s</xliff:g> அனுப்பப்படாத செய்திகள் உள்ளன"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"தானாக ஒத்திசைப்பதை இயக்கவா?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"நீங்கள் மாற்றங்களைச் செய்யும் எல்லா பயன்பாடுகளும், கணக்குகளும், Gmail மட்டுமில்லாமல், இணையம், உங்களது பிற சாதனங்கள் மற்றும் உங்கள் <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ஆகிவற்றிற்கு இடையே ஒத்திசைக்கப்படும்."</string>
     <string name="phone" msgid="4142617042507912053">"தொலைபேசி"</string>
     <string name="tablet" msgid="4593581125469224791">"டேப்லெட்"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"இயக்கு"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> கோப்புறைகளைக் காட்டு"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"மேலும் <xliff:g id="NUMBER">%1$s</xliff:g> கோப்புறைகளைக் காட்டு"</string>
     <string name="hide_folders" msgid="7618891933409521283">"கோப்புறைகளை மறை"</string>
     <string name="print" msgid="7987949243936577207">"அச்சிடு"</string>
     <string name="print_all" msgid="4011022762279519941">"அனைத்தையும் அச்சிடு"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"கணக்குகளை நிர்வகி"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"பொது அமைப்புகள்"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"அமைப்புகள்"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"மேலும் விருப்பங்கள்"</string>
 </resources>

diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index f66ca01..44fc1d7 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"చిత్తుప్రతిని సేవ్ చేయి"</string>
     <string name="discard" msgid="4905982179911608430">"విస్మరించు"</string>
     <string name="compose" msgid="2602861958391035523">"కంపోజ్ చేయండి"</string>
-    <string name="compose_title" msgid="5673376086133995913">"కంపోజ్"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"ప్రత్యుత్తరం పంపండి"</item>
     <item msgid="2767793214788399009">"అందరికీ ప్రత్యు."</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ఒకటి లేదా అంతకంటే ఎక్కువ ఫైల్‌లు జోడించబడలేదు. పరిమితి <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ఫైల్ జోడించబడలేదు. <xliff:g id="MAXSIZE">%1$s</xliff:g> పరిమితి చేరుకుంది."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ఫైల్‌ను జోడించడం సాధ్యపడలేదు."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"జోడింపుకి అనుమతి నిరాకరించబడింది."</string>
     <string name="recipient_needed" msgid="319816879398937214">"కనీసం ఒక స్వీకర్తను జోడించండి."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"స్వీకర్త లోపం"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"సందేశం పంపాలా?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"అభిప్రాయం పంపండి"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"సంభాషణను తరలించండి"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> సంభాషణలను తరలించండి"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> గురించి, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>న, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> గురించి, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g>కి, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"సంభాషణ చదవబడింది"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;వివరాలు వీక్షించండి&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"వివరాలను దాచు"</string>
     <string name="to_message_header" msgid="3954385178027011919">"<xliff:g id="RECIPIENTS">%1$s</xliff:g>కి"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> యొక్క సంప్రదింపు సమాచారాన్ని చూపు"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"సంప్రదింపు సమాచారాన్ని చూపు"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> పాత సందేశాలు"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> పాత సందేశాలను లోడ్ చేస్తోంది"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"వీరి నుండి:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"వీరికి ప్రత్యుత్తరం:"</string>
     <string name="to_heading" msgid="3495203282540398336">"వీరికి: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ఇమెయిల్ ఫోల్డర్"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"ఫోల్డర్‌లను మార్చండి"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"దీనికి తరలించండి"</string>
-    <string name="search_hint" msgid="7060626585689391003">"శోధించండి"</string>
+    <string name="search_hint" msgid="4916671414132334289">"మెయిల్ శోధన"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"వాయిస్ శోధనకి ఈ పరికరంలో మద్దతు లేదు."</string>
     <string name="network_error" msgid="5931164247644972255">"కనెక్షన్ లేదు"</string>
     <string name="retry" msgid="916102442074217293">"మళ్లీ ప్రయత్నించు"</string>
     <string name="load_more" msgid="8702691358453560575">"మరిన్ని లోడ్ చేయి"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"నిశ్శబ్దం"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"డిఫాల్ట్ చర్య"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"ఆర్కైవ్ &amp; తొలగింపు చర్యలు"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"ఆర్కైవ్ చేయి"</item>
-    <item msgid="2567465476369142505">"తొలగించు"</item>
+    <item msgid="954772302016538814">"ఆర్కైవ్‌ను మాత్రమే చూపు"</item>
+    <item msgid="7212690302706180254">"తొలగింపు మాత్రమే చూపు"</item>
+    <item msgid="2539051197590685708">"ఆర్కైవ్ &amp; తొలగింపు చూపు"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"ఆర్కైవ్ చేస్తుంది"</item>
-    <item msgid="6088164268501960435">"తొలగిస్తుంది"</item>
+    <item msgid="6877416142040695022">"ఆర్కైవ్‌ను మాత్రమే చూపు"</item>
+    <item msgid="1510017057984222376">"తొలగింపు మాత్రమే చూపు"</item>
+    <item msgid="3196207224108008441">"ఆర్కైవ్ &amp; తొలగింపు చూపు"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"డిఫాల్ట్ చర్య"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"ఆర్కైవ్ &amp; తొలగింపు చర్యలు"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"అందరికీ ప్రత్యుత్తరం పంపండి"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"సందేశ ప్రత్యుత్తరాల కోసం డిఫాల్ట్‌గా ఉపయోగించు"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"స్వైప్ చర్యలు"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"ఆర్కైవ్ చేయడానికి స్వైప్ చేయండి"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"తొలగించడానికి స్వైప్ చేయండి"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"సంభాషణ జాబితాలో"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"పంపినవారి చిత్రం"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"సంభాషణ జాబితాలో పేరుకి ప్రక్కన చూపు"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"ఫోల్డర్ చిహ్నం"</string>
     <string name="add_account" msgid="5905863370226612377">"ఖాతాను జోడించు"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"చిట్కాను తీసివేయి"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"స్వీయ-సమకాలీకరణ ఆఫ్‌లో ఉంది. ఆన్ చేయడానికి తాకండి."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"ఖాతా సమకాలీకరణ ఆఫ్‌లో ఉంది. &lt;a href=\'http://www.example.com\'&gt;ఖాతా సెట్టింగ్‌ల&lt;/a&gt;లో దాన్ని ఆన్ చేయండి."</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>లో <xliff:g id="NUMBER">%1$s</xliff:g> పంపనివి ఉన్నాయి"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"స్వయం-సమకాలీకరణను ప్రారంభించాలా?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"మీరు Gmail మాత్రమే కాకుండా అన్ని అనువర్తనాలకు మరియు ఖాతాలకు చేసే మార్పులు వెబ్, మీ ఇతర పరికరాలు మరియు మీ <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> మధ్య సమకాలీకరించబడతాయి."</string>
     <string name="phone" msgid="4142617042507912053">"ఫోన్"</string>
     <string name="tablet" msgid="4593581125469224791">"టాబ్లెట్"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"ప్రారంభించు"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> ఫోల్డర్‌లను చూపు"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"మరో <xliff:g id="NUMBER">%1$s</xliff:g> ఫోల్డర్‌లను చూపు"</string>
     <string name="hide_folders" msgid="7618891933409521283">"ఫోల్డర్‌లను దాచు"</string>
     <string name="print" msgid="7987949243936577207">"ముద్రించు"</string>
     <string name="print_all" msgid="4011022762279519941">"అన్నీ ముద్రించు"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"ఖాతాలను నిర్వహించు"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"సాధారణ సెట్టింగ్‌లు"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"సెట్టింగ్‌లు"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"మరిన్ని ఎంపికలు"</string>
 </resources>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 7433729..3c1a221 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"บันทึกร่างจดหมาย"</string>
     <string name="discard" msgid="4905982179911608430">"ทิ้ง"</string>
     <string name="compose" msgid="2602861958391035523">"เขียน"</string>
-    <string name="compose_title" msgid="5673376086133995913">"เขียน"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"ตอบ"</item>
     <item msgid="2767793214788399009">"ตอบทั้งหมด"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ไม่ได้แนบไฟล์อย่างน้อยหนึ่งไฟล์ จำกัดขนาดที่ <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"ไม่ได้แนบไฟล์ เกินขนาดที่จำกัดสูงสุด <xliff:g id="MAXSIZE">%1$s</xliff:g>"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"ไม่สามารถแนบไฟล์"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"ระบบปฏิเสธสิทธิ์ในไฟล์แนบ"</string>
     <string name="recipient_needed" msgid="319816879398937214">"เพิ่มผู้รับอย่างน้อยหนึ่งราย"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"พบข้อผิดพลาดกับผู้รับ"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"ส่งข้อความหรือไม่"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"ส่งความคิดเห็น"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"ย้ายการสนทนา"</item>
+    <item quantity="other" msgid="6639576653114141743">"ย้ายการสนทนา <xliff:g id="ID_1">%1$d</xliff:g> รายการ"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> เกี่ยวกับ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> วันที่ <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> เกี่ยวกับ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> เวลา <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"อ่านการสนทนาแล้ว"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;ดูรายละเอียด&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"ซ่อนรายละเอียด"</string>
     <string name="to_message_header" msgid="3954385178027011919">"ถึง <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"สำเนาลับ: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"แสดงข้อมูลติดต่อของ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"แสดงข้อมูลติดต่อ"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความเก่า"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"กำลังโหลดข้อความเก่า <xliff:g id="COUNT">%1$d</xliff:g> รายการ"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"จาก:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"ตอบกลับ:"</string>
     <string name="to_heading" msgid="3495203282540398336">"ถึง: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"โฟลเดอร์อีเมล"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"เปลี่ยนโฟลเดอร์"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"ย้ายไปที่"</string>
-    <string name="search_hint" msgid="7060626585689391003">"ค้นหา"</string>
+    <string name="search_hint" msgid="4916671414132334289">"ค้นหาจดหมาย"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"อุปกรณ์นี้ไม่สนับสนุนการค้นหาด้วยเสียง"</string>
     <string name="network_error" msgid="5931164247644972255">"ไม่มีการเชื่อมต่อ"</string>
     <string name="retry" msgid="916102442074217293">"ลองอีกครั้ง"</string>
     <string name="load_more" msgid="8702691358453560575">"โหลดเพิ่มเติม"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"เงียบ"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"การดำเนินการเริ่มต้น"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"การดำเนินการ \"เก็บ\" และ \"ลบ\""</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"เก็บ"</item>
-    <item msgid="2567465476369142505">"ลบ"</item>
+    <item msgid="954772302016538814">"แสดงเฉพาะ \"เก็บ\""</item>
+    <item msgid="7212690302706180254">"แสดงเฉพาะ \"ลบ\""</item>
+    <item msgid="2539051197590685708">"แสดง \"เก็บ\" และ \"ลบ\""</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"เก็บ"</item>
-    <item msgid="6088164268501960435">"ลบ"</item>
+    <item msgid="6877416142040695022">"แสดงเฉพาะ \"เก็บ\""</item>
+    <item msgid="1510017057984222376">"แสดงเฉพาะ \"ลบ\""</item>
+    <item msgid="3196207224108008441">"แสดง \"เก็บ\" และ \"ลบ\""</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"การดำเนินการเริ่มต้น"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"การดำเนินการ \"เก็บ\" และ \"ลบ\""</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"ตอบทั้งหมด"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"ใช้เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"การกวาด"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"กวาดนิ้วเพื่อเก็บถาวร"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"กวาดนิ้วเพื่อลบ"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"ในรายการการสนทนา"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"ภาพของผู้ส่ง"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"แสดงข้างชื่อในรายการสนทนา"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"ไอคอนโฟลเดอร์"</string>
     <string name="add_account" msgid="5905863370226612377">"เพิ่มบัญชี"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"ปิดเคล็ดลับ"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"การซิงค์อัตโนมัติปิดอยู่ แตะเพื่อเปิด"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"การซิงค์บัญชีถูกปิด โปรดเปิดใน &lt;a href=\'http://www.example.com\'&gt;การตั้งค่า.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> ข้อความที่ยังไม่ได้ส่งใน <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"เปิดซิงค์อัตโนมัติไหม"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"การเปลี่ยนแปลงที่คุณทำกับแอปและบัญชีทั้งหมด ไม่ใช่เพียง Gmail จะมีการซิงค์กันระหว่างเว็บ อุปกรณ์อื่นๆ และ <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ของคุณ"</string>
     <string name="phone" msgid="4142617042507912053">"โทรศัพท์"</string>
     <string name="tablet" msgid="4593581125469224791">"แท็บเล็ต"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"เปิด"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"แสดง <xliff:g id="NUMBER">%1$s</xliff:g> โฟลเดอร์"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"แสดงอีก <xliff:g id="NUMBER">%1$s</xliff:g> โฟลเดอร์"</string>
     <string name="hide_folders" msgid="7618891933409521283">"ซ่อนโฟลเดอร์"</string>
     <string name="print" msgid="7987949243936577207">"พิมพ์"</string>
     <string name="print_all" msgid="4011022762279519941">"พิมพ์ทั้งหมด"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"จัดการบัญชี"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"การตั้งค่าทั่วไป"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"การตั้งค่า"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"ตัวเลือกเพิ่มเติม"</string>
 </resources>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2f5a240..326eb63 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"I-save ang draft"</string>
     <string name="discard" msgid="4905982179911608430">"i-discard"</string>
     <string name="compose" msgid="2602861958391035523">"Bumuo"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Mag-email"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Tumugon"</item>
     <item msgid="2767793214788399009">"Tumugon sa lahat"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Hindi naka-attach ang isa o higit pang mga file. Limitasyon <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Hindi naka-attach ang file. Naabot ang limitasyong <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Hindi mai-attach ang file."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Tinanggihan ang pahintulot para sa attachment."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Magdagdag ng hindi bababa sa isang recipient."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Error ng recipient"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Ipadala ang mensahe?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Magpadala ng feedback"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Ilipat ang pag-uusap"</item>
+    <item quantity="other" msgid="6639576653114141743">"Ilipat ang <xliff:g id="ID_1">%1$d</xliff:g> (na) pag-uusap"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"Si <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> tungkol sa <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> noong <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"Si <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> tungkol sa <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ng <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"pag-uusap na nabasa na"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Tingnan ang mga detalye&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Itago ang mga detalye"</string>
     <string name="to_message_header" msgid="3954385178027011919">"kay <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Ipakita ang impormasyon ng contact para kay <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Ipakita ang impormasyon ng contact"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> (na) mas lumang mensahe"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Nilo-load ang <xliff:g id="COUNT">%1$d</xliff:g> (na) mas lumang mensahe"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Mula kay:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Tugon kay:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Sa/Kay: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Folder ng Email"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Baguhin ang mga folder"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Ilipat sa"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Maghanap"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Maghanap sa mail"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Ang paghahanap gamit ang boses ay hindi sinusuportahan sa device na ito."</string>
     <string name="network_error" msgid="5931164247644972255">"Walang koneksyon"</string>
     <string name="retry" msgid="916102442074217293">"Subukang Muli"</string>
     <string name="load_more" msgid="8702691358453560575">"Mag-load ng higit pa"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Naka-silent"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Default na pagkilos"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Mga pagkilos na i-archive at tanggalin"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"I-archive"</item>
-    <item msgid="2567465476369142505">"Tanggalin"</item>
+    <item msgid="954772302016538814">"I-archive lang ang ipakita"</item>
+    <item msgid="7212690302706180254">"Tanggalin lang ang ipakita"</item>
+    <item msgid="2539051197590685708">"Ipakita ang i-archive at tanggalin"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"I-archive"</item>
-    <item msgid="6088164268501960435">"Tanggalin"</item>
+    <item msgid="6877416142040695022">"Archive lang ang ipakita"</item>
+    <item msgid="1510017057984222376">"Tanggalin lang ang ipakita"</item>
+    <item msgid="3196207224108008441">"Ipakita ang i-archive at tanggalin"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Default na pagkilos"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Mga pagkilos na i-archive at tanggalin"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Tumugon sa lahat"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Gamitin bilang default para sa mga tugon sa mensahe"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Mga pag-swipe"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Mag-swipe upang i-archive"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"I-swipe upang tanggalin"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Sa listahan ng pag-uusap"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Larawan ng nagpadala"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Ipakita sa tabi ng pangalan sa listahan ng pag-uusap"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Icon ng folder"</string>
     <string name="add_account" msgid="5905863370226612377">"Magdagdag ng account"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"I-dismiss ang tip"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Naka-off ang awtomatikong pag-sync. Pindutin para i-on."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Naka-off ang pag-sync sa acccount. I-on ito sa &lt;a href=\'http://www.example.com\'&gt;Mga setting ng account.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> ang hindi naipadala sa <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"I-on ang auto-sync?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Ang mga pagbabagong iyong ginawa sa lahat ng apps at account, hindi lang sa Gmail, ay masi-synchronize sa web, iba mo pang mga device, at iyong <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ."</string>
     <string name="phone" msgid="4142617042507912053">"telepono"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"I-on"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Ipakita ang <xliff:g id="NUMBER">%1$s</xliff:g> (na) folder"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Magpakita ng <xliff:g id="NUMBER">%1$s</xliff:g> pang folder"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Itago ang mga folder"</string>
     <string name="print" msgid="7987949243936577207">"I-print"</string>
     <string name="print_all" msgid="4011022762279519941">"I-print lahat"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Pamahalaan ang Mga Account"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Mga pangkalahatang setting"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Mga Setting"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Higit pang mga opsyon"</string>
 </resources>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9358a55..c8acd0a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Taslağı kaydet"</string>
     <string name="discard" msgid="4905982179911608430">"Sil"</string>
     <string name="compose" msgid="2602861958391035523">"E-posta yaz"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Oluştur"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Yanıt"</item>
     <item msgid="2767793214788399009">"Tümünü yanıtla"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Bir veya daha fazla dosya eklenmedi. Boyut sınırı: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Dosya eklenmedi. <xliff:g id="MAXSIZE">%1$s</xliff:g> sınırına ulaşıldı."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Dosya eklenemedi."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Ek için izin reddedildi."</string>
     <string name="recipient_needed" msgid="319816879398937214">"En az bir alıcı ekleyin."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Alıcı hatası"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"İleti gönderilsin mi?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Görüş bildir"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"İleti dizisini taşı"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> ileti dizisini taşı"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> adlı katılımcıya <xliff:g id="DATE">%5$s</xliff:g> tarihinde gönderilen <xliff:g id="SUBJECT">%3$s</xliff:g> konulu ve <xliff:g id="READSTATE">%6$s</xliff:g> durumda olan iletinin bir bölümü: <xliff:g id="SNIPPET">%4$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, konu: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (saat: <xliff:g id="TIME">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"ileti dizisi okundu"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ayrıntıları görüntüle&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ayrıntıları gizle"</string>
     <string name="to_message_header" msgid="3954385178027011919">"Alıcılar: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> iletişim bilgilerini göster"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"İletişim bilgilerini göster"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> eski ileti"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> eski ileti yükleniyor"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Gönderen:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Yanıt Adresi:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Alıcı: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"E-posta klasörü"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Klasörleri değiştir"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Taşı"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Arama"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Postalarda ara"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Sesle arama bu cihazda desteklenmiyor."</string>
     <string name="network_error" msgid="5931164247644972255">"Bağlantı yok"</string>
     <string name="retry" msgid="916102442074217293">"Yeniden dene"</string>
     <string name="load_more" msgid="8702691358453560575">"Daha fazla yükle"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Sessiz"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Varsayılan işlem"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Arşivleme ve silme işlemleri"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Arşivle"</item>
-    <item msgid="2567465476369142505">"Sil"</item>
+    <item msgid="954772302016538814">"Yalnızca arşivlemeyi göster"</item>
+    <item msgid="7212690302706180254">"Yalnızca silmeyi göster"</item>
+    <item msgid="2539051197590685708">"Arşivlemeyi ve silmeyi göster"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Arşivle"</item>
-    <item msgid="6088164268501960435">"Sil"</item>
+    <item msgid="6877416142040695022">"Yalnızca arşivlemeyi göster"</item>
+    <item msgid="1510017057984222376">"Yalnızca silmeyi göster"</item>
+    <item msgid="3196207224108008441">"Arşivlemeyi ve silmeyi göster"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Varsayılan işlem"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Arşivleme ve silme işlemleri"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Yanıtı tüm alıcılara gönder"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"İleti yanıtlarında varsayılan olarak kullan"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Hızlıca kaydırma işlemleri"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Arşivlemek için hızlıca kaydırın"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Silmek için hızlıca kaydırın"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"İleti dizisi listesinde"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Gönderen resmi"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"İleti dizisi listesinde adın yanında göster"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Klasör simgesi"</string>
     <string name="add_account" msgid="5905863370226612377">"Hesap ekle"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"İpucunu kapat"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Otomatik senkronizasyon devre dışı. Etkinleştirmek için dokunun."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Hesap senkronizasyonu devre dışı. Bu özelliği &lt;a href=\'http://www.example.com\'&gt;Hesap ayarları&lt;/a&gt;\'ndan etkinleştirebilirsiniz"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> içinde gönderilmemiş <xliff:g id="NUMBER">%1$s</xliff:g> ileti var"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Otomatik senkronizasyon açılsın mı?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Yalnızca Gmail değil, tüm uygulamalarda ve hesaplarda yaptığınız değişiklikler web ile diğer cihazlarınız ve <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> arasında senkronize edilir."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"tablet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Aç"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> klasör göster"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"<xliff:g id="NUMBER">%1$s</xliff:g> klasör daha göster"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Klasörleri gizle"</string>
     <string name="print" msgid="7987949243936577207">"Yazdır"</string>
     <string name="print_all" msgid="4011022762279519941">"Tümünü yazdır"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Hesapları Yönet"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Genel ayarlar"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Ayarlar"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Diğer seçenekler"</string>
 </resources>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1e7f718..bf9a9c8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Зберегти як чернетку"</string>
     <string name="discard" msgid="4905982179911608430">"Закрити"</string>
     <string name="compose" msgid="2602861958391035523">"Написати"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Написати"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Відповісти"</item>
     <item msgid="2767793214788399009">"Відповісти всім"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Один або декілька файлів не вкладено. Максимальний розмір: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Файл не вкладено. Досягнуто максимального розміру: <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Не вдалося вкласти файл."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Відмовлено в доступі до вкладеного файлу."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Додайте принаймні одного отримувача."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Помилка отримувача"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Надіслати повідомлення?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Надіслати відгук"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Перемістити бесіду"</item>
+    <item quantity="other" msgid="6639576653114141743">"Перемістити бесід: <xliff:g id="ID_1">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, тема: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, тема: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> о <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"бесіду прочитано"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Див. деталі&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Сховати деталі"</string>
     <string name="to_message_header" msgid="3954385178027011919">"кому: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"Пр. копія "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Показати контактну інформацію відправника <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Показати контактну інформацію"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"Попередні повідомлення: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Завантаження старих повідомлень (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Від:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Відпов.:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Кому: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Папка \"Електронна пошта\""</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Змінити папки"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Перемістити в"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Пошук"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Пошук у пошті"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Цей пристрій не підтримує голосовий пошук."</string>
     <string name="network_error" msgid="5931164247644972255">"Немає з’єднання"</string>
     <string name="retry" msgid="916102442074217293">"Повторити спробу"</string>
     <string name="load_more" msgid="8702691358453560575">"Завантажити ще"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Без звуку"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Дія за умовчанням"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Архівування та видалення"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Архівувати"</item>
-    <item msgid="2567465476369142505">"Видалити"</item>
+    <item msgid="954772302016538814">"Показувати лише архівування"</item>
+    <item msgid="7212690302706180254">"Показувати лише видалення"</item>
+    <item msgid="2539051197590685708">"Показувати архівування та видалення"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Архівувати"</item>
-    <item msgid="6088164268501960435">"Видалити"</item>
+    <item msgid="6877416142040695022">"Показувати лише архівування"</item>
+    <item msgid="1510017057984222376">"Показувати лише видалення"</item>
+    <item msgid="3196207224108008441">"Показувати архівування та видалення"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Дія за умовчанням"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Архівування та видалення"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Відповісти всім"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Використовувати за умовчанням для відповідей на повідомлення"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Дії гортанням"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Провести пальцем, щоб архівувати"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Провести пальцем, щоб видалити"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"У списку бесід"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Зображення відправника"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Показувати біля імені в списку бесід"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Значок папки"</string>
     <string name="add_account" msgid="5905863370226612377">"Додати обліковий запис"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Закрити пораду"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Автоматичну синхронізацію вимкнено. Торкніться, щоб увімкнути."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Синхронізацію облікових записів вимкнено. Увімкнути її можна в &lt;a href=\'http://www.example.com\'&gt;налаштуваннях облікового запису.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"Ненадісланих листів у <xliff:g id="OUTBOX">%2$s</xliff:g>: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Увімкнути автоматичну синхронізацію?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Зміни, які ви вносите до всіх програм і облікових записів (не лише Gmail), синхронізуватимуться з веб-службами, іншими пристроями та вашим <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string>
     <string name="phone" msgid="4142617042507912053">"телефоном"</string>
     <string name="tablet" msgid="4593581125469224791">"планшетом"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Увімкнути"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Показати папки (<xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Показати інші папки (<xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Сховати папки"</string>
     <string name="print" msgid="7987949243936577207">"Друк"</string>
     <string name="print_all" msgid="4011022762279519941">"Друкувати все"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Керувати обліковими записами"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Загальні налаштування"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Налаштування"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Інші варіанти"</string>
 </resources>

diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 27c57dc..29f39cc 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"مسودہ محفوظ کریں"</string>
     <string name="discard" msgid="4905982179911608430">"مسترد کریں"</string>
     <string name="compose" msgid="2602861958391035523">"تحریر کریں"</string>
-    <string name="compose_title" msgid="5673376086133995913">"تحریر کریں"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"جواب دیں"</item>
     <item msgid="2767793214788399009">"سب کو جواب دیں"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"ایک یا زائد فائلیں منسلک نہیں ہوئیں۔ حد <xliff:g id="MAXSIZE">%1$s</xliff:g>۔"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"فائل منسلک نہیں ہے۔ <xliff:g id="MAXSIZE">%1$s</xliff:g> کی حد کو پہنچ گیا۔"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"فائل منسلک نہیں کی جاسکی۔"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"منسلکہ کیلئے اجازت مسترد کر دی گئی۔"</string>
     <string name="recipient_needed" msgid="319816879398937214">"کم از کم ایک وصول کنندہ شامل کریں۔"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"وصول کنندہ کی خرابی"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"پیغام بھیجیں؟"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"تاثرات بھیجیں"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"گفتگو منتقل کریں"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> گفتگوئیں منتقل کریں"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> کے بارے میں، <xliff:g id="SNIPPET">%4$s</xliff:g> بتاریخ <xliff:g id="DATE">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> کے بارے میں، <xliff:g id="SNIPPET">%4$s</xliff:g> بوقت <xliff:g id="TIME">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"گفتگو پڑھ لی گئی"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"‏<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;تفصیل دیکھیں&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"تفصیلات چھپائیں"</string>
     <string name="to_message_header" msgid="3954385178027011919">"بنام <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc:‎ "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> کیلئے رابطے کی معلومات دکھائیں"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"رابطے کی معلومات دکھائیں"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> قدیم تر پیغامات"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> پرانے پیغامات لوڈ ہو رہے ہیں"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"منجانب:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"جواب دیں بنام:"</string>
     <string name="to_heading" msgid="3495203282540398336">"بنام: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"ای میل فولڈر"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"فولڈرز تبدیل کریں"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"اس میں منتقل کریں"</string>
-    <string name="search_hint" msgid="7060626585689391003">"تلاش کریں"</string>
+    <string name="search_hint" msgid="4916671414132334289">"میل تلاش کریں"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"صوتی تلاش اس آلہ پر تعاون یافتہ نہیں ہے۔"</string>
     <string name="network_error" msgid="5931164247644972255">"کوئی کنکشن نہیں ہے"</string>
     <string name="retry" msgid="916102442074217293">"دوبارہ کوشش کریں"</string>
     <string name="load_more" msgid="8702691358453560575">"مزید لوڈ کریں"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"خاموش"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"ڈیفالٹ کارروائی"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"‏آرکائیو کرنے اور‎ حذف کرنے کی کارروائیاں"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"آرکائیو کریں"</item>
-    <item msgid="2567465476369142505">"حذف کریں"</item>
+    <item msgid="954772302016538814">"صرف آرکائیو دکھائیں"</item>
+    <item msgid="7212690302706180254">"صرف حذف دکھائیں"</item>
+    <item msgid="2539051197590685708">"آرکائیو اور حذف کریں دکھائیں"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"آرکائیو کریں"</item>
-    <item msgid="6088164268501960435">"حذف کریں"</item>
+    <item msgid="6877416142040695022">"صرف آرکائیو دکھائیں"</item>
+    <item msgid="1510017057984222376">"صرف حذف کریں دکھائیں"</item>
+    <item msgid="3196207224108008441">"آرکائیو اور حذف کریں دکھائیں"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"ڈیفالٹ کارروائی"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"کارروائیاں آرکائیو اور حذف کریں"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"سب کو جواب دیں"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"پیغام کے جوابات کیلئے بطور ڈیفالٹ استعمال کریں"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"سوائپ کارروائیاں"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"آرکائیو کرنے کیلئے سوائپ کریں"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"حذف کرنے کیلئے سوائپ کریں"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"گفتگو کی فہرست میں"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"مرسل کی تصویر"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"گفتگو کی فہرست میں نام کے ساتھ دکھائیں"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"فولڈر کا آئیکن"</string>
     <string name="add_account" msgid="5905863370226612377">"اکاؤنٹ شامل کریں"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"تجویز برخاست کریں"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"خود کار مطابقت پذیری آف ہے۔ آن کرنے کیلئے ٹچ کریں"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"‏اکاؤنٹ کی مطابقت پذیری آف ہے۔ ‎&lt;a href=\'http://www.example.com\'&gt;‎اکاؤنٹ کی ترتیبات‎&lt;/a&gt;‎ میں آن کریں۔"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> میں <xliff:g id="NUMBER">%1$s</xliff:g> غیر مرسلہ"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"خودکار مطابقت پذیری آن کریں؟"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"‏صرف Gmail نہیں بلکہ سبھی ایپس اور اکاؤنٹس میں آپ جو تبدیلیاں کرتے ہیں وہ ویب، آپ کے دوسرے آلات اور آپ کے <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> کے بیچ مطابقت پذیر ہوں گی۔"</string>
     <string name="phone" msgid="4142617042507912053">"فون"</string>
     <string name="tablet" msgid="4593581125469224791">"ٹیبلٹ"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"آن کریں"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"<xliff:g id="NUMBER">%1$s</xliff:g> فولڈرز دکھائیں"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"<xliff:g id="NUMBER">%1$s</xliff:g> مزید فولڈرز دکھائیں"</string>
     <string name="hide_folders" msgid="7618891933409521283">"فولڈرز چھپائیں"</string>
     <string name="print" msgid="7987949243936577207">"پرنٹ کریں"</string>
     <string name="print_all" msgid="4011022762279519941">"سبھی پرنٹ کریں"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"اکاؤنٹس کا نظم کریں"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"عام ترتیبات"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"ترتیبات"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"مزید اختیارات"</string>
 </resources>

diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 18d08a7..bc0530e 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml

@@ -30,8 +30,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Qoralamani saqlash"</string>
     <string name="discard" msgid="4905982179911608430">"Bekor qilish"</string>
     <string name="compose" msgid="2602861958391035523">"Xat yozish"</string>
-    <!-- no translation found for compose_title (5673376086133995913) -->
-    <skip />
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Javob berish"</item>
     <item msgid="2767793214788399009">"Barchasiga"</item>
@@ -46,8 +44,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Bir yoki undan ortiq fayllar biriktirilmadi: cheklovdan (<xliff:g id="MAXSIZE">%1$s</xliff:g>) oshib ketdi."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Faylni biriktirib bo‘lmadi: cheklovdan (<xliff:g id="MAXSIZE">%1$s</xliff:g>) oshib ketdi."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Faylni biriktirib bo‘lmadi."</string>
-    <!-- no translation found for attachment_permission_denied (2274397783497640486) -->
-    <skip />
     <string name="recipient_needed" msgid="319816879398937214">"Kamida bitta qabul qiluvchini ko‘rsating."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Qabul qiluvchi bilan bog‘liq xatolik"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Xabar yuborilsinmi?"</string>
@@ -137,6 +133,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Fikr va mulohaza yuborish"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Suhbatni ko‘chirish"</item>
+    <item quantity="other" msgid="6639576653114141743">"<xliff:g id="ID_1">%1$d</xliff:g> ta suhbatni ko‘chirish"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g>: <xliff:g id="PARTICIPANT">%2$s</xliff:g>. Mavzu: <xliff:g id="SUBJECT">%3$s</xliff:g>. Lavha: <xliff:g id="SNIPPET">%4$s</xliff:g>. <xliff:g id="READSTATE">%6$s</xliff:g>: <xliff:g id="DATE">%5$s</xliff:g>."</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g>: <xliff:g id="PARTICIPANT">%2$s</xliff:g>. Mavzu: <xliff:g id="SUBJECT">%3$s</xliff:g>. Lavha: <xliff:g id="SNIPPET">%4$s</xliff:g>. <xliff:g id="READSTATE">%6$s</xliff:g>: <xliff:g id="TIME">%5$s</xliff:g>."</string>
     <string name="read_string" msgid="5495929677508576520">"suhbat o‘qilgan"</string>
@@ -224,14 +224,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Tafsilotlarni ko‘rish&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Tafsilotlarni yashirish"</string>
     <string name="to_message_header" msgid="3954385178027011919">"Kimga: <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <!-- no translation found for bcc_header_for_recipient_summary (1834716758549842454) -->
-    <skip />
     <string name="contact_info_string" msgid="6484930184867405276">"<xliff:g id="NAME">%1$s</xliff:g> foydalanuvchisining aloqa ma’lumotlarini ko‘rsatish"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Aloqa ma’lumotlarini ko‘rsatish"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ta eski xabar"</item>
   </plurals>
-    <!-- no translation found for super_collapsed_loading_content_description:other (678491885491918982) -->
     <string name="from_heading" msgid="48290556829713090">"Kimdan:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Javob berish:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Kimga: "</string>
@@ -289,12 +286,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"E-pochta jildi"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Jildlarni o‘zgartirish"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Ko‘chirish"</string>
-    <!-- no translation found for search_hint (7060626585689391003) -->
-    <skip />
+    <string name="search_hint" msgid="4916671414132334289">"E-pochtadan qidirish"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <!-- no translation found for voice_search_not_supported (8493517060419469738) -->
-    <skip />
     <string name="network_error" msgid="5931164247644972255">"Internetga ulanmagan"</string>
     <string name="retry" msgid="916102442074217293">"Qayta urinish"</string>
     <string name="load_more" msgid="8702691358453560575">"Ko‘proq yuklash"</string>
@@ -361,18 +355,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Ovozsiz"</string>
-    <!-- no translation found for preference_removal_action_title (3128186577060329884) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (7381624742404593351) -->
-    <!-- no translation found for prefEntries_removal_action:1 (2567465476369142505) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (4080896545573973751) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (6088164268501960435) -->
-    <!-- no translation found for prefDialogTitle_removal_action (7914272565548361304) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Arxivlash va o‘chirish amallari"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="954772302016538814">"Faqat arxivni ko‘rsatish"</item>
+    <item msgid="7212690302706180254">"Faqat o‘chirish"</item>
+    <item msgid="2539051197590685708">"Arxivlash yoki o‘chirish"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="6877416142040695022">"Faqat arxivni ko‘rsatish"</item>
+    <item msgid="1510017057984222376">"Faqat o‘chirish"</item>
+    <item msgid="3196207224108008441">"Arxivlash yoki o‘chirish"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Arxivlash va o‘chirish amallari"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Barchasiga javob berish"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Barcha javoblar uchun standart sifatida foydalanish"</string>
-    <!-- no translation found for preference_swipe_title (2073613840893904205) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Arxivlash uchun surish"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"O‘chirib tashlash uchun suring"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Suhbatlar ro‘yxatida"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Yuboruvchining rasmi"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Suhbatlar ro‘yxatida ismlar yonida ko‘rsatish"</string>
@@ -391,18 +389,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Jild ikonkasi"</string>
     <string name="add_account" msgid="5905863370226612377">"Hisob qo‘shish"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Maslahatni yopish"</string>
-    <!-- no translation found for auto_sync_off (3691189864057581214) -->
-    <skip />
-    <!-- no translation found for account_sync_off (5720018952998097061) -->
-    <skip />
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"“<xliff:g id="OUTBOX">%2$s</xliff:g>” jildidagi yuborilmagan xabarlar soni: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Avto-sinxronlash yoqilsinmi?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Barcha ilova va hisoblarga (nafaqat Gmail) kiritgan o‘zgartirishlaringiz Internet, boshqa qurilmalaringiz va <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> o‘rtasida sinxronlanadi."</string>
     <string name="phone" msgid="4142617042507912053">"telefon"</string>
     <string name="tablet" msgid="4593581125469224791">"planshet"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Yoqish"</string>
-    <!-- no translation found for show_n_more_folders (1005879825500056552) -->
-    <skip />
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Yana <xliff:g id="NUMBER">%1$s</xliff:g> ta jildni ko‘rsatish"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Jildlarni yashirish"</string>
     <string name="print" msgid="7987949243936577207">"Chop qilish"</string>
     <string name="print_all" msgid="4011022762279519941">"Barchasini chop qilish"</string>
@@ -484,6 +477,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Hisoblarni boshqarish"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Umumiy sozlamalar"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Sozlamalar"</string>
-    <!-- no translation found for overflow_description (7886090597023240426) -->
-    <skip />
 </resources>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 33f918f..4fc2e5a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Lưu bản nháp"</string>
     <string name="discard" msgid="4905982179911608430">"Loại bỏ"</string>
     <string name="compose" msgid="2602861958391035523">"Soạn thư"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Soạn thư"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Trả lời"</item>
     <item msgid="2767793214788399009">"Trả lời tất cả"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Một hoặc nhiều tệp không được đính kèm. Giới hạn <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Tệp không được đính kèm. Đã đạt giới hạn <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Không thể đính kèm tệp."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Quyền bị từ chối cho tệp đính kèm."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Thêm ít nhất một người nhận."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Lỗi người nhận"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Gửi tin nhắn?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Gửi phản hồi"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Di chuyển cuộc hội thoại"</item>
+    <item quantity="other" msgid="6639576653114141743">"Di chuyển <xliff:g id="ID_1">%1$d</xliff:g> cuộc hội thoại"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> về <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> vào <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> về <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> lúc <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"cuộc trò chuyện đã đọc"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Xem chi tiết&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Ẩn chi tiết"</string>
     <string name="to_message_header" msgid="3954385178027011919">"tới <xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Hiển thị thông tin liên hệ cho <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Hiển thị thông tin liên hệ"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> thư cũ hơn"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Đang tải <xliff:g id="COUNT">%1$d</xliff:g> thư cũ hơn"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Từ:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Trả lời"</string>
     <string name="to_heading" msgid="3495203282540398336">"Tới: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Thư mục Email"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Thay đổi thư mục"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Di chuyển tới"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Tìm kiếm"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Tìm kiếm trong thư"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Tìm kiếm bằng giọng nói không được hỗ trợ trên thiết bị này."</string>
     <string name="network_error" msgid="5931164247644972255">"Không có kết nối"</string>
     <string name="retry" msgid="916102442074217293">"Thử lại"</string>
     <string name="load_more" msgid="8702691358453560575">"Tải thêm"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Im lặng"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Hành động mặc định"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Tác vụ lưu trữ và xóa"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Lưu trữ"</item>
-    <item msgid="2567465476369142505">"Xóa"</item>
+    <item msgid="954772302016538814">"Chỉ hiển thị tác vụ lưu trữ"</item>
+    <item msgid="7212690302706180254">"Chỉ hiển thị tác vụ xóa"</item>
+    <item msgid="2539051197590685708">"Hiển thị tác vụ lưu trữ và xóa"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Lưu trữ"</item>
-    <item msgid="6088164268501960435">"Xóa"</item>
+    <item msgid="6877416142040695022">"Chỉ hiển thị tác vụ lưu trữ"</item>
+    <item msgid="1510017057984222376">"Chỉ hiển thị tác vụ xóa"</item>
+    <item msgid="3196207224108008441">"Hiển thị tác vụ lưu trữ và xóa"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Hành động mặc định"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Tác vụ lưu trữ và xóa"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Trả lời tất cả"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Sử dụng làm mặc định cho trả lời thư"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Hành động vuốt"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Vuốt để lưu trữ"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Vuốt để xóa"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Trong danh sách cuộc hội thoại"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Ảnh người gửi"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Hiển thị bên cạnh tên trong danh sách cuộc hội thoại"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Biểu tượng thư mục"</string>
     <string name="add_account" msgid="5905863370226612377">"Thêm tài khoản"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Bỏ qua mẹo"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Tự động đồng bộ hóa bị tắt. Chạm để bật."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Đồng bộ hóa tài khoản tắt. Hãy bật trong &lt;a href=\'http://www.example.com\'&gt;Cài đặt tài khoản.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> thư chưa được gửi trong <xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Bật tự động đồng bộ hóa?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Các thay đổi bạn thực hiện đối với tất cả các ứng dụng và tài khoản, không chỉ với Gmail, sẽ được đồng bộ hóa giữa web, các thiết bị khác của bạn và <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> của bạn."</string>
     <string name="phone" msgid="4142617042507912053">"điện thoại"</string>
     <string name="tablet" msgid="4593581125469224791">"máy tính bảng"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Bật"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Hiển thị <xliff:g id="NUMBER">%1$s</xliff:g> thư mục"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Hiển thị thêm <xliff:g id="NUMBER">%1$s</xliff:g> thư mục"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Ẩn thư mục"</string>
     <string name="print" msgid="7987949243936577207">"In"</string>
     <string name="print_all" msgid="4011022762279519941">"In tất cả"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Quản lý tài khoản"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Cài đặt chung"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Cài đặt"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Tùy chọn khác"</string>
 </resources>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6b57ca7..866b37c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"保存草稿"</string>
     <string name="discard" msgid="4905982179911608430">"舍弃"</string>
     <string name="compose" msgid="2602861958391035523">"写邮件"</string>
-    <string name="compose_title" msgid="5673376086133995913">"写邮件"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"回复"</item>
     <item msgid="2767793214788399009">"全部回复"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"未能附加一个或多个文件。上限为 <xliff:g id="MAXSIZE">%1$s</xliff:g>。"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"未能附加文件。已达到上限 (<xliff:g id="MAXSIZE">%1$s</xliff:g>)。"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"无法附加文件。"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"没有权限添加附件。"</string>
     <string name="recipient_needed" msgid="319816879398937214">"请至少添加一位收件人。"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"收件人出错"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"要发送邮件吗？"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"发送反馈"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"移动会话"</item>
+    <item quantity="other" msgid="6639576653114141743">"移动 <xliff:g id="ID_1">%1$d</xliff:g> 个会话"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>；主题为<xliff:g id="SUBJECT">%3$s</xliff:g>；<xliff:g id="SNIPPET">%4$s</xliff:g>；<xliff:g id="DATE">%5$s</xliff:g>；<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>；主题为<xliff:g id="SUBJECT">%3$s</xliff:g>；<xliff:g id="SNIPPET">%4$s</xliff:g>；<xliff:g id="TIME">%5$s</xliff:g>；<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"已读会话"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g>&lt;a href=\'http://www.example.com\'&gt;查看详情&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"隐藏详细信息"</string>
     <string name="to_message_header" msgid="3954385178027011919">"收件人：<xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"密送： "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"显示<xliff:g id="NAME">%1$s</xliff:g>的联系人信息"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"显示联系人信息"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g>封较早的邮件"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"正在加载<xliff:g id="COUNT">%1$d</xliff:g>封较早的邮件"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"发件人："</string>
     <string name="replyto_heading" msgid="8275255318292059079">"回复："</string>
     <string name="to_heading" msgid="3495203282540398336">"收件人： "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"“电子邮件”文件夹"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"更改文件夹"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"移至"</string>
-    <string name="search_hint" msgid="7060626585689391003">"搜索"</string>
+    <string name="search_hint" msgid="4916671414132334289">"搜索邮件"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"此设备不支持语音搜索。"</string>
     <string name="network_error" msgid="5931164247644972255">"无连接"</string>
     <string name="retry" msgid="916102442074217293">"重试"</string>
     <string name="load_more" msgid="8702691358453560575">"加载更多"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"静音"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"默认操作"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"归档和删除操作"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"归档"</item>
-    <item msgid="2567465476369142505">"删除"</item>
+    <item msgid="954772302016538814">"仅显示归档"</item>
+    <item msgid="7212690302706180254">"仅显示删除"</item>
+    <item msgid="2539051197590685708">"显示归档和删除"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"归档"</item>
-    <item msgid="6088164268501960435">"删除"</item>
+    <item msgid="6877416142040695022">"仅显示归档"</item>
+    <item msgid="1510017057984222376">"仅显示删除"</item>
+    <item msgid="3196207224108008441">"显示归档和删除"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"默认操作"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"归档和删除操作"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"全部回复"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"用作默认的邮件回复方式"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"滑动操作"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"滑动即可归档"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"滑动删除邮件"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"在会话列表中"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"发件人头像"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"在会话列表中的姓名旁显示"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"文件夹图标"</string>
     <string name="add_account" msgid="5905863370226612377">"添加帐户"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"忽略提示"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"自动同步功能已关闭。触摸即可开启。"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"帐户同步设置已关闭。请在&lt;a href=\'http://www.example.com\'&gt;帐户设置&lt;/a&gt;中开启。"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>中有<xliff:g id="NUMBER">%1$s</xliff:g>封未发送的邮件"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"要开启自动同步功能吗？"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"您对所有应用和帐户（不只是 Gmail）所做的更改都会在网络、您的其他设备和您的<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>之间同步。"</string>
     <string name="phone" msgid="4142617042507912053">"手机"</string>
     <string name="tablet" msgid="4593581125469224791">"平板电脑"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"开启"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"显示<xliff:g id="NUMBER">%1$s</xliff:g>个文件夹"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"显示另外<xliff:g id="NUMBER">%1$s</xliff:g>个文件夹"</string>
     <string name="hide_folders" msgid="7618891933409521283">"隐藏文件夹"</string>
     <string name="print" msgid="7987949243936577207">"打印"</string>
     <string name="print_all" msgid="4011022762279519941">"全部打印"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"管理帐户"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"常规设置"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"设置"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"更多选项"</string>
 </resources>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e8a8960..f425aea 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"儲存草稿"</string>
     <string name="discard" msgid="4905982179911608430">"捨棄"</string>
     <string name="compose" msgid="2602861958391035523">"撰寫"</string>
-    <string name="compose_title" msgid="5673376086133995913">"撰寫"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"回覆"</item>
     <item msgid="2767793214788399009">"全部回覆"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"無法附加一個或多個檔案 (大小上限：<xliff:g id="MAXSIZE">%1$s</xliff:g>)。"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"無法附加檔案，檔案大小已達 <xliff:g id="MAXSIZE">%1$s</xliff:g> 的上限。"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"無法附加檔案。"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"權限被拒，無法加入附件。"</string>
     <string name="recipient_needed" msgid="319816879398937214">"請至少加入一名收件者。"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"收件者錯誤"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"傳送郵件？"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"傳送意見"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"移動對話群組"</item>
+    <item quantity="other" msgid="6639576653114141743">"移動 <xliff:g id="ID_1">%1$d</xliff:g> 個對話群組"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g>：<xliff:g id="PARTICIPANT">%2$s</xliff:g>，主旨：<xliff:g id="SUBJECT">%3$s</xliff:g>，訊息摘錄：<xliff:g id="SNIPPET">%4$s</xliff:g>，日期：<xliff:g id="DATE">%5$s</xliff:g>，閱讀狀態：<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g>：<xliff:g id="PARTICIPANT">%2$s</xliff:g>，主旨：<xliff:g id="SUBJECT">%3$s</xliff:g>，訊息摘錄：<xliff:g id="SNIPPET">%4$s</xliff:g>，時間：<xliff:g id="TIME">%5$s</xliff:g>，閱讀狀態：<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"已讀取對話群組"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;查看詳細資料&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"隱藏詳細資料"</string>
     <string name="to_message_header" msgid="3954385178027011919">"收件者：<xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"密件副本： "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"顯示 <xliff:g id="NAME">%1$s</xliff:g> 的聯絡資料"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"顯示聯絡資料"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> 封較舊的郵件"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"正在載入 <xliff:g id="COUNT">%1$d</xliff:g> 封較舊的郵件"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"寄件者："</string>
     <string name="replyto_heading" msgid="8275255318292059079">"回覆："</string>
     <string name="to_heading" msgid="3495203282540398336">"收件者： "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"電郵資料夾"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"更改資料夾"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"移至"</string>
-    <string name="search_hint" msgid="7060626585689391003">"搜尋"</string>
+    <string name="search_hint" msgid="4916671414132334289">"搜尋郵件"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"這部裝置不支援語音搜尋。"</string>
     <string name="network_error" msgid="5931164247644972255">"沒有連線"</string>
     <string name="retry" msgid="916102442074217293">"重試"</string>
     <string name="load_more" msgid="8702691358453560575">"載入更多"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"靜音"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"預設動作"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"封存及刪除操作"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"封存"</item>
-    <item msgid="2567465476369142505">"刪除"</item>
+    <item msgid="954772302016538814">"只顯示封存"</item>
+    <item msgid="7212690302706180254">"只顯示刪除"</item>
+    <item msgid="2539051197590685708">"顯示封存及刪除"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"封存"</item>
-    <item msgid="6088164268501960435">"刪除"</item>
+    <item msgid="6877416142040695022">"只顯示封存"</item>
+    <item msgid="1510017057984222376">"只顯示刪除"</item>
+    <item msgid="3196207224108008441">"顯示封存及刪除"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"預設動作"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"封存及刪除操作"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"回覆所有人"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"設定為郵件回覆預設"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"滑動動作"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"快速滑動即可封存"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"快速滑動即可刪除"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"在對話群組清單中"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"寄件者圖片"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"在對話群組清單中的名稱旁邊顯示"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"資料夾圖示"</string>
     <string name="add_account" msgid="5905863370226612377">"新增帳戶"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"關閉提示"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"自動同步功能已關閉，輕觸即可開啟。"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"帳戶同步處理設定已關閉，您可以在&lt;a href=\'http://www.example.com\'&gt;帳戶設定&lt;/a&gt;開啟。"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>內有 <xliff:g id="NUMBER">%1$s</xliff:g> 封未傳送的郵件"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"開啟自動同步功能？"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"系統將在網上、您的其他裝置和您的<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>間，同步處理您對所有應用程式和帳戶 (不限於 Gmail) 所作的變更。"</string>
     <string name="phone" msgid="4142617042507912053">"手機"</string>
     <string name="tablet" msgid="4593581125469224791">"平板電腦"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"開啟"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"顯示 <xliff:g id="NUMBER">%1$s</xliff:g> 個資料夾"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"顯示另外 <xliff:g id="NUMBER">%1$s</xliff:g> 個資料夾"</string>
     <string name="hide_folders" msgid="7618891933409521283">"隱藏資料夾"</string>
     <string name="print" msgid="7987949243936577207">"列印"</string>
     <string name="print_all" msgid="4011022762279519941">"全部列印"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"管理帳戶"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"一般設定"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"設定"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"更多選項"</string>
 </resources>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 07a5661..407f031 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"儲存草稿"</string>
     <string name="discard" msgid="4905982179911608430">"捨棄"</string>
     <string name="compose" msgid="2602861958391035523">"撰寫"</string>
-    <string name="compose_title" msgid="5673376086133995913">"撰寫"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"回覆"</item>
     <item msgid="2767793214788399009">"回覆所有人"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"無法附加一或多個檔案 (大小上限：<xliff:g id="MAXSIZE">%1$s</xliff:g>)。"</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"無法附加檔案。檔案大小已達上限 <xliff:g id="MAXSIZE">%1$s</xliff:g>。"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"無法附加檔案。"</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"權限遭拒，無法加入附件。"</string>
     <string name="recipient_needed" msgid="319816879398937214">"請至少新增一位收件者。"</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"收件者錯誤"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"傳送郵件？"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"提供意見"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"移動會話群組"</item>
+    <item quantity="other" msgid="6639576653114141743">"移動 <xliff:g id="ID_1">%1$d</xliff:g> 個會話群組"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g>：<xliff:g id="PARTICIPANT">%2$s</xliff:g>、主旨：<xliff:g id="SUBJECT">%3$s</xliff:g>、摘要：<xliff:g id="SNIPPET">%4$s</xliff:g>、日期：<xliff:g id="DATE">%5$s</xliff:g>、閱讀狀態：<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>：主題為<xliff:g id="SUBJECT">%3$s</xliff:g>；<xliff:g id="SNIPPET">%4$s</xliff:g>；<xliff:g id="TIME">%5$s</xliff:g>；<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"已閱讀的會話群組"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;查看詳細資料&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"隱藏詳細資料"</string>
     <string name="to_message_header" msgid="3954385178027011919">"寄給<xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"密件副本： "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"顯示 <xliff:g id="NAME">%1$s</xliff:g> 的聯絡人資訊"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"顯示聯絡人資訊"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> 封較舊的郵件"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"正在載入 <xliff:g id="COUNT">%1$d</xliff:g> 封較舊的郵件"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"寄件者："</string>
     <string name="replyto_heading" msgid="8275255318292059079">"回覆："</string>
     <string name="to_heading" msgid="3495203282540398336">"收件者： "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"電子郵件資料夾"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"變更資料夾"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"移至"</string>
-    <string name="search_hint" msgid="7060626585689391003">"搜尋"</string>
+    <string name="search_hint" msgid="4916671414132334289">"搜尋郵件"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"這個裝置不支援語音搜尋。"</string>
     <string name="network_error" msgid="5931164247644972255">"沒有網路連線"</string>
     <string name="retry" msgid="916102442074217293">"重試"</string>
     <string name="load_more" msgid="8702691358453560575">"載入更多"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"靜音"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"預設動作"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"封存及刪除動作"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"封存"</item>
-    <item msgid="2567465476369142505">"刪除"</item>
+    <item msgid="954772302016538814">"僅顯示封存郵件的按鈕"</item>
+    <item msgid="7212690302706180254">"僅顯示刪除郵件的按鈕"</item>
+    <item msgid="2539051197590685708">"顯示封存和刪除郵件的按鈕"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"封存"</item>
-    <item msgid="6088164268501960435">"刪除"</item>
+    <item msgid="6877416142040695022">"僅顯示封存郵件的按鈕"</item>
+    <item msgid="1510017057984222376">"僅顯示刪除郵件的按鈕"</item>
+    <item msgid="3196207224108008441">"顯示封存和刪除郵件的按鈕"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"預設動作"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"封存及刪除動作"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"回覆所有人"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"設為預設回信方式"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"滑動動作"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"滑動即可封存"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"滑動即可刪除"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"在會話群組清單中"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"寄件者圖片"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"在會話群組清單中的名稱旁邊顯示"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"資料夾圖示"</string>
     <string name="add_account" msgid="5905863370226612377">"新增帳戶"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"關閉提示"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"自動同步功能已關閉，輕觸即可開啟。"</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"帳戶同步處理設定已關閉，您可以前往&lt;a href=\'http://www.example.com\'&gt;帳戶設定&lt;/a&gt;開啟。"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g>內有 <xliff:g id="NUMBER">%1$s</xliff:g> 封未傳送的郵件"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"開啟自動同步功能？"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"您對所有應用程式和帳戶 (不限於 Gmail) 所做的變更一律會在網路、您的其他裝置和您的<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>之間保持同步。"</string>
     <string name="phone" msgid="4142617042507912053">"手機"</string>
     <string name="tablet" msgid="4593581125469224791">"平板電腦"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"開啟"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"顯示 <xliff:g id="NUMBER">%1$s</xliff:g> 個資料夾"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"顯示另外 <xliff:g id="NUMBER">%1$s</xliff:g> 個資料夾"</string>
     <string name="hide_folders" msgid="7618891933409521283">"隱藏資料夾"</string>
     <string name="print" msgid="7987949243936577207">"列印"</string>
     <string name="print_all" msgid="4011022762279519941">"全部列印"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"管理帳戶"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"一般設定"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"設定"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"更多選項"</string>
 </resources>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f4f5c82..0ae3b25 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -29,7 +29,6 @@
     <string name="save_draft" msgid="2669523480789672118">"Londoloza okusazolungiswa"</string>
     <string name="discard" msgid="4905982179911608430">"Lahla"</string>
     <string name="compose" msgid="2602861958391035523">"Bhala"</string>
-    <string name="compose_title" msgid="5673376086133995913">"Bhala"</string>
   <string-array name="compose_modes">
     <item msgid="9000553538766397816">"Phendula"</item>
     <item msgid="2767793214788399009">"Phendula konke"</item>
@@ -44,7 +43,6 @@
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"Ifayela elilodwa noma amaningi awanamathiselwe. Umkhawulo <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
     <string name="too_large_to_attach_additional" msgid="4964155563465970480">"Ifayela alinamathiselwe. Umkhawulo ongu-<xliff:g id="MAXSIZE">%1$s</xliff:g> ufinyelelwe."</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"Ayikwazi ukunamathelisa ifayela."</string>
-    <string name="attachment_permission_denied" msgid="2274397783497640486">"Imvume inqatshelwe kokunamathiselwe."</string>
     <string name="recipient_needed" msgid="319816879398937214">"Ngeza okungenani umamukeli oyedwa."</string>
     <string name="recipient_error_dialog_title" msgid="760741480291963706">"Iphutha Lomamukeli"</string>
     <string name="confirm_send_title" msgid="4664971589247101530">"Thumela umlayezo?"</string>
@@ -133,6 +131,10 @@
     <string name="contextmenu_feedback" msgid="8319100902136337085">"Thumela impendulo"</string>
     <!-- no translation found for num_selected (7990204488812654380) -->
     <skip />
+  <plurals name="move_conversation">
+    <item quantity="one" msgid="237882018518207244">"Hambisa ingxoxo"</item>
+    <item quantity="other" msgid="6639576653114141743">"Hambisa izingxoxo <xliff:g id="ID_1">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> mayelana ne-<xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ngomhla ka-<xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> mayelana ne-<xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ngo-<xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
     <string name="read_string" msgid="5495929677508576520">"inkulumo efundiwe"</string>
@@ -220,15 +222,11 @@
     <string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;View details&lt;/a&gt;"</string>
     <string name="hide_details" msgid="8018801050702453314">"Fihla imininingwane"</string>
     <string name="to_message_header" msgid="3954385178027011919">"kuya ku-<xliff:g id="RECIPIENTS">%1$s</xliff:g>"</string>
-    <string name="bcc_header_for_recipient_summary" msgid="1834716758549842454">"bcc: "</string>
     <string name="contact_info_string" msgid="6484930184867405276">"Khombisa imininingwane yokuxhumana ka-<xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="6204228921864816351">"Bonisa ulwazi loxhumana naye"</string>
   <plurals name="show_messages_read">
     <item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emidala"</item>
   </plurals>
-  <plurals name="super_collapsed_loading_content_description">
-    <item quantity="other" msgid="678491885491918982">"Ilayisha imilayezo emidala engu-<xliff:g id="COUNT">%1$d</xliff:g>"</item>
-  </plurals>
     <string name="from_heading" msgid="48290556829713090">"Kusuka:"</string>
     <string name="replyto_heading" msgid="8275255318292059079">"Phendula-ku:"</string>
     <string name="to_heading" msgid="3495203282540398336">"Ku: "</string>
@@ -286,10 +284,9 @@
     <string name="folder_shortcut_widget_label" msgid="6466292659577092915">"Ifolda ye-imeyili"</string>
     <string name="change_folders_selection_dialog_title" msgid="9174464298613273814">"Shintsha amafolda"</string>
     <string name="move_to_selection_dialog_title" msgid="4052506464467083621">"Hambisa ku-"</string>
-    <string name="search_hint" msgid="7060626585689391003">"Sesha"</string>
+    <string name="search_hint" msgid="4916671414132334289">"Sesha imeyili"</string>
     <!-- no translation found for search_results_loaded (1784879343458807514) -->
     <skip />
-    <string name="voice_search_not_supported" msgid="8493517060419469738">"Ukusesha ngezwi akusekelwe kule divayisi."</string>
     <string name="network_error" msgid="5931164247644972255">"Akukho ukuxhumana"</string>
     <string name="retry" msgid="916102442074217293">"Zama kabusha"</string>
     <string name="load_more" msgid="8702691358453560575">"Layisha okuningi"</string>
@@ -356,19 +353,22 @@
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="1570794756474381886">"Thulile"</string>
-    <string name="preference_removal_action_title" msgid="3128186577060329884">"Isenzo esizenzakalelayo"</string>
+    <string name="preference_removal_action_title" msgid="4703834472477137634">"Izenzo zokufaka kungobo yomlando nokususa"</string>
   <string-array name="prefEntries_removal_action">
-    <item msgid="7381624742404593351">"Ingobo yomlando"</item>
-    <item msgid="2567465476369142505">"Susa"</item>
+    <item msgid="954772302016538814">"Bonisa ingobo yomlando kuphela"</item>
+    <item msgid="7212690302706180254">"Bonisa ukususa kuphela"</item>
+    <item msgid="2539051197590685708">"Bonisa ingobo yomlando nokususa"</item>
   </string-array>
   <string-array name="prefSummaries_removal_action_summary">
-    <item msgid="4080896545573973751">"Ingobo yomlando"</item>
-    <item msgid="6088164268501960435">"Susa"</item>
+    <item msgid="6877416142040695022">"Bonisa ingobo yomlando kuphela"</item>
+    <item msgid="1510017057984222376">"Bonisa ukususa kuphela"</item>
+    <item msgid="3196207224108008441">"Bonisa ingobo yomlando nokususa"</item>
   </string-array>
-    <string name="prefDialogTitle_removal_action" msgid="7914272565548361304">"Isenzo esizenzakalelayo"</string>
+    <string name="prefDialogTitle_removal_action" msgid="266548424110393246">"Izenzo zokufaka kungobo yomlando nokususa"</string>
     <string name="preferences_default_reply_all_title" msgid="7255858488369635327">"Phendula konke"</string>
     <string name="preferences_default_reply_all_summary_impl" msgid="895581085692979709">"Sebenzisa njengokuzenzakalelayo kuzimpendulo zomlayezo"</string>
-    <string name="preference_swipe_title" msgid="2073613840893904205">"Izenzo zokuswayipha"</string>
+    <string name="preference_swipe_title_archive" msgid="9122333537761282714">"Swayipha ukuze ufake kungobo yomlando"</string>
+    <string name="preference_swipe_title_delete" msgid="4860474024917543711">"Swayipha ukuze ususe"</string>
     <string name="preference_swipe_description" msgid="3036560323237015010">"Ohlwini lengxoxo"</string>
     <string name="preference_sender_image_title" msgid="7890813537985591865">"Isithombe somthumeli"</string>
     <string name="preference_sender_image_description" msgid="3586817690132199889">"Bonisa eduze kwegama kuhlu lwengxoxo"</string>
@@ -387,15 +387,13 @@
     <string name="folder_icon_desc" msgid="6272938864914794739">"Isithonjana sefolda"</string>
     <string name="add_account" msgid="5905863370226612377">"Engeza i-akhawunti"</string>
     <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Cashisa ithiphu"</string>
-    <string name="auto_sync_off" msgid="3691189864057581214">"Ukuvumelanisa okuzenzakalelayo kuvaliwe. Thinta ukuze uvule."</string>
-    <string name="account_sync_off" msgid="5720018952998097061">"Ukuvumelanisa kwe-akhawunti kuvaliwe. Vula kokuthi &lt;a href=\'http://www.example.com\'&gt;Izilungiselelo ze-akhawunti.&lt;/a&gt;"</string>
     <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> akuthunyelwanga ku-<xliff:g id="OUTBOX">%2$s</xliff:g>"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Vula ukuvumelanisa okuzenzekalelalayo?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Ushintsho olwenza kuzo zonke izinhlelo zokusebenza nama-akhawunti, hhayi nje ku-Gmail kuphela, luzovumelaniswa phakathi kwewebhu, amanye amadivayisi wakho ne-<xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> yakho."</string>
     <string name="phone" msgid="4142617042507912053">"ifoni"</string>
     <string name="tablet" msgid="4593581125469224791">"ithebulethi"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"Vula"</string>
-    <string name="show_n_more_folders" msgid="1005879825500056552">"Bonisa amafolda angu-<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
+    <string name="show_n_more_folders" msgid="5769610839632786654">"Bonisa amafolda amaningi angu-<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="hide_folders" msgid="7618891933409521283">"Fihla amafolda"</string>
     <string name="print" msgid="7987949243936577207">"Phrinta"</string>
     <string name="print_all" msgid="4011022762279519941">"Phrinta konke"</string>
@@ -477,5 +475,4 @@
     <string name="manage_accounts_menu_item" msgid="4734660452395086786">"Phatha ama-akhawunti"</string>
     <string name="general_preferences_title" msgid="4212138728220418162">"Izilungiselelo ezijwayelekile"</string>
     <string name="activity_preferences" msgid="8966077432517613292">"Izilungiselelo"</string>
-    <string name="overflow_description" msgid="7886090597023240426">"Okunye ongakhetha kukho"</string>
 </resources>
commit	99710c6cef8a0537c85afcd2618d95c7755865e6	[log] [tgz]
author	James Lemieux <jplemieux@google.com>	Sun Nov 02 18:57:49 2014 +0000
committer	Android Git Automerger <android-git-automerger@android.com>	Sun Nov 02 18:57:49 2014 +0000
tree	5955521c6f623975fb69913441fb10767bb22699
parent	9dada6a9d6ddfa99b1f204239b080121001a1c36 [diff]
parent	ccf9a34bcdcfdb884799ea3f3ecbd425970f26fc [diff]