Merge "Include these property setters."

commit: 75a234244a9bc9c257f3f7ac3a6b1b34e9136da3 [log] [tgz]
author: Mindy Pereira <mindyp@google.com> Mon Mar 05 13:27:15 2012 -0800
committer: Android (Google) Code Review <android-gerrit@google.com> Mon Mar 05 13:27:15 2012 -0800
tree: b631abf9e8d127eec7aac5a08b19d50df993f793
parent: 364c42505db59b2558f6cffa62fc06d9f904d96b [diff]
parent: e144d1d90b1fbefdedc1d95b6ff33a45fad252ce [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index bd8bb24..3b36c5b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"Stuur"</string>
     <string name="mark_read" msgid="8438349154394313195">"Merk as gelees"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniseer en laat weet"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Etiket-instellings"</string>
     <string name="menu_done" msgid="5791134842152855128">"Klaar"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Rekeninginstellings"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Instellings"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Soek"</string>
     <string name="more" msgid="1238344647379009858">"Meer"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +133,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Vee hierdie gesprek uit?"</item>
+    <item quantity="other" msgid="930334208937121234">"Vee hierdie <xliff:g id="COUNT">%1$d</xliff:g> gesprekke uit?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Argiveer hierdie gesprek?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Argiveer hierdie <xliff:g id="COUNT">%1$d</xliff:g> gesprekke?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Gooi hierdie boodskap weg?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Geen gesprekke nie."</string>
     <string name="undo" msgid="6070869718469782251">"Ontdoen"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0f6624c..2a9acc4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"ላክ"</string>
     <string name="mark_read" msgid="8438349154394313195">"መነበቡን ምልክት አድርግ"</string>
     <string name="mark_unread" msgid="6231373939351125713">"አለመነበቡን ምልክት አድርግ"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"አመሳስል &amp; አሳውቅ"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"የስያሜ ቅንጅቶች"</string>
     <string name="menu_done" msgid="5791134842152855128">"ተከናውኗል"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"የመለያ ቅንጅቶች"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"ቅንጅቶች"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"ፍለጋ"</string>
     <string name="more" msgid="1238344647379009858">"ተጨማሪ"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> ከ<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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-ar/strings.xml b/res/values-ar/strings.xml
index 183571b..a8553c1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"إرسال"</string>
     <string name="mark_read" msgid="8438349154394313195">"وضع علامة كمقروء"</string>
     <string name="mark_unread" msgid="6231373939351125713">"وضع علامة كـ \"غير مقروءة\""</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"المزامنة والإشعارات"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"إعدادات التصنيفات"</string>
     <string name="menu_done" msgid="5791134842152855128">"تم"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"إعدادات الحساب"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"الإعدادات"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"بحث"</string>
     <string name="more" msgid="1238344647379009858">"المزيد"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> من <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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-be/strings.xml b/res/values-be/strings.xml
index f8a0311..d6f2fc0 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"Адправіць"</string>
     <string name="mark_read" msgid="8438349154394313195">"Пазначыць як прачытанае"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Пазначыць як непрачытанае"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Сінхранізацыя і апавяшчэнне"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Налады цэтліка"</string>
     <string name="menu_done" msgid="5791134842152855128">"Гатова"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Налады ўліковага запісу"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Налады"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Пошук"</string>
     <string name="more" msgid="1238344647379009858">"Дадаткова"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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">"Заархiваваць гэту размову?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Заархiваваць гэтыя размовы (<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">"Адмянiць"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a95f13e..e9acd74 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"Изпращане"</string>
     <string name="mark_read" msgid="8438349154394313195">"Означаване като прочетено"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизиране и известяване"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Настройки за етикети"</string>
     <string name="menu_done" msgid="5791134842152855128">"Готово"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Настройки на профила"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Настройки"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Търсене"</string>
     <string name="more" msgid="1238344647379009858">"Още"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> от <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4549fb0..fbc61f8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronitza i notifica"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Configuració de l\'etiqueta"</string>
     <string name="menu_done" msgid="5791134842152855128">"Fet"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Configuració del compte"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Configuració"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Cerca"</string>
     <string name="more" msgid="1238344647379009858">"Més"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Vols suprimir aquesta conversa?"</item>
+    <item quantity="other" msgid="930334208937121234">"Vols suprimir aquestes <xliff:g id="COUNT">%1$d</xliff:g> converses?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Vols arxivar aquesta conversa?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Vols arxivar aquestes <xliff:g id="COUNT">%1$d</xliff:g> converses?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Vols descartar aquest missatge?"</string>
     <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 cce96f6..d39e917 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizace a upozornění"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Nastavení štítku"</string>
     <string name="menu_done" msgid="5791134842152855128">"Hotovo"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Nastavení účtu"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Nastavení"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Vyhledat"</string>
     <string name="more" msgid="1238344647379009858">"Více"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Smazat tuto konverzaci?"</item>
+    <item quantity="other" msgid="930334208937121234">"Smazat tyto konverzace (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Archivovat tuto konverzaci?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Archivovat tyto konverzace (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Zrušit tuto zprávu?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Žádné konverzace"</string>
     <string name="undo" msgid="6070869718469782251">"Vrátit zpět"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9cc2336..944c8d6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkroniser og underret"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Etiketindstillinger"</string>
     <string name="menu_done" msgid="5791134842152855128">"Udført"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Kontoindstillinger"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Indstillinger"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Søg"</string>
     <string name="more" msgid="1238344647379009858">"Mere"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d38af3f..0812517 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchr. &amp; benachrichtigen"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Label-Einstellungen"</string>
     <string name="menu_done" msgid="5791134842152855128">"Fertig"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Kontoeinstellungen"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Einstellungen"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Suche"</string>
     <string name="more" msgid="1238344647379009858">"Mehr"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Diese Konversation löschen?"</item>
+    <item quantity="other" msgid="930334208937121234">"Diese <xliff:g id="COUNT">%1$d</xliff:g> Konversationen löschen?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Diese Konversation archivieren?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Diese <xliff:g id="COUNT">%1$d</xliff:g> Konversationen archivieren?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Nachricht verwerfen?"</string>
     <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 9caccb8..a60e971 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"Αποστολή"</string>
     <string name="mark_read" msgid="8438349154394313195">"Επισήμανση ως αναγνωσμένης"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Επισήμανση ως μη αναγνωσμένης"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Συγχρονισμός και ειδοποίηση"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Ρυθμίσεις ετικέτας"</string>
     <string name="menu_done" msgid="5791134842152855128">"Τέλος"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Ρυθμίσεις λογαριασμού"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Ρυθμίσεις"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Αναζήτηση"</string>
     <string name="more" msgid="1238344647379009858">"Περισσότερα"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> από <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 9cf4fe8..d7f657b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sync &amp; notify"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Label settings"</string>
     <string name="menu_done" msgid="5791134842152855128">"Finished"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Account settings"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Settings"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Search"</string>
     <string name="more" msgid="1238344647379009858">"More"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2284185..70eb420 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Configuración de la etiqueta"</string>
     <string name="menu_done" msgid="5791134842152855128">"Listo"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Configuración de la cuenta"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Configuración"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Buscar"</string>
     <string name="more" msgid="1238344647379009858">"Más"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ecb1912..88ecedd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Ajustes de etiquetas"</string>
     <string name="menu_done" msgid="5791134842152855128">"Listo"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Ajustes de la cuenta"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Ajustes"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Buscar"</string>
     <string name="more" msgid="1238344647379009858">"Más"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,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>
-    <!-- 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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"¿Eliminar esta conversación?"</item>
+    <item quantity="other" msgid="930334208937121234">"¿Eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"¿Archivar esta conversación?"</item>
+    <item quantity="other" msgid="4713469868399246772">"¿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">

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 9eb2559..f098e3a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sünkroonimine ja teavitamine"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Sildi seaded"</string>
     <string name="menu_done" msgid="5791134842152855128">"Valmis"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Konto seaded"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Seaded"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Otsing ..."</string>
     <string name="more" msgid="1238344647379009858">"Rohkem"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>-st"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Kas kustutada see meilivestlus?"</item>
+    <item quantity="other" msgid="930334208937121234">"Kas kustutada need <xliff:g id="COUNT">%1$d</xliff:g> meilivestlust?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Kas arhiveerida see meilivestlus?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Kas arhiveerida need <xliff:g id="COUNT">%1$d</xliff:g> meilivestlust?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Kas soovite sellest sõnumist loobuda?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Meilivestlusi pole."</string>
     <string name="undo" msgid="6070869718469782251">"Võta tagasi"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c66591c..23fdf97 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"ارسال"</string>
     <string name="mark_read" msgid="8438349154394313195">"علامت‌گذاری بعنوان خوانده‌شده"</string>
     <string name="mark_unread" msgid="6231373939351125713">"علامت‌گذاری بعنوان خوانده‌نشده"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"همگام‌سازی و اعلان"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"تنظیمات برچسب"</string>
     <string name="menu_done" msgid="5791134842152855128">"انجام شد"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"تنظیمات حساب"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"تنظیمات"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"جستجو"</string>
     <string name="more" msgid="1238344647379009858">"بیشتر"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> از <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d4fb4e6..5124c6d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronoi ja ilmoita"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Tunnisteen asetukset"</string>
     <string name="menu_done" msgid="5791134842152855128">"Valmis"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Tilin asetukset"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Asetukset"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Haku"</string>
     <string name="more" msgid="1238344647379009858">"Lisää"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Poistetaanko tämä keskustelu?"</item>
+    <item quantity="other" msgid="930334208937121234">"Poistetaanko nämä <xliff:g id="COUNT">%1$d</xliff:g> keskustelua?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Arkistoidaanko tämä keskustelu?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Arkistoidaanko nämä <xliff:g id="COUNT">%1$d</xliff:g> keskustelua?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Hylätäänkö tämä viesti?"</string>
     <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 ab2adbf..39376a3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"Envoyer"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marquer comme lue"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniser et signaler"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Paramètres du libellé"</string>
     <string name="menu_done" msgid="5791134842152855128">"OK"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Paramètres de compte"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Paramètres"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Rechercher"</string>
     <string name="more" msgid="1238344647379009858">"Plus"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +133,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Supprimer cette conversation ?"</item>
+    <item quantity="other" msgid="930334208937121234">"Supprimer ces <xliff:g id="COUNT">%1$d</xliff:g> conversations ?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Archiver cette conversation ?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Archiver ces <xliff:g id="COUNT">%1$d</xliff:g> conversations ?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Supprimer ce message ?"</string>
     <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 38e467b..3a9b5d0 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"भेजें"</string>
     <string name="mark_read" msgid="8438349154394313195">"पढ़ी गई चिह्नित करें"</string>
     <string name="mark_unread" msgid="6231373939351125713">"बिना पढ़ी चिह्नित करें"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"समन्वयित करें और सूचित करें"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"लेबल सेटिंग"</string>
     <string name="menu_done" msgid="5791134842152855128">"पूर्ण"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"खाता सेटिंग"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"सेटिंग"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"खोजें"</string>
     <string name="more" msgid="1238344647379009858">"अधिक"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="COUNT">%1$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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-hr/strings.xml b/res/values-hr/strings.xml
index b394a8f..e087d66 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniziraj i obavijesti"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Postavke oznake"</string>
     <string name="menu_done" msgid="5791134842152855128">"Gotovo"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Postavke računa"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Postavke"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Pretraživanje"</string>
     <string name="more" msgid="1238344647379009858">"Više"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Izbrisati ovaj razgovor?"</item>
+    <item quantity="other" msgid="930334208937121234">"Izbrisati ovoliko razgovora: <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Arhivirati ovaj razgovor?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Arhivirati ovoliko razgovora: <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Odbaciti ovu poruku?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Nema razgovora."</string>
     <string name="undo" msgid="6070869718469782251">"Poništi"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 60c8ab0..569772e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Szinkronizálás és értesítés"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Címkebeállítások"</string>
     <string name="menu_done" msgid="5791134842152855128">"Kész"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Fiókbeállítások"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Beállítások"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Keresés"</string>
     <string name="more" msgid="1238344647379009858">"Egyebek"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="COUNT">%1$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Törli ezt a beszélgetést?"</item>
+    <item quantity="other" msgid="930334208937121234">"Törli ezt a(z) <xliff:g id="COUNT">%1$d</xliff:g> beszélgetést?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Archiválja ezt a beszélgetést?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Archiválja ezt a(z) <xliff:g id="COUNT">%1$d</xliff:g> beszélgetést?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Elveti ezt az üzenetet?"</string>
     <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 fbfe1b5..ba67cd8 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkronkan &amp; beri tahu"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Setelan label"</string>
     <string name="menu_done" msgid="5791134842152855128">"Selesai"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Setelan akun"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Setelan"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Telusuri"</string>
     <string name="more" msgid="1238344647379009858">"Lainnya"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index de46916..c2b4dc2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizza e notifica"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Impostazioni etichetta"</string>
     <string name="menu_done" msgid="5791134842152855128">"Fine"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Impostazioni account"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Impostazioni"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Cerca"</string>
     <string name="more" msgid="1238344647379009858">"Altre"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> di <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 29d9f7a..f2ef916 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"שלח"</string>
     <string name="mark_read" msgid="8438349154394313195">"סמן כנקראה"</string>
     <string name="mark_unread" msgid="6231373939351125713">"סמן כלא נקראה"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"סנכרן ושלח התראה"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"הגדרות תווית"</string>
     <string name="menu_done" msgid="5791134842152855128">"בוצע"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"הגדרות חשבון"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"הגדרות"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"חפש"</string>
     <string name="more" msgid="1238344647379009858">"עוד"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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-ja/strings.xml b/res/values-ja/strings.xml
index 4e235d2..88fa20b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"送信"</string>
     <string name="mark_read" msgid="8438349154394313195">"既読にする"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"同期と通知"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"ラベルの設定"</string>
     <string name="menu_done" msgid="5791134842152855128">"完了"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"アカウント設定"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"設定"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"検索"</string>
     <string name="more" msgid="1238344647379009858">"その他"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7499b7a..94568cf 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"보내기"</string>
     <string name="mark_read" msgid="8438349154394313195">"읽음으로 표시"</string>
     <string name="mark_unread" msgid="6231373939351125713">"읽지않음으로 표시"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"동기화 및 알림"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"라벨 설정"</string>
     <string name="menu_done" msgid="5791134842152855128">"완료"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"계정 설정"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"설정"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"검색"</string>
     <string name="more" msgid="1238344647379009858">"더보기"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="TOTAL">%2$s</xliff:g>개 중 <xliff:g id="COUNT">%1$s</xliff:g>개"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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-lt/strings.xml b/res/values-lt/strings.xml
index a4d3ff0..f7c8fb6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinchronizuoti ir pranešti"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Etiketės nustatymai"</string>
     <string name="menu_done" msgid="5791134842152855128">"Atlikta"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Paskyros nustatymai"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Nustatymai"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Paieška"</string>
     <string name="more" msgid="1238344647379009858">"Daugiau"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2495665..90e33e2 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhronizēšana un paziņojumi"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Iezīmes iestatījumi"</string>
     <string name="menu_done" msgid="5791134842152855128">"Gatavs"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Konta iestatījumi"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Iestatījumi"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Meklēt"</string>
     <string name="more" msgid="1238344647379009858">"Vairāk"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>. no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 870ee02..9114e92 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"Hantar"</string>
     <string name="mark_read" msgid="8438349154394313195">"Tandakan dibaca"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Segerakkan &amp; beritahu"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Tetapan label"</string>
     <string name="menu_done" msgid="5791134842152855128">"Selesai"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Tetapan akaun"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Tetapan"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Carian"</string>
     <string name="more" msgid="1238344647379009858">"Lagi"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> daripada <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 31ed087..fda0bb5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronisering og varsling"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Innstillinger for etikett"</string>
     <string name="menu_done" msgid="5791134842152855128">"Ferdig"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Kontoinnstillinger"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Innstillinger"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Søk"</string>
     <string name="more" msgid="1238344647379009858">"Mer"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 94f1bc0..379ff74 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniseren en melden"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Labelinstellingen"</string>
     <string name="menu_done" msgid="5791134842152855128">"Gereed"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Accountinstellingen"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Instellingen"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Zoeken"</string>
     <string name="more" msgid="1238344647379009858">"Meer"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Deze conversatie verwijderen?"</item>
+    <item quantity="other" msgid="930334208937121234">"Deze <xliff:g id="COUNT">%1$d</xliff:g> conversaties verwijderen?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Deze conversatie archiveren?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Deze <xliff:g id="COUNT">%1$d</xliff:g> conversaties archiveren?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Dit bericht weggooien?"</string>
     <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 3bc3712..dd25804 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"Wyślij"</string>
     <string name="mark_read" msgid="8438349154394313195">"Oznacz jako przeczytane"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizuj i powiadamiaj"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Ustawienia etykiety"</string>
     <string name="menu_done" msgid="5791134842152855128">"Gotowe"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Ustawienia konta"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Ustawienia"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Szukaj"</string>
     <string name="more" msgid="1238344647379009858">"Więcej"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +133,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Usunąć wątek?"</item>
+    <item quantity="other" msgid="930334208937121234">"Usunąć wątki (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Zarchiwizować wątek?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Zarchiwizować wątki (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Odrzucić tę wiadomość?"</string>
     <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 95ccb09..6280d7f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Definições de etiquetas"</string>
     <string name="menu_done" msgid="5791134842152855128">"Concluído"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Definições da conta"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Definições"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Pesquisar"</string>
     <string name="more" msgid="1238344647379009858">"Mais"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Eliminar esta conversa?"</item>
+    <item quantity="other" msgid="930334208937121234">"Eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Arquivar esta conversa?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Arquivar <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Rejeitar esta mensagem?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Sem conversas."</string>
     <string name="undo" msgid="6070869718469782251">"Anular"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d7e1eef..a8dc876 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Configurações do marcador"</string>
     <string name="menu_done" msgid="5791134842152855128">"Concluído"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Configurações da conta"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Configurações"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Pesquisar"</string>
     <string name="more" msgid="1238344647379009858">"Mais"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Excluir esta conversa?"</item>
+    <item quantity="other" msgid="930334208937121234">"Excluir estas <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Arquivar esta conversa?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Arquivar estas <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Descartar esta mensagem?"</string>
     <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 4f919f8..ff54eb8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"Trimiteţi"</string>
     <string name="mark_read" msgid="8438349154394313195">"Marcaţi drept citită"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizare şi notificare"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Setări pentru etichete"</string>
     <string name="menu_done" msgid="5791134842152855128">"Terminat"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Setările contului"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Setări"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Căutaţi"</string>
     <string name="more" msgid="1238344647379009858">"Mai multe"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 10f7881..80763fa 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"Отправить"</string>
     <string name="mark_read" msgid="8438349154394313195">"Отметить как прочитанное"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизация и уведомления"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Настройки ярлыка"</string>
     <string name="menu_done" msgid="5791134842152855128">"Готово"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Настройки аккаунта"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Настройки"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Поиск"</string>
     <string name="more" msgid="1238344647379009858">"Еще"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +133,15 @@
     <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 />
+  <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-sk/strings.xml b/res/values-sk/strings.xml
index a32c60a..42122d0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"Poslať"</string>
     <string name="mark_read" msgid="8438349154394313195">"Označiť ako prečítané"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizovať a upozorniť"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Nastavenia menovky"</string>
     <string name="menu_done" msgid="5791134842152855128">"Hotovo"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Nastavenia účtu"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Nastavenia"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Hľadať"</string>
     <string name="more" msgid="1238344647379009858">"Viac"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +133,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Odstrániť túto konverzáciu?"</item>
+    <item quantity="other" msgid="930334208937121234">"Odstrániť tieto konverzácie (počet: <xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Archivovať túto konverzáciu?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Archivovať tieto konverzácie (počet: <xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Zahodiť túto správu?"</string>
     <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 647b086..e0fa44b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhroniziraj in obvesti"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Nastavitve oznake"</string>
     <string name="menu_done" msgid="5791134842152855128">"Končano"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Nastavitve računa"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Nastavitve"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Išči"</string>
     <string name="more" msgid="1238344647379009858">"Več"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Želite izbrisati ta pogovor?"</item>
+    <item quantity="other" msgid="930334208937121234">"Želite izbrisati toliko pogovorov: <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Želite arhivirati ta pogovor?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Želite arhivirati toliko pogovorov: <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Želite zavreči sporočilo?"</string>
     <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 57d0c44..abdfd9c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"Пошаљи"</string>
     <string name="mark_read" msgid="8438349154394313195">"Означи као прочитано"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Означи као непрочитано"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизовање и обавештавање"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Подешавања ознаке"</string>
     <string name="menu_done" msgid="5791134842152855128">"Готово"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Подешавања налога"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Подешавања"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Претражи"</string>
     <string name="more" msgid="1238344647379009858">"Још"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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-sv/strings.xml b/res/values-sv/strings.xml
index deed5e8..4ae5907 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synka och meddela"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Inställningar för etikett"</string>
     <string name="menu_done" msgid="5791134842152855128">"Klar"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Kontoinställningar"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Inställningar"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Sök"</string>
     <string name="more" msgid="1238344647379009858">"Mer"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Vill du ta bort konversationen?"</item>
+    <item quantity="other" msgid="930334208937121234">"Vill du ta bort de här <xliff:g id="COUNT">%1$d</xliff:g> konversationerna?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Vill du arkivera konversationen?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Vill du arkivera de här <xliff:g id="COUNT">%1$d</xliff:g> konversationerna?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Vill du slänga meddelandet?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Inga konversationer."</string>
     <string name="undo" msgid="6070869718469782251">"Ångra"</string>
   <plurals name="conversation_marking_read">

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 025cb35..b30d2f2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"Tuma"</string>
     <string name="mark_read" msgid="8438349154394313195">"Weka alama kuwa imesomwa"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Landanisha &amp; arifu"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Mipangilio ya lebo"</string>
     <string name="menu_done" msgid="5791134842152855128">"Imekamilika"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Mipangilio ya akaunti"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Mipangilio"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Tafuta"</string>
     <string name="more" msgid="1238344647379009858">"Zaidi"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> wa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 46f406e..8b08c78 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"ส่ง"</string>
     <string name="mark_read" msgid="8438349154394313195">"ทำเครื่องหมายว่าอ่านแล้ว"</string>
     <string name="mark_unread" msgid="6231373939351125713">"ทำเครื่องหมายว่ายังไม่อ่าน"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"ซิงค์และแจ้งเตือน"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"การตั้งค่าป้ายกำกับ"</string>
     <string name="menu_done" msgid="5791134842152855128">"เสร็จสิ้น"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"การตั้งค่าบัญชี"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"การตั้งค่า"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"ค้นหา"</string>
     <string name="more" msgid="1238344647379009858">"เพิ่มเติม"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> จาก <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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-tl/strings.xml b/res/values-tl/strings.xml
index 18a64c1..198c442 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"I-sync at i-notify"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Mga setting ng label"</string>
     <string name="menu_done" msgid="5791134842152855128">"Tapos na"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Mga setting ng account"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Mga Setting"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Maghanap"</string>
     <string name="more" msgid="1238344647379009858">"Higit pa"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> ng <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Tanggalin ang pag-uusap na ito?"</item>
+    <item quantity="other" msgid="930334208937121234">"Tanggalin ang <xliff:g id="COUNT">%1$d</xliff:g> (na) pag-uusap na ito?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"I-archive ang pag-uusap na ito?"</item>
+    <item quantity="other" msgid="4713469868399246772">"I-archive ang <xliff:g id="COUNT">%1$d</xliff:g> (na) pag-uusap na ito?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"I-discard ang mensaheng ito?"</string>
     <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 754c51d..c1920f4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Senkronize et ve bildir"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Etiket ayarları"</string>
     <string name="menu_done" msgid="5791134842152855128">"Bitti"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Hesap ayarları"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Ayarlar"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Ara"</string>
     <string name="more" msgid="1238344647379009858">"Diğer"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Bu ileti dizisi silinsin mi?"</item>
+    <item quantity="other" msgid="930334208937121234">"Bu <xliff:g id="COUNT">%1$d</xliff:g> ileti dizisi silinsin mi?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Bu ileti dizisi arşivlensin mi?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Bu <xliff:g id="COUNT">%1$d</xliff:g> ileti dizisi arşivlensin mi?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Bu ileti silinsin mi?"</string>
     <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">
@@ -195,8 +199,10 @@
     <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi okunmadı olarak işaretlendi."</item>
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ileti dizisi okunmadı olarak işaretlendi."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Klasör değişti."</item>
+    <item quantity="other" msgid="8918589141287976985">"Klasörler değişti."</item>
+  </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Sonuçlar"</string>
     <string name="searchMode" msgid="3329807422114758583">"Arama Modu"</string>
     <string name="searchConversationMode" msgid="8015441927706455618">"İleti Dizisi Arama Modu"</string>
@@ -233,12 +239,14 @@
     <string name="cancel" msgid="8762981157252199115">"İptal"</string>
     <string name="close" msgid="419945428844076406">"Kapat"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Bu hesap için hiçbir klasör ayarlanmamış."</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Başarılı"</item>
+    <item msgid="5037283655022689372">"Bağlantı hatası"</item>
+    <item msgid="4252875340758600974">"Kimlik doğrulama hatası"</item>
+    <item msgid="7611299631880179587">"Güvenlik hatası"</item>
+    <item msgid="665244114363057627">"Depolama hatası"</item>
+    <item msgid="9190542479647789762">"Dahili hata"</item>
+  </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Kurulum için dokunun"</string>
     <string name="non_synced_folder_description" msgid="6059194125558004080">"İleti dizilerini görüntülemek için bu klasörü senk edin."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Klasörü Senkronize Et"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fa48aa2..2fea593 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"Надіслати"</string>
     <string name="mark_read" msgid="8438349154394313195">"Позначити як прочитану"</string>
     <string name="mark_unread" msgid="6231373939351125713">"Позначити як непрочитану"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронізація та сповіщення"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Налаштування мітки"</string>
     <string name="menu_done" msgid="5791134842152855128">"Готово"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Налаштування облікового запису"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Налаштування"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Пошук"</string>
     <string name="more" msgid="1238344647379009858">"Більше"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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-vi/strings.xml b/res/values-vi/strings.xml
index 6964b22..3cc709c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Đ.bộ hóa &amp; t.báo"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Cài đặt nhãn"</string>
     <string name="menu_done" msgid="5791134842152855128">"Hoàn tất"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Cài đặt tài khoản"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Cài đặt"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Tìm kiếm"</string>
     <string name="more" msgid="1238344647379009858">"Khác"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <plurals name="confirm_delete_conversation">
+    <item quantity="one" msgid="3731948757247905508">"Xóa cuộc hội thoại này?"</item>
+    <item quantity="other" msgid="930334208937121234">"Xóa <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại này?"</item>
+  </plurals>
+  <plurals name="confirm_archive_conversation">
+    <item quantity="one" msgid="2990537295519552069">"Lưu trữ cuộc hội thoại này?"</item>
+    <item quantity="other" msgid="4713469868399246772">"Lưu trữ <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại này?"</item>
+  </plurals>
+    <string name="confirm_discard_text" msgid="1149834186404614612">"Hủy tin nhắn này?"</string>
     <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 e996938..efdf1bb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -47,7 +47,7 @@
     <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) -->
+    <!-- no translation found for signature (7882698047321710252) -->
     <skip />
     <string name="send" msgid="8242003661397555986">"发送"</string>
     <string name="mark_read" msgid="8438349154394313195">"标记为已读"</string>
@@ -73,8 +73,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"同步与通知"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"标签设置"</string>
     <string name="menu_done" msgid="5791134842152855128">"完成"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"帐户设置"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"设置"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"搜索"</string>
     <string name="more" msgid="1238344647379009858">"更多"</string>
     <string name="message_count" msgid="1032500151281269302">"第 <xliff:g id="COUNT">%1$s</xliff:g> 封，共 <xliff:g id="TOTAL">%2$s</xliff:g> 封"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ae5a4d4..58a7128 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <string name="send" msgid="8242003661397555986">"傳送"</string>
     <string name="mark_read" msgid="8438349154394313195">"標示為已讀取"</string>
     <string name="mark_unread" msgid="6231373939351125713">"標示為未讀取"</string>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"同步處理並通知"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"標籤設定"</string>
     <string name="menu_done" msgid="5791134842152855128">"完成"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"帳戶設定"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"設定"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"搜尋"</string>
     <string name="more" msgid="1238344647379009858">"更多"</string>
     <string name="message_count" msgid="1032500151281269302">"第 <xliff:g id="COUNT">%1$s</xliff:g> 封，共 <xliff:g id="TOTAL">%2$s</xliff:g> 封"</string>
@@ -131,12 +132,15 @@
     <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 />
+  <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-zu/strings.xml b/res/values-zu/strings.xml
index 70a6d8f..cc564a4 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -47,8 +47,7 @@
     <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="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
     <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>
@@ -73,8 +72,10 @@
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Ukuvumelanisa &amp; ukuqaphelisa"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Izilungiselelo zelebuli"</string>
     <string name="menu_done" msgid="5791134842152855128">"Kwenziwe"</string>
-    <string name="menu_account_settings" msgid="825820027931270435">"Izilungiselelo ze-akhawunti"</string>
-    <string name="menu_settings" msgid="8957431987536606063">"Izilungiselelo"</string>
+    <!-- no translation found for menu_account_settings (8230989362863431918) -->
+    <skip />
+    <!-- no translation found for menu_settings (6007027046949837282) -->
+    <skip />
     <string name="menu_search" msgid="5297197523031943248">"Sesha"</string>
     <string name="more" msgid="1238344647379009858">"Okuningi"</string>
     <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> koku-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -132,14 +133,14 @@
     <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>
+    <item quantity="one" msgid="3731948757247905508">"Susa le ngxoxo?"</item>
+    <item quantity="other" msgid="930334208937121234">"Susa lezi zingxoxo ezingu-<xliff:g id="COUNT">%1$d</xliff:g>?"</item>
   </plurals>
   <plurals name="confirm_archive_conversation">
-    <item quantity="one" msgid="2990537295519552069">"Ufuna ukulondoloza lenkulumo?"</item>
+    <item quantity="one" msgid="2990537295519552069">"Ufuna ukufaka lengxoxo kungobo yomlando?"</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="confirm_discard_text" msgid="1149834186404614612">"Lahla lo mlayezo?"</string>
     <string name="no_conversations" msgid="35400008890372241">"Azikho izingxoxo."</string>
     <string name="undo" msgid="6070869718469782251">"Hlehlisa"</string>
   <plurals name="conversation_marking_read">
commit	75a234244a9bc9c257f3f7ac3a6b1b34e9136da3	[log] [tgz]
author	Mindy Pereira <mindyp@google.com>	Mon Mar 05 13:27:15 2012 -0800
committer	Android (Google) Code Review <android-gerrit@google.com>	Mon Mar 05 13:27:15 2012 -0800
tree	b631abf9e8d127eec7aac5a08b19d50df993f793
parent	364c42505db59b2558f6cffa62fc06d9f904d96b [diff]
parent	e144d1d90b1fbefdedc1d95b6ff33a45fad252ce [diff]