Merge "Fix reply/forward to start the compose activity"

commit: 84da186d89e89679e20087327c1a25f0674f2e41 [log] [tgz]
author: Andy Huang <ath@google.com> Fri Mar 02 11:57:55 2012 -0800
committer: Android (Google) Code Review <android-gerrit@google.com> Fri Mar 02 11:57:55 2012 -0800
tree: 3131f6d9eba25799d363f0b3ff80e8df291f3fcd
parent: 5aa31fdb18a49e665be77f2b8c485837dbe71c0a [diff]
parent: f381651f75b320902576e211a91ff734e0ea05d1 [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 1a7e4cb..af6f8f0 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Daar is geen teks in die boodskaplyf nie."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Stuur hierdie boodskap?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Boodskap weggegooi."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Stuur"</string>
     <string name="mark_read" msgid="8438349154394313195">"Merk as gelees"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Merk as ongelees"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"ek"</string>
     <string name="labels" msgid="1519770547536283663">"Etikette"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Wys alle vouers"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Geen gesprekke nie."</string>
     <string name="undo" msgid="6070869718469782251">"Ontdoen"</string>
   <plurals name="conversation_marking_read">
@@ -239,18 +247,18 @@
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Om gesprekke te sien, sinkroniseer hierdie vouer."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkroniseer vouer"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <string name="view_more_conversations" msgid="3151067626309674344">"Bekyk meer gesprekke"</string>
+    <string name="view_more_conversations" msgid="3151067626309674344">"Sien nog gesprekke"</string>
     <string name="loading_conversation" msgid="489160038366067983">"Laai tans…"</string>
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Kies rekening"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Kies vouer"</string>
-    <string name="sync_all" msgid="1057043212338233359">"Sinkroniseer: Almal"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sinkroniseer: Alles"</string>
   <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sinkroniseer: Afgelope <xliff:g id="COUNT">%1$d</xliff:g> dae"</item>
+    <item quantity="one" msgid="137489911893192702">"Sinkroniseer: Afgelope <xliff:g id="COUNT">%1$d</xliff:g> dag"</item>
     <item quantity="other" msgid="6856940335775567991">"Sinkroniseer: Afgelope <xliff:g id="COUNT">%1$d</xliff:g> dae"</item>
   </plurals>
     <string name="sync_none" msgid="3581727068747471804">"Sinkroniseer: Geen"</string>
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sinkroniseer vouer"</string>
-    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Om gesprekke in die legkaartstuk te sien, sinchroniseer hierdie vouer."</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Om gesprekke in die legkaartstuk te sien, sinkroniseer hierdie vouer."</string>
     <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sinkroniseer afgelope <xliff:g id="NUMSYNCDAYS">%d</xliff:g> dae"</string>
     <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Verander vouers"</string>
 </resources>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index feb2576..ec69d08 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"በመልዕክቱ የመጻፊያ አካል ውስጥ ምንም ጹሁፍ የለም።"</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"ይህ መልዕክት ይላክ?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"መልዕክት ተወግዷል።"</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"ላክ"</string>
     <string name="mark_read" msgid="8438349154394313195">"መነበቡን ምልክት አድርግ"</string>
     <string name="mark_unread" msgid="6231373939351125713">"አለመነበቡን ምልክት አድርግ"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"እኔ"</string>
     <string name="labels" msgid="1519770547536283663">"መለያዎች"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"ሁሉንም አቃፊዎች አሳይ"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"ምንም ውይይቶች የሉም።"</string>
     <string name="undo" msgid="6070869718469782251">"ቀልብስ"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 48b573e..5e62fa7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"لا تحتوي الرسالة على نص."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"هل تريد إرسال هذه الرسالة؟"</string>
     <string name="message_discarded" msgid="5079975378884765445">"تمّ إلغاء الرسالة."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"إرسال"</string>
     <string name="mark_read" msgid="8438349154394313195">"وضع علامة كمقروء"</string>
     <string name="mark_unread" msgid="6231373939351125713">"وضع علامة كـ \"غير مقروءة\""</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"أنا"</string>
     <string name="labels" msgid="1519770547536283663">"التصنيفات"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"عرض جميع المجلدات"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"لا تتوفر محادثات."</string>
     <string name="undo" msgid="6070869718469782251">"تراجع"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 00718de..a521f83 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"У целе паведамлення няма тэксту."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Адправіць гэта паведамленне?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Паведамленне адменена."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Адправіць"</string>
     <string name="mark_read" msgid="8438349154394313195">"Пазначыць як прачытанае"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Пазначыць як непрачытанае"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"я"</string>
     <string name="labels" msgid="1519770547536283663">"Цэтлікі"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Паказаць усе тэчкі"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Няма размоў."</string>
     <string name="undo" msgid="6070869718469782251">"Адмянiць"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 28e0fe4..db83052 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Съобщението е празно. Не сте въвели нищо."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Да се изпрати ли това съобщение?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Съобщението е отхвърлено."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Изпращане"</string>
     <string name="mark_read" msgid="8438349154394313195">"Означаване като прочетено"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Означаване като непрочетено"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"аз"</string>
     <string name="labels" msgid="1519770547536283663">"Етикети"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Показване на всички папки"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Няма кореспонденции."</string>
     <string name="undo" msgid="6070869718469782251">"Отмяна"</string>
   <plurals name="conversation_marking_read">
@@ -219,10 +227,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Съобщението е запазено като чернова."</string>
     <string name="sending_message" msgid="1498583163419122128">"Съобщението се изпраща…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адресът <xliff:g id="WRONGEMAIL">%s</xliff:g> е невалиден."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Показване на цитирания текст"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Скриване на цитирания текст"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Готово"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a8dd9ba..144f1b9 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"No hi ha text al cos del missatge."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Vols enviar aquest missatge?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Missatge descartat."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Envia"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marca com a llegit"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Marca com a no llegit"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"jo"</string>
     <string name="labels" msgid="1519770547536283663">"Etiquetes"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Mostra totes les carpetes"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"No hi ha cap conversa."</string>
     <string name="undo" msgid="6070869718469782251">"Desfés"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c0a3e47..31b28cf 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"V těle zprávy není žádný text."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Odeslat tuto zprávu?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Zpráva byla zrušena."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Odeslat"</string>
     <string name="mark_read" msgid="8438349154394313195">"Označit jako přečtené"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Označit jako nepřečtené"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"já"</string>
     <string name="labels" msgid="1519770547536283663">"Štítky"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Zobrazit všechny složky"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Žádné konverzace"</string>
     <string name="undo" msgid="6070869718469782251">"Vrátit zpět"</string>
   <plurals name="conversation_marking_read">
@@ -241,16 +249,16 @@
     <string name="widget_large_unread_count" msgid="5668393672379294516">"&gt;%d"</string>
     <string name="view_more_conversations" msgid="3151067626309674344">"Zobrazit další konverzace"</string>
     <string name="loading_conversation" msgid="489160038366067983">"Načítá se..."</string>
-    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Volba účtu"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Výběr účtu"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Výběr složky"</string>
     <string name="sync_all" msgid="1057043212338233359">"Synchronizovat: vše"</string>
   <plurals name="sync_recent">
     <item quantity="one" msgid="137489911893192702">"Synchronizovat: <xliff:g id="COUNT">%1$d</xliff:g> den"</item>
-    <item quantity="other" msgid="6856940335775567991">"Synchronizovat <xliff:g id="COUNT">%1$d</xliff:g> d"</item>
+    <item quantity="other" msgid="6856940335775567991">"Synchronizovat <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
   </plurals>
     <string name="sync_none" msgid="3581727068747471804">"Synchronizovat: nic"</string>
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Synchronizace složky"</string>
     <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Chcete-li ve widgetu zobrazit konverzace, synchronizujte tuto složku."</string>
-    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synchronizovat <xliff:g id="NUMSYNCDAYS">%d</xliff:g> d"</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synchronizovat <xliff:g id="NUMSYNCDAYS">%d</xliff:g> d."</string>
     <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Změnit složky"</string>
 </resources>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c37d10b..e948098 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Der er ingen tekst i selve meddelelsen."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Vil du sende denne meddelelse?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Meddelelsen er kasseret."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Send"</string>
     <string name="mark_read" msgid="8438349154394313195">"Markér som læst"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Markér som ulæst"</string>
@@ -65,8 +67,7 @@
     <string name="forward" msgid="6822914459902983767">"Videresend"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Skift etiketter"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Skift mapper"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Administrer etiketter"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketter"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkroniser og underret"</string>
@@ -130,6 +131,15 @@
     <string name="me" msgid="6480762904022198669">"mig"</string>
     <string name="labels" msgid="1519770547536283663">"Etiketter"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtale?"</item>
+    <item quantity="other" msgid="930334208937121234">"Vil du slette disse <xliff:g id="COUNT">%1$d</xliff:g> samtaler?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Vil du arkivere denne samtale?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Vil du arkivere disse <xliff:g id="COUNT">%1$d</xliff:g> samtaler?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Vil du kassere denne besked?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Der er ingen samtaler."</string>
     <string name="undo" msgid="6070869718469782251">"Fortryd"</string>
   <plurals name="conversation_marking_read">
@@ -236,33 +246,22 @@
     <item msgid="665244114363057627">"Fejl i hukommelse"</item>
     <item msgid="9190542479647789762">"Intern fejl"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"Tryk for at konfigurere"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Synkroniser denne mappe for at se samtaler."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkroniser mappe"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"Vis flere samtaler"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Indlæser…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Vælg konto"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Vælg mappe..."</string>
+    <string name="sync_all" msgid="1057043212338233359">"Synkroniser: alle"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Synkronisering: seneste <xliff:g id="COUNT">%1$d</xliff:g> dag"</item>
+    <item quantity="other" msgid="6856940335775567991">"Synkronisering: seneste <xliff:g id="COUNT">%1$d</xliff:g> dage"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Synkroniser: ingen"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Synkroniser mappe"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Hvis du vil have vist samtaler i widgetten, skal du synkronisere denne mappe."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synkroniser de seneste <xliff:g id="NUMSYNCDAYS">%d</xliff:g> dage"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Skift mapper"</string>
 </resources>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a731634..d179368 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Die E-Mail ist leer."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Nachricht senden?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Nachricht verworfen"</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Senden"</string>
     <string name="mark_read" msgid="8438349154394313195">"Als gelesen markieren"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Als ungelesen markieren"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"Ich"</string>
     <string name="labels" msgid="1519770547536283663">"Labels"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Alle Ordner anzeigen"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Keine Konversationen"</string>
     <string name="undo" msgid="6070869718469782251">"Rückgängig"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 67af0a2..4f86204 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Το κύριο μέρος του μηνύματος δεν περιέχει κείμενο."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Αποστολή του μηνύματος;"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Το μήνυμα απορρίφθηκε."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Αποστολή"</string>
     <string name="mark_read" msgid="8438349154394313195">"Επισήμανση ως αναγνωσμένης"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Επισήμανση ως μη αναγνωσμένης"</string>
@@ -129,6 +131,15 @@
     <string name="me" msgid="6480762904022198669">"εγώ"</string>
     <string name="labels" msgid="1519770547536283663">"Ετικέτες"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Εμφάνιση όλων των φακέλων"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Να διαγραφεί αυτή η συνομιλία;"</item>
+    <item quantity="other" msgid="930334208937121234">"Να διαγραφούν αυτές οι <xliff:g id="COUNT">%1$d</xliff:g> συνομιλίες;"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Να αρχειοθετηθεί αυτή η συνομιλία;"</item>
+    <item quantity="other" msgid="4713469868399246772">"Να αρχειοθετηθούν αυτές οι <xliff:g id="COUNT">%1$d</xliff:g> συνομιλίες;"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Να απορριφθεί αυτό το μήνυμα;"</string>
     <string name="no_conversations" msgid="35400008890372241">"Δεν υπάρχουν συνομιλίες."</string>
     <string name="undo" msgid="6070869718469782251">"Αναίρεση"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 31dde58..cc79315 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"There\'s no text in the message body."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Send this message?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Message discarded."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Send"</string>
     <string name="mark_read" msgid="8438349154394313195">"Mark read"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Mark unread"</string>
@@ -129,6 +131,15 @@
     <string name="me" msgid="6480762904022198669">"me"</string>
     <string name="labels" msgid="1519770547536283663">"Labels"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Show all folders"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Delete this conversation?"</item>
+    <item quantity="other" msgid="930334208937121234">"Delete these <xliff:g id="COUNT">%1$d</xliff:g> conversations?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Archive this conversation?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Archive these <xliff:g id="COUNT">%1$d</xliff:g> conversations?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Discard this message?"</string>
     <string name="no_conversations" msgid="35400008890372241">"No conversations."</string>
     <string name="undo" msgid="6070869718469782251">"Undo"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4824f16..d6f0288 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"El cuerpo del mensaje está vacío."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"¿Deseas enviar este mensaje?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Mensaje descartado"</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Enviar"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marcar como leída"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Marcar como no leída"</string>
@@ -129,6 +131,15 @@
     <string name="me" msgid="6480762904022198669">"yo"</string>
     <string name="labels" msgid="1519770547536283663">"Etiquetas"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"¿Deseas eliminar esta conversación?"</item>
+    <item quantity="other" msgid="930334208937121234">"¿Deseas eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"¿Deseas archivar esta conversación?"</item>
+    <item quantity="other" msgid="4713469868399246772">"¿Deseas archivar estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"¿Quieres descartar este mensaje?"</string>
     <string name="no_conversations" msgid="35400008890372241">"No hay conversaciones."</string>
     <string name="undo" msgid="6070869718469782251">"Deshacer"</string>
   <plurals name="conversation_marking_read">
@@ -240,17 +251,17 @@
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar carpeta"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <string name="view_more_conversations" msgid="3151067626309674344">"Ver más conversaciones"</string>
-    <string name="loading_conversation" msgid="489160038366067983">"Cargando..."</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Cargando…"</string>
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Seleccionar cuenta"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Seleccionar carpeta"</string>
     <string name="sync_all" msgid="1057043212338233359">"Sincronizar: todas"</string>
   <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronizar: las conversaciones de los últimos <xliff:g id="COUNT">%1$d</xliff:g> días"</item>
+    <item quantity="one" msgid="137489911893192702">"Sincronizar: las conversaciones del último día (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
     <item quantity="other" msgid="6856940335775567991">"Sincronizar: las conversaciones de los últimos <xliff:g id="COUNT">%1$d</xliff:g> días"</item>
   </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Sincronización: ninguna"</string>
+    <string name="sync_none" msgid="3581727068747471804">"Sincronizar: ninguna"</string>
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sincronizar carpeta"</string>
     <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Para ver conversaciones en el widget, sincroniza esta carpeta."</string>
-    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sincronización: <xliff:g id="NUMSYNCDAYS">%d</xliff:g> días"</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sincronizar últimos <xliff:g id="NUMSYNCDAYS">%d</xliff:g> días"</string>
     <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Cambiar carpetas"</string>
 </resources>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9ce786b..574263a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"El cuerpo del mensaje está vacío."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"¿Quieres enviar este mensaje?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Mensaje descartado"</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Enviar"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marcar como leída"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Marcar como no leída"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"yo"</string>
     <string name="labels" msgid="1519770547536283663">"Etiquetas"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"No hay conversaciones."</string>
     <string name="undo" msgid="6070869718469782251">"Deshacer"</string>
   <plurals name="conversation_marking_read">
@@ -219,8 +227,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Mensaje guardado como borrador"</string>
     <string name="sending_message" msgid="1498583163419122128">"Enviando mensaje..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"La dirección <xliff:g id="WRONGEMAIL">%s</xliff:g> no es válida."</string>
-    <string name="show_elided" msgid="5255917904110437886">"▶ Mostrar texto entre comillas"</string>
-    <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto entre comillas"</string>
+    <string name="show_elided" msgid="5255917904110437886">"▶ Mostrar texto citado"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto citado"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"Aceptar"</string>
     <string name="done" msgid="3079981801778027540">"Listo"</string>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b24046b..8d35e30 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Sõnumi sisus pole teksti."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Kas soovite selle sõnumi saata?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Sõnumist loobuti."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Saada"</string>
     <string name="mark_read" msgid="8438349154394313195">"Märgi loetuks"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Märgi mitteloetuks"</string>
@@ -65,7 +67,7 @@
     <string name="forward" msgid="6822914459902983767">"Edasta"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Koosta"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Muuda silte"</string>
-    <string name="menu_change_folders" msgid="1542713666608888717">"Muudetud kaustad"</string>
+    <string name="menu_change_folders" msgid="1542713666608888717">"Muuda kaustu"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Halda silte"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Sildid"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sünkroonimine ja teavitamine"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"mina"</string>
     <string name="labels" msgid="1519770547536283663">"Sildid"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Kuva kõik kaustad"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Meilivestlusi pole."</string>
     <string name="undo" msgid="6070869718469782251">"Võta tagasi"</string>
   <plurals name="conversation_marking_read">
@@ -237,7 +245,7 @@
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Puudutage seadistamiseks"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Meilivestl. vaatamis. sünkr. kaust."</string>
-    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Kausta sünkroonimine"</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sünkrooni kaust"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <string name="view_more_conversations" msgid="3151067626309674344">"Kuva rohkem meilivestlusi"</string>
     <string name="loading_conversation" msgid="489160038366067983">"Laadimine …"</string>
@@ -252,5 +260,5 @@
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Kausta sünkroonimine"</string>
     <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Vidinas meilivestluste vaatamiseks sünkroonige see kaust."</string>
     <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sünkrooni viimased <xliff:g id="NUMSYNCDAYS">%d</xliff:g> päeva"</string>
-    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Muudetud kaustad"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Kaustade muutmine"</string>
 </resources>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a7787b6..e1447d7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"نوشتاری در بدنه پیام وجود ندارد."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"این پیام ارسال شود؟"</string>
     <string name="message_discarded" msgid="5079975378884765445">"پیام رد شد."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"ارسال"</string>
     <string name="mark_read" msgid="8438349154394313195">"علامت‌گذاری بعنوان خوانده‌شده"</string>
     <string name="mark_unread" msgid="6231373939351125713">"علامت‌گذاری بعنوان خوانده‌نشده"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"من"</string>
     <string name="labels" msgid="1519770547536283663">"برچسب‌ها"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"نمایش همه پوشه‌ها"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"مکالمه‌ای موجود نیست."</string>
     <string name="undo" msgid="6070869718469782251">"لغو"</string>
   <plurals name="conversation_marking_read">
@@ -219,10 +227,8 @@
     <string name="message_saved" msgid="7073947895562277576">"پیام بعنوان پیش‌نویس ذخیره شد."</string>
     <string name="sending_message" msgid="1498583163419122128">"درحال ارسال پیام..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"آدرس <xliff:g id="WRONGEMAIL">%s</xliff:g> معتبر نیست."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ نمایش نوشتار نقل قول شده"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ پنهان کردن نوشتار نقل قول شده"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">"، "</string>
     <string name="ok" msgid="8339355733816891026">"تأیید"</string>
     <string name="done" msgid="3079981801778027540">"انجام شد"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d7108f3..1e09c59 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Viestin runko-osassa ei ole tekstiä."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Lähetetäänkö viesti?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Viesti hylätty."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Lähetä"</string>
     <string name="mark_read" msgid="8438349154394313195">"Merkitse luetuksi"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Merkitse lukemattomaksi"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"minä"</string>
     <string name="labels" msgid="1519770547536283663">"Tunnisteet"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Näytä kaikki kansiot"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Keskusteluita ei ole."</string>
     <string name="undo" msgid="6070869718469782251">"Kumoa"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ccba74e..a1d4b3a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Le corps du message est vide."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Envoyer ce message ?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Message supprimé."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Envoyer"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marquer comme lue"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Marquer comme non lue"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"moi"</string>
     <string name="labels" msgid="1519770547536283663">"Libellés"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Afficher tous les dossiers"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Aucune conversation"</string>
     <string name="undo" msgid="6070869718469782251">"Annuler"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 64bdc26..f10456e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"संदेश के मुख्य भाग में कोई पाठ नहीं है."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"यह संदेश भेजें?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"संदेश छोड़ दिया गया."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"भेजें"</string>
     <string name="mark_read" msgid="8438349154394313195">"पढ़ी गई चिह्नित करें"</string>
     <string name="mark_unread" msgid="6231373939351125713">"बिना पढ़ी चिह्नित करें"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"मुझे"</string>
     <string name="labels" msgid="1519770547536283663">"लेबल"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"सभी फ़ोल्‍डर दिखाएं"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"कोई बातचीत नहीं."</string>
     <string name="undo" msgid="6070869718469782251">"पूर्ववत करें"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c7586a4..06038bf 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Nema teksta u tijelu poruke."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Poslati ovu poruku?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Poruka je odbačena."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Pošalji"</string>
     <string name="mark_read" msgid="8438349154394313195">"Označi kao pročitano"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Označi kao nepročitano"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"ja"</string>
     <string name="labels" msgid="1519770547536283663">"Oznake"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Prikaži sve mape"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Nema razgovora."</string>
     <string name="undo" msgid="6070869718469782251">"Poništi"</string>
   <plurals name="conversation_marking_read">
@@ -245,12 +253,12 @@
     <string name="activity_folder_selection" msgid="5161845867397316052">"Odabir mape"</string>
     <string name="sync_all" msgid="1057043212338233359">"Sinkroniziraj: sve"</string>
   <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sinkronizacija: posljednji <xliff:g id="COUNT">%1$d</xliff:g> dan"</item>
-    <item quantity="other" msgid="6856940335775567991">"Sinkronizacija: posljednjih <xliff:g id="COUNT">%1$d</xliff:g> dana"</item>
+    <item quantity="one" msgid="137489911893192702">"Sinkronizacija prethodnog dana: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sinkronizacija sljedećeg broja prethodnih dana: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
   </plurals>
     <string name="sync_none" msgid="3581727068747471804">"Sinkroniziraj: ništa"</string>
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sinkronizacija mape"</string>
     <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Da biste vidjeli razgovore u widgetu, sinkronizirajte ovu mapu."</string>
-    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sink. pos. ovoliko dana: <xliff:g id="NUMSYNCDAYS">%d</xliff:g>"</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sink. prethodnih dana: <xliff:g id="NUMSYNCDAYS">%d</xliff:g>"</string>
     <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Promjena mapa"</string>
 </resources>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3906fb4..1cb7c97 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Nincs szöveg az üzenet törzsében."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Elküldi az üzenetet?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Üzenet elvetve."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Küldés"</string>
     <string name="mark_read" msgid="8438349154394313195">"Megjelölés olvasottként"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Megjelölés olvasatlanként"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"saját magam"</string>
     <string name="labels" msgid="1519770547536283663">"Címkék"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Összes mappa megjelenítése"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Nincsenek beszélgetések."</string>
     <string name="undo" msgid="6070869718469782251">"Visszavonás"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 184bfa2..419889d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Tidak ada teks dalam badan pesan."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Kirim pesan ini?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Pesan dibuang."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Kirim"</string>
     <string name="mark_read" msgid="8438349154394313195">"Tandai telah dibaca"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Tandai belum dibaca"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"saya"</string>
     <string name="labels" msgid="1519770547536283663">"Label"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Tampilkan semua map"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Tidak ada percakapan."</string>
     <string name="undo" msgid="6070869718469782251">"Urungkan"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d0068f9..24eca67 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Nessun testo presente nel corpo del messaggio."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Inviare il messaggio?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Messaggio eliminato."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Invia"</string>
     <string name="mark_read" msgid="8438349154394313195">"Segna come già letto"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Segna come da leggere"</string>
@@ -129,6 +131,15 @@
     <string name="me" msgid="6480762904022198669">"me"</string>
     <string name="labels" msgid="1519770547536283663">"Etichette"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Visualizza tutte le cartelle"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Eliminare questa conversazione?"</item>
+    <item quantity="other" msgid="930334208937121234">"Eliminare queste <xliff:g id="COUNT">%1$d</xliff:g> conversazioni?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Archiviare questa conversazione?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Archiviare queste <xliff:g id="COUNT">%1$d</xliff:g> conversazioni?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Eliminare questo messaggio?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Nessuna conversazione."</string>
     <string name="undo" msgid="6070869718469782251">"Annulla"</string>
   <plurals name="conversation_marking_read">
@@ -236,7 +247,7 @@
     <item msgid="9190542479647789762">"Errore interno"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Tocca per configurare"</string>
-    <string name="non_synced_folder_description" msgid="6059194125558004080">"Per visual. conversaz. sincronizza cartella."</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Per vedere conversazioni, sincronizza cartella."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizza cartella"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <string name="view_more_conversations" msgid="3151067626309674344">"Visualizza altre conversazioni"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4165c6b..dff1f89 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"אין טקסט בגוף ההודעה."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"האם לשלוח הודעה זו?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"ההודעה נמחקה."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"שלח"</string>
     <string name="mark_read" msgid="8438349154394313195">"סמן כנקראה"</string>
     <string name="mark_unread" msgid="6231373939351125713">"סמן כלא נקראה"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"אני"</string>
     <string name="labels" msgid="1519770547536283663">"תוויות"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"הצג את כל התיקיות"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"אין שיחות."</string>
     <string name="undo" msgid="6070869718469782251">"בטל"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 145e5e7..e98db82 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"メールの本文が入力されていません。"</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"このメールを送信しますか？"</string>
     <string name="message_discarded" msgid="5079975378884765445">"メッセージを破棄しました。"</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"送信"</string>
     <string name="mark_read" msgid="8438349154394313195">"既読にする"</string>
     <string name="mark_unread" msgid="6231373939351125713">"未読にする"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"自分"</string>
     <string name="labels" msgid="1519770547536283663">"ラベル"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"すべてのフォルダを表示"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"スレッドがありません。"</string>
     <string name="undo" msgid="6070869718469782251">"元に戻す"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4f9522f..a235a8a 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"메일 본문에 텍스트가 없습니다."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"메시지를 보내시겠습니까?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"메일을 삭제했습니다."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"보내기"</string>
     <string name="mark_read" msgid="8438349154394313195">"읽음으로 표시"</string>
     <string name="mark_unread" msgid="6231373939351125713">"읽지않음으로 표시"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"나"</string>
     <string name="labels" msgid="1519770547536283663">"라벨"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"모든 폴더 표시"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"대화가 없습니다."</string>
     <string name="undo" msgid="6070869718469782251">"실행취소"</string>
   <plurals name="conversation_marking_read">
@@ -236,7 +244,7 @@
     <item msgid="9190542479647789762">"내부 오류"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"설정하려면 터치하세요."</string>
-    <string name="non_synced_folder_description" msgid="6059194125558004080">"대화를 보려면 이 폴더를 동기화하세요."</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"대화를 보려면 폴더를 동기화하세요."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"폴더 동기화"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <string name="view_more_conversations" msgid="3151067626309674344">"대화 더보기"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 0359892..fe8260f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Pranešimo turinyje nėra teksto."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Siųsti šį pranešimą?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Pranešimas atmestas."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Siųsti"</string>
     <string name="mark_read" msgid="8438349154394313195">"Pažymėti kaip skaitytą"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Pažymėti kaip neskaitytą"</string>
@@ -129,6 +131,15 @@
     <string name="me" msgid="6480762904022198669">"man"</string>
     <string name="labels" msgid="1519770547536283663">"Etiketės"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Rodyti visus aplankus"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Ištrinti šį pokalbį?"</item>
+    <item quantity="other" msgid="930334208937121234">"Ištrinti šiuos <xliff:g id="COUNT">%1$d</xliff:g> pokalb.?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Archyvuoti šį pokalbį?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Archyvuoti šiuos <xliff:g id="COUNT">%1$d</xliff:g> pokalb.?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Atmesti šį pranešimą?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Nėra pokalbių."</string>
     <string name="undo" msgid="6070869718469782251">"Anuliuoti"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f652f3c..de760ed 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Nav ziņojuma pamatteksta."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Vai sūtīt šo ziņojumu?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Ziņojums ir atmests."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Sūtīt"</string>
     <string name="mark_read" msgid="8438349154394313195">"Atzīmēt kā izlasītu"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Atzīmēt kā nelasītu"</string>
@@ -129,6 +131,15 @@
     <string name="me" msgid="6480762904022198669">"man"</string>
     <string name="labels" msgid="1519770547536283663">"Iezīmes"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Rādīt visas mapes"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Vai dzēst šo sarunu?"</item>
+    <item quantity="other" msgid="930334208937121234">"Vai dzēst šīs sarunas (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Vai arhivēt šo sarunu?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Vai arhivēt šīs sarunas (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Vai atmest šo ziņojumu?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Nav nevienas sarunas."</string>
     <string name="undo" msgid="6070869718469782251">"Atsaukt"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index a68c758..18704f8 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Tiada teks dalam badan mesej."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Hantar mesej ini?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Mesej dibuang."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Hantar"</string>
     <string name="mark_read" msgid="8438349154394313195">"Tandakan dibaca"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Tandakan tidak dibaca"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"saya"</string>
     <string name="labels" msgid="1519770547536283663">"Label"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Tunjukkan semua folder"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Tiada perbualan."</string>
     <string name="undo" msgid="6070869718469782251">"Buat asal"</string>
   <plurals name="conversation_marking_read">
@@ -219,10 +227,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Mesej disimpan sebagai draf."</string>
     <string name="sending_message" msgid="1498583163419122128">"Menghantar mesej..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak sah."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Tunjukkan teks yang dipetik"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan teks yang dipetik"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Selesai"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e60ac74..e078a1b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"E-posten har ingen tekst."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Vil du sende denne e-posten?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"E-posten er forkastet."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Send"</string>
     <string name="mark_read" msgid="8438349154394313195">"Merk som lest"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Merk som ulest"</string>
@@ -129,6 +131,15 @@
     <string name="me" msgid="6480762904022198669">"meg"</string>
     <string name="labels" msgid="1519770547536283663">"Etiketter"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtalen?"</item>
+    <item quantity="other" msgid="930334208937121234">"Vil du slette disse <xliff:g id="COUNT">%1$d</xliff:g> samtalene?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Vil du arkivere denne samtalen?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Vil du arkivere disse <xliff:g id="COUNT">%1$d</xliff:g> samtalene?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Vil du forkaste denne meldingen?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Ingen samtaler."</string>
     <string name="undo" msgid="6070869718469782251">"Angre"</string>
   <plurals name="conversation_marking_read">
@@ -252,5 +263,5 @@
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Synkroniser mappen"</string>
     <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Synkroniser denne mappen for å se samtaler i modulen."</string>
     <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synkroniser de siste <xliff:g id="NUMSYNCDAYS">%d</xliff:g> dagene"</string>
-    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Endre mapper"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Bytt mappe"</string>
 </resources>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5e2d78d..df4f0fd 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Het bericht bevat geen tekst."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Dit bericht verzenden?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Bericht wordt verwijderd."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Verzenden"</string>
     <string name="mark_read" msgid="8438349154394313195">"Markeren als gelezen"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Markeren als ongelezen"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"ik"</string>
     <string name="labels" msgid="1519770547536283663">"Labels"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Alle mappen weergeven"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Geen conversaties."</string>
     <string name="undo" msgid="6070869718469782251">"Ongedaan maken"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 52730fd..cba14cc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Brak tekstu w treści wiadomości."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Wysłać tę wiadomość?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Wiadomość została odrzucona."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Wyślij"</string>
     <string name="mark_read" msgid="8438349154394313195">"Oznacz jako przeczytane"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Oznacz jako nieprzeczytane"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"ja"</string>
     <string name="labels" msgid="1519770547536283663">"Etykiety"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Pokaż wszystkie foldery"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Brak wątków."</string>
     <string name="undo" msgid="6070869718469782251">"Cofnij"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 002e91e..6927730 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Não existe texto no corpo da mensagem."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Enviar esta mensagem?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Mensagem rejeitada."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Enviar"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marcar como lida"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Marcar como não lida"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"utilizador"</string>
     <string name="labels" msgid="1519770547536283663">"Etiquetas"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas as pastas"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Sem conversas."</string>
     <string name="undo" msgid="6070869718469782251">"Anular"</string>
   <plurals name="conversation_marking_read">
@@ -245,7 +253,7 @@
     <string name="activity_folder_selection" msgid="5161845867397316052">"Escolher pasta"</string>
     <string name="sync_all" msgid="1057043212338233359">"Sincronizar: Tudo"</string>
   <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronizar: último <xliff:g id="COUNT">%1$d</xliff:g> dia"</item>
+    <item quantity="one" msgid="137489911893192702">"Sincronizar: últimas 24 horas (<xliff:g id="COUNT">%1$d</xliff:g> dia)"</item>
     <item quantity="other" msgid="6856940335775567991">"Sincronizar: últimos <xliff:g id="COUNT">%1$d</xliff:g> dias"</item>
   </plurals>
     <string name="sync_none" msgid="3581727068747471804">"Sincronizar: Nenhuma"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3d83521..1787873 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Não há texto no corpo da mensagem."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Enviar esta mensagem?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Mensagem descartada."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Enviar"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marcar como lida"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Marcar como não lida"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"eu"</string>
     <string name="labels" msgid="1519770547536283663">"Marcadores"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas as pastas"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Não há conversas."</string>
     <string name="undo" msgid="6070869718469782251">"Desfazer"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3f43b86..0614b7b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Nu există text în corpul mesajului."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Trimiteţi acest mesaj?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Mesaj refuzat."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Trimiteţi"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marcaţi drept citită"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Marcaţi drept necitită"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"eu"</string>
     <string name="labels" msgid="1519770547536283663">"Etichete"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Afişaţi toate dosarele"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Nicio conversaţie."</string>
     <string name="undo" msgid="6070869718469782251">"Anulaţi"</string>
   <plurals name="conversation_marking_read">
@@ -219,10 +227,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Mesaj salvat ca mesaj nefinalizat."</string>
     <string name="sending_message" msgid="1498583163419122128">"Se trimite mesajul..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> este nevalidă."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Afişaţi textul citat"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Ascundeţi textul citat"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Terminat"</string>
@@ -247,12 +253,12 @@
     <string name="activity_folder_selection" msgid="5161845867397316052">"Alegeţi un dosar"</string>
     <string name="sync_all" msgid="1057043212338233359">"Sincronizare: toate"</string>
   <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Sincronizare: ultima <xliff:g id="COUNT">%1$d</xliff:g> zi"</item>
+    <item quantity="one" msgid="137489911893192702">"Sincronizare: ultima zi (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
     <item quantity="other" msgid="6856940335775567991">"Sincronizare: ultimele <xliff:g id="COUNT">%1$d</xliff:g> (de) zile"</item>
   </plurals>
     <string name="sync_none" msgid="3581727068747471804">"Sincronizare: niciunul"</string>
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sincronizaţi dosarul"</string>
     <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Pentru a afişa conversaţiile din widget, sincronizaţi acest dosar."</string>
-    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sincron. ultimele <xliff:g id="NUMSYNCDAYS">%d</xliff:g> (de) zile"</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sincronizați ultimele <xliff:g id="NUMSYNCDAYS">%d</xliff:g> zile"</string>
     <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Modificaţi dosarele"</string>
 </resources>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0e8aef4..723b5e9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Введите текст сообщения."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Отправить это сообщение?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Черновик удален."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Отправить"</string>
     <string name="mark_read" msgid="8438349154394313195">"Отметить как прочитанное"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Отметить как непрочитанное"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"мне"</string>
     <string name="labels" msgid="1519770547536283663">"Ярлыки"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Показать все почтовые ящики"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Пока ничего нет"</string>
     <string name="undo" msgid="6070869718469782251">"Отмена"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d08942b..2ac0d3d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"V tele správy nie je žiaden text."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Chcete odoslať túto správu?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Správa bola zahodená."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Poslať"</string>
     <string name="mark_read" msgid="8438349154394313195">"Označiť ako prečítané"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Označiť ako neprečítané"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"ja"</string>
     <string name="labels" msgid="1519770547536283663">"Menovky"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Zobraziť všetky priečinky"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Žiadne konverzácie."</string>
     <string name="undo" msgid="6070869718469782251">"Späť"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 98afbf8..f676aa9 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"V telesu sporočila ni besedila."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Želite poslati to sporočilo?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Sporočilo zavrženo."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Pošlji"</string>
     <string name="mark_read" msgid="8438349154394313195">"Označi kot prebran"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Označi kot neprebran"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"jaz"</string>
     <string name="labels" msgid="1519770547536283663">"Oznake"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Pokaži vse mape"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Ni pogovorov."</string>
     <string name="undo" msgid="6070869718469782251">"Razveljavi"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 818f1bb..b8e3dd8 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Нема текста у самој поруци."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Желите ли да пошаљете ову поруку?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Порука је одбачена."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Пошаљи"</string>
     <string name="mark_read" msgid="8438349154394313195">"Означи као прочитано"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Означи као непрочитано"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"мени"</string>
     <string name="labels" msgid="1519770547536283663">"Ознаке"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Прикажи све директоријуме"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Нема преписки."</string>
     <string name="undo" msgid="6070869718469782251">"Опозови"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 844b77e..d0a6153 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Det finns ingen text i meddelandet."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Vill du skicka det här meddelandet?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Meddelandet har slängts."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Skicka"</string>
     <string name="mark_read" msgid="8438349154394313195">"Markera som läst"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Markera som oläst"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"jag"</string>
     <string name="labels" msgid="1519770547536283663">"Etiketter"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Visa alla mappar"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Inga konversationer."</string>
     <string name="undo" msgid="6070869718469782251">"Ångra"</string>
   <plurals name="conversation_marking_read">
@@ -219,10 +227,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Meddelande sparat som utkast."</string>
     <string name="sending_message" msgid="1498583163419122128">"Skickar meddelande …"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> är ogiltig."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Visa citerad text"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Dölj citerad text"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Klar"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 4efd376..51bb5fb 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Hakuna maandishi katika kiini cha ujumbe."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Tuma ujumbe huu?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Ujumbe umetupwa."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Tuma"</string>
     <string name="mark_read" msgid="8438349154394313195">"Weka alama kuwa imesomwa"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Tia alama kuwa haijasomwa"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"mimi"</string>
     <string name="labels" msgid="1519770547536283663">"Lebo"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Onyesha folda zote"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Hakuna mazungumzo."</string>
     <string name="undo" msgid="6070869718469782251">"Tengua"</string>
   <plurals name="conversation_marking_read">
@@ -219,10 +227,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Ujumbe umehifadhiwa kama rasimu."</string>
     <string name="sending_message" msgid="1498583163419122128">"Inatuma ujumbe…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Anwani <xliff:g id="WRONGEMAIL">%s</xliff:g> ni batili."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Onyesha maandishi yaliyonukuliwa"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Ficha maandishi yaliyonukuliwa"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"SAWA"</string>
     <string name="done" msgid="3079981801778027540">"Imekamilika"</string>
@@ -238,7 +244,7 @@
     <item msgid="9190542479647789762">"Hitilafu ya ndani"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Gusa ili kusanidi"</string>
-    <string name="non_synced_folder_description" msgid="6059194125558004080">"Ona mazungumzo, landanisha folda hii."</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Ili kuona mazungumzo, landanisha folda hii."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Landanisha Folda"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <string name="view_more_conversations" msgid="3151067626309674344">"Ona mazungumzo zaidi"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 64679f7..81124c6 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"ไม่มีเนื้อหาข้อความ"</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"ส่งข้อความนี้หรือไม่"</string>
     <string name="message_discarded" msgid="5079975378884765445">"ยกเลิกข้อความแล้ว"</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"ส่ง"</string>
     <string name="mark_read" msgid="8438349154394313195">"ทำเครื่องหมายว่าอ่านแล้ว"</string>
     <string name="mark_unread" msgid="6231373939351125713">"ทำเครื่องหมายว่ายังไม่อ่าน"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"ฉัน"</string>
     <string name="labels" msgid="1519770547536283663">"ป้ายกำกับ"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"แสดงโฟลเดอร์ทั้งหมด"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"ไม่มีการสนทนา"</string>
     <string name="undo" msgid="6070869718469782251">"เลิกทำ"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 38f49b2..2772ab1 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Walang teksto sa nilalaman ng mensahe."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Ipadala ang mensaheng ito?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Itinapon ang mensahe."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Ipadala"</string>
     <string name="mark_read" msgid="8438349154394313195">"Markahang nabasa na"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Markahang hindi pa nababasa"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"ako"</string>
     <string name="labels" msgid="1519770547536283663">"Mga Label"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Ipakita ang lahat ng folder"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Walang mga pag-uusap."</string>
     <string name="undo" msgid="6070869718469782251">"I-undo"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index fa94918..40b7245 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"İleti gövdesinde metin yok."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Bu ileti gönderilsin mi?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"İleti silindi."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Gönder"</string>
     <string name="mark_read" msgid="8438349154394313195">"Okundu olarak işaretle"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Okunmadı olarak işaretle"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"ben"</string>
     <string name="labels" msgid="1519770547536283663">"Etiketler"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Tüm klasörleri göster"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Hiçbir ileti dizisi yok."</string>
     <string name="undo" msgid="6070869718469782251">"Geri Al"</string>
   <plurals name="conversation_marking_read">
@@ -217,10 +225,8 @@
     <string name="message_saved" msgid="7073947895562277576">"İleti taslak olarak kaydedildi."</string>
     <string name="sending_message" msgid="1498583163419122128">"İleti gönderiliyor..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> adresi geçersiz."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Alıntılanan metni göster"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Alıntılanan metni gizle"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"Tamam"</string>
     <string name="done" msgid="3079981801778027540">"Bitti"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 789bd08..6c2b881 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"У тілі повідомлення немає тексту."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Надіслати це повідомлення?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Повідомлення відхилено."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Надіслати"</string>
     <string name="mark_read" msgid="8438349154394313195">"Позначити як прочитану"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Позначити як непрочитану"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"я"</string>
     <string name="labels" msgid="1519770547536283663">"Мітки"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Показати всі папки"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Немає бесід."</string>
     <string name="undo" msgid="6070869718469782251">"Відмінити"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4877a08..ceb722b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Không có văn bản nào trong phần nội dung thư."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Gửi tin nhắn này?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Tin nhắn đã bị hủy."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Gửi"</string>
     <string name="mark_read" msgid="8438349154394313195">"Đánh dấu là đã đọc"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Đánh dấu là chưa đọc"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"tôi"</string>
     <string name="labels" msgid="1519770547536283663">"Nhãn"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Hiển thị tất cả thư mục"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"Không có cuộc hội thoại nào."</string>
     <string name="undo" msgid="6070869718469782251">"Hoàn tác"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a1bb828..3611336 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"邮件正文中没有文字。"</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"要发送此邮件吗？"</string>
     <string name="message_discarded" msgid="5079975378884765445">"邮件已舍弃。"</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"发送"</string>
     <string name="mark_read" msgid="8438349154394313195">"标记为已读"</string>
     <string name="mark_unread" msgid="6231373939351125713">"标记为未读"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"我"</string>
     <string name="labels" msgid="1519770547536283663">"标签"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"显示所有文件夹"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"无会话。"</string>
     <string name="undo" msgid="6070869718469782251">"撤消"</string>
   <plurals name="conversation_marking_read">
@@ -219,10 +227,8 @@
     <string name="message_saved" msgid="7073947895562277576">"邮件已另存为草稿。"</string>
     <string name="sending_message" msgid="1498583163419122128">"正在发送邮件..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 无效。"</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ 显示引用文字"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ 隐藏引用文字"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"确定"</string>
     <string name="done" msgid="3079981801778027540">"完成"</string>
@@ -237,7 +243,7 @@
     <item msgid="665244114363057627">"存储错误"</item>
     <item msgid="9190542479647789762">"内部错误"</item>
   </string-array>
-    <string name="tap_to_configure" msgid="1181356242354390930">"触摸以设置"</string>
+    <string name="tap_to_configure" msgid="1181356242354390930">"触摸可进行设置"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"要查看会话，请同步此文件夹。"</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步文件夹"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
@@ -252,7 +258,7 @@
   </plurals>
     <string name="sync_none" msgid="3581727068747471804">"同步：否"</string>
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"同步文件夹"</string>
-    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"要查看该窗口小部件中的会话，请同步此文件夹。"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"要在窗口小部件中查看会话，请同步此文件夹。"</string>
     <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"同步过去 <xliff:g id="NUMSYNCDAYS">%d</xliff:g> 天的会话"</string>
     <string name="folder_selection_dialog_title" msgid="9194093596644845383">"更改文件夹"</string>
 </resources>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7c8336b..0684640 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"這封郵件沒有內文。"</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"傳送這封郵件？"</string>
     <string name="message_discarded" msgid="5079975378884765445">"已捨棄郵件。"</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"傳送"</string>
     <string name="mark_read" msgid="8438349154394313195">"標示為已讀取"</string>
     <string name="mark_unread" msgid="6231373939351125713">"標示為未讀取"</string>
@@ -129,6 +131,12 @@
     <string name="me" msgid="6480762904022198669">"我"</string>
     <string name="labels" msgid="1519770547536283663">"標籤"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"顯示所有資料夾"</string>
+    <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
+    <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
+    <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
+    <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
+    <!-- no translation found for confirm_discard_text (1149834186404614612) -->
+    <skip />
     <string name="no_conversations" msgid="35400008890372241">"無會話群組。"</string>
     <string name="undo" msgid="6070869718469782251">"復原"</string>
   <plurals name="conversation_marking_read">
@@ -219,10 +227,8 @@
     <string name="message_saved" msgid="7073947895562277576">"已儲存郵件草稿。"</string>
     <string name="sending_message" msgid="1498583163419122128">"正在傳送郵件..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 無效。"</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ 顯示引用文字"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ 隱藏引用文字"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">"、 "</string>
     <string name="ok" msgid="8339355733816891026">"確定"</string>
     <string name="done" msgid="3079981801778027540">"完成"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 360a00a..19fc4ab 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -47,6 +47,8 @@
     <string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Awukho umbhalo emzimbeni walomlayezo."</string>
     <string name="confirm_send_message" msgid="3221546155385562874">"Thumela lo mlayezo?"</string>
     <string name="message_discarded" msgid="5079975378884765445">"Umlayezo ulahliwe."</string>
+    <!-- no translation found for signature (8672076404752035004) -->
+    <skip />
     <string name="send" msgid="8242003661397555986">"Thumela"</string>
     <string name="mark_read" msgid="8438349154394313195">"Maka njengokufundiwe"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Maka njengokungafundiwe"</string>
@@ -129,6 +131,15 @@
     <string name="me" msgid="6480762904022198669">"mina"</string>
     <string name="labels" msgid="1519770547536283663">"Amalebuli"</string>
     <string name="show_all_folders" msgid="3281420732307737553">"Bonisa onke amafolda"</string>
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Sula le ngxoxo?"</item>
+    <item quantity="other" msgid="930334208937121234">"Sula lezi zingxoxo ezingu-<xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Ufuna ukulondoloza lenkulumo?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Faka lezi zingxoxo ezingu-<xliff:g id="COUNT">%1$d</xliff:g> kungobo yomlando?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Lahla umlayezo?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Azikho izingxoxo."</string>
     <string name="undo" msgid="6070869718469782251">"Hlehlisa"</string>
   <plurals name="conversation_marking_read">
@@ -232,25 +243,25 @@
     <item msgid="5037283655022689372">"Iphutha loxhuma"</item>
     <item msgid="4252875340758600974">"Iphutha lokufakazela ubuqiniso"</item>
     <item msgid="7611299631880179587">"Iphutha lokuphepha"</item>
-    <item msgid="665244114363057627">"Iphutha lesitoreji"</item>
+    <item msgid="665244114363057627">"Iphutha lendawo yokulondoloza"</item>
     <item msgid="9190542479647789762">"Iphutha langaphakathi"</item>
   </string-array>
-    <string name="tap_to_configure" msgid="1181356242354390930">"Cindezela ukuze ulungisele ukusebenza."</string>
+    <string name="tap_to_configure" msgid="1181356242354390930">"Thinta ukuze ulungisele ukusebenza"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Ukuze ubuke izingxoxo, vumelanisa le folda."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Vumelanisa ifolda"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <string name="view_more_conversations" msgid="3151067626309674344">"Buka izingxoxo ezengeziwe"</string>
     <string name="loading_conversation" msgid="489160038366067983">"Iyalayisha…"</string>
-    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Khetha i-Akhawunti"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Khetha i-akhawunti"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Khetha ifolda"</string>
     <string name="sync_all" msgid="1057043212338233359">"Vumelanisa: Konke"</string>
   <plurals name="sync_recent">
-    <item quantity="one" msgid="137489911893192702">"Vumelanisa: Usuku <xliff:g id="COUNT">%1$d</xliff:g> lokugcina"</item>
-    <item quantity="other" msgid="6856940335775567991">"Vumelanisa: Izinsuku <xliff:g id="COUNT">%1$d</xliff:g> zokugcina"</item>
+    <item quantity="one" msgid="137489911893192702">"Vumelanisa: Usuku olu-<xliff:g id="COUNT">%1$d</xliff:g> lokugcina"</item>
+    <item quantity="other" msgid="6856940335775567991">"Vumelanisa: Izinsuku ezingu-<xliff:g id="COUNT">%1$d</xliff:g> zokugcina"</item>
   </plurals>
-    <string name="sync_none" msgid="3581727068747471804">"Akukho ukuvumelanisa"</string>
+    <string name="sync_none" msgid="3581727068747471804">"Ukuvumelanisa: Akukho"</string>
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Vumelanisa ifolda"</string>
-    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Ukuze ubuke izingxoxo kusinqunjwana, vumelanisa le lebula."</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Ukuze ubuke izingxoxo kusinqunjwana, vumelanisa le folda."</string>
     <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Vumelanisa izinsuku ezingu-<xliff:g id="NUMSYNCDAYS">%d</xliff:g> zokugcina"</string>
     <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Shintsha amafolda"</string>
 </resources>

diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 292c6d9..299e2cf 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java

@@ -21,7 +21,6 @@
 import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.database.Cursor;
-import android.util.SparseArray;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -111,15 +110,15 @@
         for (Conversation c : conversations) {
             positions.add(c.position);
         }
-        mActionCompleteListener = listener;
-        delete(positions);
+        delete(positions, listener);
     }
 
-    public void delete(ArrayList<Integer> deletedRows) {
+    public void delete(ArrayList<Integer> deletedRows, ActionCompleteListener listener) {
         // Clear out any remaining items and add the new ones
         mLastDeletingItems.clear();
         mLastDeletingItems.addAll(deletedRows);
         mDeletingItems.addAll(deletedRows);
+        mActionCompleteListener = listener;
         // TODO(viki): Rather than notifying for a full data set change, perhaps we can mark
         // only the affected conversations?
         notifyDataSetChanged();

diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index e8c1014..14c8530 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java

@@ -286,6 +286,11 @@
 
         // Note - we manually save/restore the listview state.
         mListView.setSaveEnabled(false);
+
+        // Belt and suspenders here; make sure we do any necessary sync of the ConversationCursor
+        if (mConversationListCursor != null && mConversationListCursor.isRefreshReady()) {
+            mConversationListCursor.sync();
+        }
         return rootView;
     }
 
@@ -436,7 +441,9 @@
 
     @Override
     public void onActionComplete() {
-        // Nothing to do here.
+        if (mConversationListCursor.isRefreshReady()) {
+            finishRefresh();
+        }
     }
 
     @Override
@@ -472,7 +479,7 @@
         ArrayList<Integer> deletedRows = mConversationListCursor.getRefreshDeletions();
         // If we have any deletions from the server, animate them away
         if (!deletedRows.isEmpty()) {
-            mListAdapter.delete(deletedRows);
+            mListAdapter.delete(deletedRows, this);
         } else {
             finishRefresh();
         }
commit	84da186d89e89679e20087327c1a25f0674f2e41	[log] [tgz]
author	Andy Huang <ath@google.com>	Fri Mar 02 11:57:55 2012 -0800
committer	Android (Google) Code Review <android-gerrit@google.com>	Fri Mar 02 11:57:55 2012 -0800
tree	3131f6d9eba25799d363f0b3ff80e8df291f3fcd
parent	5aa31fdb18a49e665be77f2b8c485837dbe71c0a [diff]
parent	f381651f75b320902576e211a91ff734e0ea05d1 [diff]