Merge "Import translations. DO NOT MERGE"

commit: f854e227e7658d18fccfaa8f253f0fac1c2881c0 [log] [tgz]
author: Eric Fischer <enf@google.com> Wed Feb 29 11:57:10 2012 -0800
committer: Android (Google) Code Review <android-gerrit@google.com> Wed Feb 29 11:57:10 2012 -0800
tree: ed76581e4d5bcd3a4a9e3ed9b11465a74ae3ddc3
parent: 04ff99c8ac7742e952afb8a25b17f7997fc907de [diff]
parent: 263462b2064dbbe03cc9613763274270eff0dd42 [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2d36437..1a7e4cb 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Het vouers verander."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultate"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Soekmodus"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Soek gesprekmodus"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Stel Terugknoppie"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Verwyder Terug-knoppie"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Stel normaalmodus"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Soekresultaat-modus"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Stel etiketmodus"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Soek tans…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Onlangs"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Vou ontvanger se details uit"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Boodskap as konsep gestoor."</string>
     <string name="sending_message" msgid="1498583163419122128">"Stuur tans boodskap…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Die adres <xliff:g id="WRONGEMAIL">%s</xliff:g> is ongeldig."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Wys aangehaalde teks"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Versteek aangehaalde teks"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Klaar"</string>

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

@@ -188,10 +188,17 @@
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&gt; ያልተነበበ ተብሎ ምልክት ተደርጎበታል።"</item>
   </plurals>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="4930161390461457462">"የተቀየረ አቃፊ፡፡"</item>
-    <item quantity="other" msgid="8918589141287976985">"የተቀየሩ አቃፊዎች፡፡"</item>
+    <item quantity="one" msgid="4930161390461457462">"የተቀየረ አቃፊ። የተለወጠ አቃፊ።"</item>
+    <item quantity="other" msgid="8918589141287976985">"የተቀየሩ አቃፊዎች።"</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"ውጤቶች"</string>
+    <string name="searchMode" msgid="3329807422114758583">"የፍለጋ ሁናቴ"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"የውይይት ፍለጋ ሁናቴ"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"የተመለስ አዘራር አዘጋጅ"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"የተመለስ አዘራር አስወግድ"</string>
+    <string name="normalMode" msgid="4250277414924926730">"መደበኛ ሁኔታ አዘጋጅ"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"የፍለጋ ውጤት ሁናቴ"</string>
+    <string name="labelMode" msgid="1821987146443702635">"የስያሜ ሁናቴ አዘጋጅ"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"በመፈለግ ላይ…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"የቅርብ ጊዜ"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"የተቀባይ ዝርዝሮችን ዘርጋ"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"تم تغيير المجلدات."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"النتائج"</string>
+    <string name="searchMode" msgid="3329807422114758583">"وضع البحث"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"وضع البحث في المحادثات"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"تعيين زر الرجوع"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"إزالة زر الرجوع"</string>
+    <string name="normalMode" msgid="4250277414924926730">"تعيين الوضع العادي"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"وضع نتائج البحث"</string>
+    <string name="labelMode" msgid="1821987146443702635">"تعيين وضع التصنيف"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"جارٍ البحث…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"الأحدث"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"توسيع تفاصيل المستلم"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"تمّ حفظ الرسالة كمسودة."</string>
     <string name="sending_message" msgid="1498583163419122128">"جارٍ إرسال الرسالة…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"العنوان <xliff:g id="WRONGEMAIL">%s</xliff:g> غير صالح."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ عرض النص المقتبس"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ إخفاء النص المقتبس"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">"، "</string>
     <string name="ok" msgid="8339355733816891026">"موافق"</string>
     <string name="done" msgid="3079981801778027540">"تم"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Змененыя тэчкі."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Вынікі"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Рэжым пошуку"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Рэжым пошуку размовы"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Усталяваць кнопку \"Назад\""</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Выдаліць кнопку \"Назад\""</string>
+    <string name="normalMode" msgid="4250277414924926730">"Усталяваць звычайны рэжым"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Рэжым вынiкаў пошуку"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Усталяваць рэжым цэтлiка"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Пошук..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Нядаўнiя навіны"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Разгарнуць звесткi пра атрымальніка"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Паведамленне захавана як чарнавік."</string>
     <string name="sending_message" msgid="1498583163419122128">"Адпраўка паведамлення..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адрас <xliff:g id="WRONGEMAIL">%s</xliff:g> несапраўдны."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Паказаць цытуемы тэкст"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Схаваць цытуемы тэкст"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"ОК"</string>
     <string name="done" msgid="3079981801778027540">"Гатова"</string>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Препращане"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Ново съобщение"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Промяна на етикетите"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Промяна на папките"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Управление на етикетите"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Етикети"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизиране и известяване"</string>
@@ -193,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Променихте папките."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Резултати"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Режим на търсене"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Режим  на търсене в кореспонденциите"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Задаване на бутона за назад"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Премахване на бутона за назад"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Задаване на нормален режим"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Режим на търсене в резултатите"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Задаване на режим с етикети"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Търси се…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Скорошни"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Разгъване на подробностите за получателя"</string>
@@ -231,33 +237,22 @@
     <item msgid="665244114363057627">"Грешка в хранилището"</item>
     <item msgid="9190542479647789762">"Вътрешна грешка"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"Докоснете, за да настроите"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"За да видите кореспонденциите, синхронизирайте тази папка."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизиране на папката"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"Преглед на още кореспонденции"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Зарежда се…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Изберете профил"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Изберете папка"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Синхронизиране: Всички"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Синхронизиране: Последният <xliff:g id="COUNT">%1$d</xliff:g> ден"</item>
+    <item quantity="other" msgid="6856940335775567991">"Синхронизиране: Последните <xliff:g id="COUNT">%1$d</xliff:g> дни"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Синхронизиране: Без"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Синхронизиране на папката"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"За да видите кореспонденциите в приспособлението, синхронизирайте тази папка."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Да се синхр. последните <xliff:g id="NUMSYNCDAYS">%d</xliff:g> дни"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Промяна на папките"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"S\'han canviat les carpetes."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultats"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Mode de cerca"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Cerca el mode de conversa"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Defineix el botó Enrere"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Elimina el botó Enrere"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Defineix el mode normal"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Mode de resultats de cerca"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Defineix el mode d\'etiquetes"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"S\'està cercant..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Recents"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Amplia els detalls del destinatari"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Missatge desat com a esborrany."</string>
     <string name="sending_message" msgid="1498583163419122128">"S\'està enviant el missatge…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"L\'adreça <xliff:g id="WRONGEMAIL">%s</xliff:g> no és vàlida."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Mostra el text citat"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Amaga el text citat"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"D\'acord"</string>
     <string name="done" msgid="3079981801778027540">"Fet"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Složky změněny."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Výsledky"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Režim vyhledávání"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Režim vyhledávání konverzací"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Nastavit tlačítko Zpět"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Odebrat tlačítko Zpět"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Nastavit normální režim"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Režim výsledků vyhledávání"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Nastavit režim štítků"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Vyhledávání..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Nejnovější"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Rozbalit podrobnosti o příjemci"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Zpráva byla uložena jako koncept."</string>
     <string name="sending_message" msgid="1498583163419122128">"Odesílání zprávy…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> je neplatná."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Zobrazit citovaný text"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Skrýt citovaný text"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Hotovo"</string>

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

@@ -193,6 +193,13 @@
     <item quantity="other" msgid="8918589141287976985">"Ændrede mapper."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultater"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Søgetilstand"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Tilstand for søgning i samtaler"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Angiv knappen Tilbage"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Fjern knappen Tilbage"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Angiv normal tilstand"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Tilstand for søgeresultater"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Angiv etikettilstand"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Søger..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Seneste"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Udvid modtageroplysninger"</string>
@@ -213,10 +220,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Meddelelsen er gemt som kladde."</string>
     <string name="sending_message" msgid="1498583163419122128">"Sender meddelelsen..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> er ugyldig."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Vis citeret tekst"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Skjul citeret tekst"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Udført"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Ordner geändert"</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Ergebnisse"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Suchmodus"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Modus \"In Konversationen suchen\""</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Schaltfläche \"Zurück\" festlegen"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Schaltfläche \"Zurück\" entfernen"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Normalen Modus festlegen"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Modus \"In Ergebnissen suchen\""</string>
+    <string name="labelMode" msgid="1821987146443702635">"Label-Modus festlegen"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Wird gesucht..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Letzte"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Empfängerdetails maximieren"</string>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Προώθηση"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Σύνταξη"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Αλλαγή ετικετών"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Αλλαγή φακέλων"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Διαχείριση ετικετών"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Ετικέτες"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Συγχρονισμός και ειδοποίηση"</string>
@@ -193,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Αλλαγή φακέλων."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Αποτελέσματα"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Λειτουργία αναζήτησης"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Λειτουργία αναζήτησης συνομιλίας"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Ορισμός κουμπιού \"Πίσω\""</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Κατάργηση κουμπιού \"Πίσω\""</string>
+    <string name="normalMode" msgid="4250277414924926730">"Ορισμός κανονικής λειτουργίας"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Λειτουργία αποτελεσμάτων αναζήτησης"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Ορισμός λειτουργίας ετικέτας"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Αναζήτηση…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Πρόσφατες"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Ανάπτυξη στοιχείων παραλήπτη"</string>
@@ -213,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Το μήνυμα αποθηκεύτηκε ως πρόχειρο."</string>
     <string name="sending_message" msgid="1498583163419122128">"Αποστολή μηνύματος..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Η διεύθυνση <xliff:g id="WRONGEMAIL">%s</xliff:g> δεν είναι έγκυρη."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Εμφάνιση αναφερόμενου κειμένου"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Απόκρυψη αναφερόμενου κειμένου"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Τέλος"</string>
@@ -231,33 +235,22 @@
     <item msgid="665244114363057627">"Σφάλμα χώρου αποθήκευσης"</item>
     <item msgid="9190542479647789762">"Εσωτερικό σφάλμα"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"Αγγίξτε για ρύθμιση"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Συγχρ. τον φάκελο για προβ. συνομ."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Συγχρονισμός φακέλου"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"Προβολή περισσότερων συνομιλιών"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Φόρτωση..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Επιλογή λογαριασμού"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Επιλογή φακέλου"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Συγχρονισμός: Όλες"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Συγχρονισμός: Τελευταίας <xliff:g id="COUNT">%1$d</xliff:g> ημέρας"</item>
+    <item quantity="other" msgid="6856940335775567991">"Συγχρονισμός: Τελευταίων <xliff:g id="COUNT">%1$d</xliff:g> ημερών"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Συγχρονισμός: Καμία"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Συγχρονισμός φακέλου"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Για να προβάλετε συνομιλίες στο γραφικό στοιχείο, συγχρονίστε αυτόν τον φάκελο."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Συγχρονισμ. τελευταίων <xliff:g id="NUMSYNCDAYS">%d</xliff:g> ημερών"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Αλλαγή φακέλων"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Changed folders."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Results"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Search Mode"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Search Conversation Mode"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Set Back Button"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Remove Back Button"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Set Normal Mode"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Search Result Mode"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Set Label Mode"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Searching…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Recent"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expand recipient details"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Message saved as draft."</string>
     <string name="sending_message" msgid="1498583163419122128">"Sending message…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"The address <xliff:g id="WRONGEMAIL">%s</xliff:g> is invalid."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Show quoted text"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Hide quoted text"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Finished"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Carpetas modificadas"</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Buscar modo"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Buscar modo de conversación"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Definir el botón Atrás"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Quitar el botón Atrás"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Definir modo normal"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Buscar modo de resultados"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Definir modo de etiqueta"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Buscando…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Recientes"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandir detalles del destinatario"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Mensaje guardado como borrador"</string>
     <string name="sending_message" msgid="1498583163419122128">"Enviando mensaje…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"La dirección <xliff:g id="WRONGEMAIL">%s</xliff:g> no es válida."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Mostrar el texto citado"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar el texto citado"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"Aceptar"</string>
     <string name="done" msgid="3079981801778027540">"Listo"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Carpetas cambiadas"</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Modo de búsqueda"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Buscar modo de conversación"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Establecer botón para volver"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Eliminar botón para volver"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Establecer modo normal"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Buscar modo de resultados"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Establecer modo de etiqueta"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Buscando..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Reciente"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Ampliar información del destinatario"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Muudetud kaustad."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Tulemused"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Otsimisrežiim"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Vestluse otsimisrežiim"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Määra nupp Tagasi"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Eemalda nupp Tagasi"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Määra tavarežiim"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Otsingutulemuste režiim"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Määra sildirežiim"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Otsimine ..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Hiljutised"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Saaja üksikasjade laiendamine"</string>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"باز ارسال"</string>
     <string name="menu_compose" msgid="6274193058224230645">"نوشتن نامه"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"تغییر برچسب‌ها"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"تغییر پوشه‌ها"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"مدیریت برچسب‌ها"</string>
     <string name="label_list_title" msgid="7948730824763052410">"برچسب‌ها"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"همگام‌سازی و اعلان"</string>
@@ -193,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"پوشه‌ها تغییر کردند."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"نتایج"</string>
+    <string name="searchMode" msgid="3329807422114758583">"حالت جستجو"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"حالت جستجوی مکالمه"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"تنظیم دکمه بازگشت"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"حذف دکمه بازگشت"</string>
+    <string name="normalMode" msgid="4250277414924926730">"تنظیم حالت عادی"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"حالت جستجوی نتیجه"</string>
+    <string name="labelMode" msgid="1821987146443702635">"تنظیم حالت برچسب"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"درحال جستجو..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"اخیر"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"گسترش جزئیات گیرنده"</string>
@@ -231,33 +237,22 @@
     <item msgid="665244114363057627">"خطای فضای ذخیره"</item>
     <item msgid="9190542479647789762">"خطای داخلی"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"برای راه‌اندازی لمس کنید"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"برای مشاهده مکالمات، این پوشه همگام شود."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"همگام‌سازی پوشه"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"مشاهده مکالمات بیشتر"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"درحال بارگیری..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"انتخاب حساب"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"انتخاب پوشه"</string>
+    <string name="sync_all" msgid="1057043212338233359">"همگام‌سازی: همه"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"همگام‌سازی: <xliff:g id="COUNT">%1$d</xliff:g> روز گذشته"</item>
+    <item quantity="other" msgid="6856940335775567991">"همگام‌سازی: <xliff:g id="COUNT">%1$d</xliff:g> روز گذشته"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"همگام‌سازی: هیچکدام"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"همگام‌سازی پوشه"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"برای مشاهده مکالمات در ابزارک، این پوشه را همگام‌سازی کنید."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"همگام‌سازی <xliff:g id="NUMSYNCDAYS">%d</xliff:g> روز گذشته"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"تغییر پوشه‌ها"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Kansioita muutettu."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Tulokset"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Hakutapa"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Haku keskustelutilasta"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Määritä Edellinen-painike"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Poista Takaisin-painike"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Aseta normaalitila"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Hakutulostila"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Aseta tunnistetila"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Haetaan.."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Uusimmat"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Laajenna vastaanottajan tiedot"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Viesti tallennettu luonnokseksi."</string>
     <string name="sending_message" msgid="1498583163419122128">"Lähetetään viestiä…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Osoite <xliff:g id="WRONGEMAIL">%s</xliff:g> ei kelpaa."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Näytä lainattu teksti"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Piilota lainattu teksti"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Valmis"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Dossiers modifiés."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Résultats"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Mode Recherche"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Mode Rechercher dans la conversation"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Utiliser le bouton \"Précédent\""</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Retirer le bouton \"Précédent\""</string>
+    <string name="normalMode" msgid="4250277414924926730">"Utiliser le mode Normal"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Mode Rechercher dans les résultats"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Utiliser le mode Libellés"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Recherche en cours…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Récents"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Développer coordonnées du destinataire"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"फ़ोल्डर बदले गए."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"परिणाम"</string>
+    <string name="searchMode" msgid="3329807422114758583">"खोज मोड"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"बातचीत खोजें मोड"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"वापस जाएं बटन सेट करें"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"वापस जाएं बटन निकालें"</string>
+    <string name="normalMode" msgid="4250277414924926730">"सामान्य मोड सेट करें"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"खोज परिणाम मोड"</string>
+    <string name="labelMode" msgid="1821987146443702635">"लेबल मोड सेट करें"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"खोज रहा है…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"हाल ही के"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"प्राप्तकर्ता जानकारी विस्तृत करें"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"संदेश ड्राफ़्ट के रूप में सहेजा गया."</string>
     <string name="sending_message" msgid="1498583163419122128">"संदेश भेज रहा है..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> पता अमान्‍य है."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ उद्धृत पाठ दिखाएं"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ उद्धृत पाठ छिपाएं"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"ठीक"</string>
     <string name="done" msgid="3079981801778027540">"पूर्ण"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Promijenjene mape."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Rezultati"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Način pretraživanja"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Način pretraživanja razgovora"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Postavite gumb Natrag"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Uklonite gumb Natrag"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Postavi uobičajeni način"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Rezultat pretraživanja rezultata"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Postavi način oznake"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Traženje..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Nedavno"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Proširi podatke o primatelju"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Poruka je spremljena kao skica."</string>
     <string name="sending_message" msgid="1498583163419122128">"Slanje poruke…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> nije važeća."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Prikaži citirani tekst"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Sakrij citirani tekst"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"U redu"</string>
     <string name="done" msgid="3079981801778027540">"Gotovo"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"A mappák módosultak."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Találatok"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Keresési mód"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Beszélgetés keresése mód"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Vissza gomb beállítása"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Vissza gomb eltávolítása"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Normál mód beállítása"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Keresési eredmények mód"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Címkemód beállítása"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Keresés..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Legújabbak"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Címzett adatainak megjelenítése"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Az üzenet mentve piszkozatként."</string>
     <string name="sending_message" msgid="1498583163419122128">"Üzenet küldése…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"A(z) <xliff:g id="WRONGEMAIL">%s</xliff:g> cím érvénytelen."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Idézett szöveg megjelenítése"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Idézett szöveg elrejtése"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Kész"</string>
@@ -245,7 +250,7 @@
   </plurals>
     <string name="sync_none" msgid="3581727068747471804">"Szinkronizálás: ne legyen"</string>
     <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Mappa szinkronizálása"</string>
-    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Ha meg szeretné tekinteni a beszélgetéseket a modulban, szinkronizálja ezt a mappát."</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Ha szeretné megtekinteni a beszélgetéseket a modulban, szinkronizálja ezt a mappát."</string>
     <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Az utolsó <xliff:g id="NUMSYNCDAYS">%d</xliff:g> nap szinkronizálása"</string>
     <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Mappaváltás"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Map diubah."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Hasil"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Mode Penelusuran"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Mode Percakapan Penelusuran"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Setel Tombol Kembali"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Hapus Tombol Kembali"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Setel Mode Normal"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Mode Hasil Penelusuran"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Setel Mode Label"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Menelusuri…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Terkini"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Bentangkan detail penerima"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Pesan disimpan sebagai konsep."</string>
     <string name="sending_message" msgid="1498583163419122128">"Mengirim pesan…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak valid."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Tampilkan kutipan teks"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan kutipan teks"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Selesai"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Cartelle cambiate."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Risultati"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Modalità di ricerca"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Modalità Ricerca conversazione"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Imposta pulsante Indietro"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Rimuovi pulsante Indietro"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Imposta modalità Normale"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Modalità Risultato di ricerca"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Imposta modalità Etichetta"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Ricerca…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Recenti"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Espandi i dettagli destinatario"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"התיקיות שונו."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"תוצאות"</string>
+    <string name="searchMode" msgid="3329807422114758583">"מצב חיפוש"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"מצב חיפוש שיחה"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"הגדר את הלחצן \'הקודם\'"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"הסר את הלחצן \'הקודם\'"</string>
+    <string name="normalMode" msgid="4250277414924926730">"הגדר מצב רגיל"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"מצב תוצאת חיפוש"</string>
+    <string name="labelMode" msgid="1821987146443702635">"הגדר מצב תווית"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"מחפש…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"אחרונות"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"הרחב פרטי נמען"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"フォルダを変更しました。"</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"検索結果"</string>
+    <string name="searchMode" msgid="3329807422114758583">"検索モード"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"スレッド検索モード"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"戻るボタンの設定"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"戻るボタンの削除"</string>
+    <string name="normalMode" msgid="4250277414924926730">"通常モードの設定"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"検索結果モード"</string>
+    <string name="labelMode" msgid="1821987146443702635">"ラベルモードの設定"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"検索しています…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"最近"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"受信者の詳細を表示"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"メッセージを下書きとして保存しました。"</string>
     <string name="sending_message" msgid="1498583163419122128">"メールを送信中..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"アドレス<xliff:g id="WRONGEMAIL">%s</xliff:g>は無効です。"</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶元のメッセージを表示"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼元のメッセージを隠す"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">"、 "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"完了"</string>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"전달"</string>
     <string name="menu_compose" msgid="6274193058224230645">"편지쓰기"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"라벨 변경"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"폴더 변경"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"라벨 관리"</string>
     <string name="label_list_title" msgid="7948730824763052410">"라벨"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"동기화 및 알림"</string>
@@ -193,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"폴더가 변경되었습니다."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"검색결과"</string>
+    <string name="searchMode" msgid="3329807422114758583">"검색 모드"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"대화 검색 모드"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"뒤로 버튼 설정"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"뒤로 버튼 제거"</string>
+    <string name="normalMode" msgid="4250277414924926730">"일반 모드 설정"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"결과 검색 모드"</string>
+    <string name="labelMode" msgid="1821987146443702635">"라벨 모드 설정"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"검색 중…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"최근"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"수신자 세부정보 펼치기"</string>
@@ -213,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"메일이 임시보관함에 저장되었습니다."</string>
     <string name="sending_message" msgid="1498583163419122128">"메일 보내는 중..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"주소(<xliff:g id="WRONGEMAIL">%s</xliff:g>)가 잘못되었습니다."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ 받은메일 표시"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ 받은메일 숨기기"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"확인"</string>
     <string name="done" msgid="3079981801778027540">"완료"</string>
@@ -224,40 +228,29 @@
     <string name="close" msgid="419945428844076406">"닫기"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"이 계정에 대한 폴더를 설정하지 않았습니다."</string>
   <string-array name="sync_status">
-    <item msgid="2446076619901049026">"성공"</item>
+    <item msgid="2446076619901049026">"완료"</item>
     <item msgid="5037283655022689372">"연결 오류"</item>
     <item msgid="4252875340758600974">"인증 오류"</item>
     <item msgid="7611299631880179587">"보안 오류"</item>
     <item msgid="665244114363057627">"저장소 오류"</item>
     <item msgid="9190542479647789762">"내부 오류"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"설정하려면 터치하세요."</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"대화를 보려면 이 폴더를 동기화하세요."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"폴더 동기화"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"대화 더보기"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"로드 중…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"계정 선택"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"폴더 선택"</string>
+    <string name="sync_all" msgid="1057043212338233359">"동기화: 전체"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"동기화: 지난 <xliff:g id="COUNT">%1$d</xliff:g>일"</item>
+    <item quantity="other" msgid="6856940335775567991">"동기화: 지난 <xliff:g id="COUNT">%1$d</xliff:g>일"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"동기화: 안함"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"폴더 동기화"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"위젯에서 대화를 보려면 이 폴더를 동기화하세요."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"지난 <xliff:g id="NUMSYNCDAYS">%d</xliff:g>일 동기화"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"폴더 변경"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Aplankai pakeisti."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Rezultatai"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Paieškos režimas"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Ieškoti pokalbių režimo"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Nustatyti mygtuką „Atgal“"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Pašalinti mygtuką „Atgal“"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Nustatyti įprastą režimą"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Paieškos rezultatų režimas"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Nustatyti etikečių režimą"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Ieškoma…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Naujausia"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Išskleisti išsamią gavėjo informaciją"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Pranešimas išsaugotas kaip juodraštis."</string>
     <string name="sending_message" msgid="1498583163419122128">"Siunčiamas pranešimas…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresas <xliff:g id="WRONGEMAIL">%s</xliff:g> yra neteisingas."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Rodyti citatą"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Slėpti citatą"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"Gerai"</string>
     <string name="done" msgid="3079981801778027540">"Atlikta"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Mapes ir mainītas."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Rezultāti"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Meklēšanas režīms"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Meklēt sarunu režīmu"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Iestatīt pogu Atpakaļ"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Noņemt pogu Atpakaļ"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Iestatīt parasto režīmu"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Meklēšanas rezultātu režīms"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Iestatīt iezīmju režīmu"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Notiek meklēšana..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Jaunākās"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Izvērst informāciju par adresātu"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Ziņojums ir saglabāts kā melnraksts."</string>
     <string name="sending_message" msgid="1498583163419122128">"Notiek ziņojuma sūtīšana…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adrese <xliff:g id="WRONGEMAIL">%s</xliff:g> nav derīga."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Rādīt citēto tekstu"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Paslēpt citēto tekstu"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"Labi"</string>
     <string name="done" msgid="3079981801778027540">"Gatavs"</string>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Kirim semula"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Karang"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Tukar label"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Tukar folder"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Urus label"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Label"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Segerakkan &amp; beritahu"</string>
@@ -189,10 +188,17 @@
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandakan belum dibaca."</item>
   </plurals>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="4930161390461457462">"Folder diubah."</item>
-    <item quantity="other" msgid="8918589141287976985">"Folder diubah."</item>
+    <item quantity="one" msgid="4930161390461457462">"Folder yang diubah."</item>
+    <item quantity="other" msgid="8918589141287976985">"Folder yang diubah."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Hasil"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Cari dalam Mod"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Cari dalam Mod Perbualan"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Tetapkan Butang Kembali"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Alih keluar Butang Kembali"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Tetapkan Mod Biasa"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Cari dalam Mod Hasil"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Tetapkan Mod Label"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Mencari..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Terbaru"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Kembangkan butiran penerima"</string>
@@ -228,36 +234,25 @@
     <item msgid="5037283655022689372">"Ralat sambungan"</item>
     <item msgid="4252875340758600974">"Ralat pengesahan"</item>
     <item msgid="7611299631880179587">"Ralat keselamatan"</item>
-    <item msgid="665244114363057627">"Ralat storan."</item>
+    <item msgid="665244114363057627">"Ralat storan"</item>
     <item msgid="9190542479647789762">"Ralat dalaman"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"Sentuh untuk menyediakan"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat perbualan, segerakkan folder ini."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Segerak Folder"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"Lihat lagi perbualan"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Memuatkan…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Pilih akaun"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Pilih folder"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Segerak: Semua"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Segerak: <xliff:g id="COUNT">%1$d</xliff:g> hari terakhir"</item>
+    <item quantity="other" msgid="6856940335775567991">"Segerak: <xliff:g id="COUNT">%1$d</xliff:g> hari terakhir"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Segerakan: Tiada"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Segerak folder"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Untuk melihat perbualan dalam widget, segerakkan folder ini."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Segerak <xliff:g id="NUMSYNCDAYS">%d</xliff:g> hari terakhir"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Tukar folder"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Endret mapper."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultater"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Søkemodus"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Søk i samtalemodus"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Angi Tilbake-knapp"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Fjern Tilbake-knappen"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Angi normal modus"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Søkeresultatmodus"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Angi etikettmodus"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Søker …"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Nylig"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Utvid detaljer om mottaker"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"E-posten er lagret som utkast."</string>
     <string name="sending_message" msgid="1498583163419122128">"Sender e-post …"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> er ugyldig."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Vis sitert tekst"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Skjul sitert tekst"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Ferdig"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Mappen gewijzigd."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultaten"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Zoekmodus"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Modus voor zoeken naar conversaties"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"De knop \'Vorige\' instellen"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"De knop \'Vorige\' verwijderen"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Normale modus instellen"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Modus voor zoekresultaten"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Labelmodus instellen"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Zoeken…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Recent"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Ontvangersdetails uitvouwen"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Zmieniono foldery."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Wyniki"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Tryb wyszukiwania"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Tryb przeszukiwania wątku"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Ustaw przycisk Wstecz"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Usuń przycisk Wstecz"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Ustaw tryb normalny"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Tryb wyników wyszukiwania"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Ustaw tryb etykiety"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Wyszukiwanie…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Ostatnie"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Rozwiń szczegóły odbiorcy"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Wiadomość została zapisana jako wersja robocza."</string>
     <string name="sending_message" msgid="1498583163419122128">"Wysyłanie wiadomości…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adres <xliff:g id="WRONGEMAIL">%s</xliff:g> jest nieprawidłowy."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Pokaż cytowany tekst"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Ukryj cytowany tekst"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Gotowe"</string>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Encaminhar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Compor"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Alterar etiquetas"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Alterar pastas"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Gerir etiquetas"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiquetas"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
@@ -193,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Pastas alteradas."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Modo de Pesquisa"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Modo de Pesquisa de Conversas"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Definir o Botão Anterior"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Remover o Botão Anterior"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Definir Modo Normal"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Modo de Resultado da Pesquisa"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Definir Modo de Etiquetas"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"A pesquisar..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Recente"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandir detalhes do destinatário"</string>
@@ -229,33 +235,22 @@
     <item msgid="665244114363057627">"Erro de armazenamento"</item>
     <item msgid="9190542479647789762">"Erro interno."</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"Toque para configurar"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver as conversas, sincronize esta pasta."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar Pasta"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"Ver mais conversas"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"A carregar…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Selecionar conta"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Escolher pasta"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sincronizar: Tudo"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sincronizar: último <xliff:g id="COUNT">%1$d</xliff:g> dia"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sincronizar: últimos <xliff:g id="COUNT">%1$d</xliff:g> dias"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Sincronizar: Nenhuma"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sincronizar pasta"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Para ver as conversas no widget, sincronize esta pasta."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sincronizar últimos <xliff:g id="NUMSYNCDAYS">%d</xliff:g> dias"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Alterar pastas"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Pastas alteradas."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Modo de pesquisa"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Modo de pesquisa de conversas"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Exibir botão Voltar"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Remover botão Voltar"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Definir modo normal"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Modo de pesquisa de resultados"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Definir o modo do marcador"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Pesquisando..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Recentes"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandir detalhes do destinatário"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Mensagem salva como rascunho."</string>
     <string name="sending_message" msgid="1498583163419122128">"Enviando mensagem…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"O endereço <xliff:g id="WRONGEMAIL">%s</xliff:g> é inválido."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Exibir texto das mensagens anteriores"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto das mensagens anteriores"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Concluído"</string>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Redirecţionaţi"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Scrieţi"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Modificaţi etichetele"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Modificaţi dosarele"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Gestionaţi etichetele"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etichete"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizare şi notificare"</string>
@@ -193,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Dosare modificate."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Rezultate"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Modul Căutare"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Căutaţi în modul Conversaţie"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Setaţi butonul Înapoi"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Eliminaţi butonul Înapoi"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Setaţi modul Normal"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Căutaţi în modul Rezultate"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Setaţi modul Etichetă"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Se caută..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Recente"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Extindeţi detaliile destinatarului"</string>
@@ -224,40 +230,29 @@
     <string name="close" msgid="419945428844076406">"Închideţi"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Pentru acest cont nu a fost setat niciun dosar."</string>
   <string-array name="sync_status">
-    <item msgid="2446076619901049026">"Operaţiune finalizată"</item>
+    <item msgid="2446076619901049026">"Finalizat"</item>
     <item msgid="5037283655022689372">"Eroare de conexiune"</item>
     <item msgid="4252875340758600974">"Eroare de autentificare"</item>
     <item msgid="7611299631880179587">"Eroare de securitate"</item>
     <item msgid="665244114363057627">"Eroare de stocare"</item>
     <item msgid="9190542479647789762">"Eroare internă"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"Atingeţi pentru a configura"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Pentru a afişa conversaţiile, sincronizaţi acest dosar."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizaţi dosarul"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"Afişaţi mai multe conversaţii"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Se încarcă…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Alegeţi un cont"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Alegeţi un dosar"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sincronizare: toate"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sincronizare: ultima <xliff:g id="COUNT">%1$d</xliff:g> zi"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sincronizare: ultimele <xliff:g id="COUNT">%1$d</xliff:g> (de) zile"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Sincronizare: niciunul"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sincronizaţi dosarul"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Pentru a afişa conversaţiile din widget, sincronizaţi acest dosar."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sincron. ultimele <xliff:g id="NUMSYNCDAYS">%d</xliff:g> (de) zile"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Modificaţi dosarele"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Папки изменены."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Результаты"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Режим поиска"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Режим поиска цепочек"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Настроить кнопку \"Назад\""</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Удалить кнопку \"Назад\""</string>
+    <string name="normalMode" msgid="4250277414924926730">"Обычный режим"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Результаты поиска"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Режим ярлыков"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Поиск…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Недавние"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Показать сведения о получателе"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Черновик сообщения сохранен."</string>
     <string name="sending_message" msgid="1498583163419122128">"Отправка сообщения…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Недействительный адрес: <xliff:g id="WRONGEMAIL">%s</xliff:g>."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Показать цитируемый текст"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Скрыть цитируемый текст"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"ОК"</string>
     <string name="done" msgid="3079981801778027540">"Готово"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Zmenené priečinky."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Výsledky"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Režim vyhľadávania"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Režim vyhľadávania konverzácií"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Nastaviť tlačidlo Späť"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Odstrániť tlačidlo Späť"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Nastaviť normálny režim"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Režim výsledkov vyhľadávania"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Nastaviť režim menoviek"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Prebieha vyhľadávanie..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Nedávne"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Rozbaliť podrobnosti o príjemcovi"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Správa bola uložená ako koncept."</string>
     <string name="sending_message" msgid="1498583163419122128">"Prebieha odosielanie správy..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> je neplatná."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Zobraziť citovaný text"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Skryť citovaný text"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Hotovo"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Spremenjene mape."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Rezultati"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Način iskanja"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Način iskanja pogovora"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Nastavi gumb za vrnitev"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Odstrani gumb za vrnitev"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Nastavitev običajnega načina"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Način rezultatov iskanja"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Nastavitev načina oznak"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Iskanje ..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Nedavni"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Razširi podrobnosti prejemnika"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Sporočilo shranjeno kot osnutek."</string>
     <string name="sending_message" msgid="1498583163419122128">"Pošiljanje sporočila ..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Naslov <xliff:g id="WRONGEMAIL">%s</xliff:g> je neveljaven."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Pokaži citirano besedilo"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Skrij citirano besedilo"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"V redu"</string>
     <string name="done" msgid="3079981801778027540">"Končano"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Директоријуми су промењени."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Резултати"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Режим претраге"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Режим претраге преписки"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Подеси дугме Назад"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Уклони дугме Назад"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Подеси нормални режим"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Режим резултата претраге"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Подеси режим ознаке"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Претраживање..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Недавне"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Прошири детаље о примаоцу"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Порука је сачувана као недовршена."</string>
     <string name="sending_message" msgid="1498583163419122128">"Слање поруке…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> је неважећа."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Прикажи наведени текст"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Сакриј наведени текст"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"Потврди"</string>
     <string name="done" msgid="3079981801778027540">"Готово"</string>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Vidarebefordra"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Ändra etiketter"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Byt mapp"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Hantera etiketter"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketter"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synka och meddela"</string>
@@ -193,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Mapparna har ändrats."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Resultat"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Sökläge"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Sök i konversationsläge"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Använd bakåtknappen"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Ta bort bakåtknappen"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Ange normalläge"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Sökresultatläge"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Ange etikettläge"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Söker …"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Senaste"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandera mottagardetaljer"</string>
@@ -231,33 +237,22 @@
     <item msgid="665244114363057627">"Lagringsfel"</item>
     <item msgid="9190542479647789762">"Internt fel"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"Tryck om du vill konfigurera"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Synka för att visa konversationer."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkronisera mappen"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"Visa fler konversationer"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Läser in …"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Välj konto"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Välj mapp"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Synkronisera: alla"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Synkronisera: <xliff:g id="COUNT">%1$d</xliff:g> dagar bakåt"</item>
+    <item quantity="other" msgid="6856940335775567991">"Synkronisera: <xliff:g id="COUNT">%1$d</xliff:g> dagar bakåt"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Synkronisera: inga"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Synkronisera mappen"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Om du vill visa konversationer i widgeten synkroniserar du den här mappen."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synka <xliff:g id="NUMSYNCDAYS">%d</xliff:g> dagar bakåt"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Byt mapp"</string>
 </resources>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Sambaza"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Tunga"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Badilisha lebo"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Badilisha folda"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Dhibiti lebo"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Lebo"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Landanisha &amp; arifu"</string>
@@ -193,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Folda zilizobadilishwa."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Matokeo"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Hali ya Utafutaji"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Hali ya Utafutaji Mazungumzo"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Weka Kitufe cha Nyuma"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Ondoa Kitufe cha Nyuma"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Weka Hali ya Kawaida"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Hali ya Matokeo ya Utafutaji"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Weka Hali ya Lebo"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Inatafuta…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Hivi karibuni"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Panua maelezo ya mpokeaji"</string>
@@ -231,33 +237,22 @@
     <item msgid="665244114363057627">"Hitilafu ya hifadhi"</item>
     <item msgid="9190542479647789762">"Hitilafu ya ndani"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"Gusa ili kusanidi"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Ona mazungumzo, landanisha folda hii."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Landanisha Folda"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"Ona mazungumzo zaidi"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Inapakia…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Chagua akaunti"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Chagua folda"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Landanisha: Zote"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Landanisha: Siku <xliff:g id="COUNT">%1$d</xliff:g> ya mwisho"</item>
+    <item quantity="other" msgid="6856940335775567991">"Landanisha: Siku <xliff:g id="COUNT">%1$d</xliff:g> za mwisho"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Landanisha: Hakuna"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Landanisha folda"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Ili kuona mazungumzo katika wijeti, landanisha folda hii."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Landanisha siku <xliff:g id="NUMSYNCDAYS">%d</xliff:g> za mwisho"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Badilisha folda"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"เปลี่ยนโฟลเดอร์แล้ว"</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"ผลการค้นหา"</string>
+    <string name="searchMode" msgid="3329807422114758583">"โหมดการค้นหา"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"โหมดค้นหาการสนทนา"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"ตั้งปุ่ม \"ย้อนกลับ\""</string>
+    <string name="removeBackButton" msgid="860383341267568260">"นำปุ่ม \"ย้อนกลับ\" ออก"</string>
+    <string name="normalMode" msgid="4250277414924926730">"ตั้งโหมดปกติ"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"โหมดผลการค้นหา"</string>
+    <string name="labelMode" msgid="1821987146443702635">"ตั้งโหมดป้ายกำกับ"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"กำลังค้นหา..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"ล่าสุด"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"ขยายรายละเอียดผู้รับ"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"บันทึกข้อความเป็นร่างจดหมาย"</string>
     <string name="sending_message" msgid="1498583163419122128">"กำลังส่งข้อความ…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"ที่อยู่ <xliff:g id="WRONGEMAIL">%s</xliff:g> ไม่ถูกต้อง"</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ แสดงข้อความที่ยกมา"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ ซ่อนข้อความที่ยกมา"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"ตกลง"</string>
     <string name="done" msgid="3079981801778027540">"เสร็จสิ้น"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Mga binagong folder."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Mga resulta"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Mode ng Paghahanap"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Mode ng Paghahanap sa Pag-uusap"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Itakda ang Button na Bumalik"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Alisin ang Button na Bumalik"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Itakda sa Normal na Mode"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Mode ng Resulta ng Paghahanap"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Itakda ang Mode ng Label"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Naghahanap..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Kamakailan"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Palawakin ang mga detalye ng recipient"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Na-save ang mensahe bilang draft."</string>
     <string name="sending_message" msgid="1498583163419122128">"Ipinapadala ang mensahe…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Ang address na <xliff:g id="WRONGEMAIL">%s</xliff:g> ay di-wasto."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Ipakita ang kasamang teksto"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Itago ang kasamang teksto"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Tapos na"</string>

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

@@ -190,6 +190,13 @@
     <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
     <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
     <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>
+    <string name="setBackButton" msgid="3004728881963818222">"Geri Düğmesini Ayarla"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Geri Düğmesini Kaldır"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Normal Moda Ayarla"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Arama Sonucu Modu"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Etiket Modunu ayarla"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Aranıyor…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Son"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Alıcı ayrıntılarını genişlet"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Змінено папки."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Результати"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Режим пошуку"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Режим пошуку в бесідах"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Установити кнопку \"Назад\""</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Видалити кнопку \"Назад\""</string>
+    <string name="normalMode" msgid="4250277414924926730">"Установити нормальний режим"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Режим пошуку в результатах"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Установити режим міток"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Пошук..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Останні"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Розгорнути дані отримувача"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Повідомлення збережено як чернетку."</string>
     <string name="sending_message" msgid="1498583163419122128">"Надсилання повідомлення…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> не дійсна."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Показати цитований текст"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Сховати цитований текст"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"ОК"</string>
     <string name="done" msgid="3079981801778027540">"Готово"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Đã thay đổi thư mục."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Kết quả"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Chế độ tìm kiếm"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Tìm kiếm chế độ cuộc hội thoại"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Đặt nút quay lại"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Xóa nút quay lại"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Đặt chế độ thông thường"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Chế độ kết quả tìm kiếm"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Đặt chế độ nhãn"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Đang tìm kiếm…"</string>
     <string name="recent_labels" msgid="5539494776429934547">"Gần đây"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Mở rộng chi tiết người nhận"</string>
@@ -212,10 +219,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
     <string name="sending_message" msgid="1498583163419122128">"Đang gửi tin nhắn…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Địa chỉ <xliff:g id="WRONGEMAIL">%s</xliff:g> không hợp lệ."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Hiển thị văn bản được trích dẫn"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Ẩn văn bản được trích dẫn"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Hoàn tất"</string>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"已更改文件夹。"</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"结果"</string>
+    <string name="searchMode" msgid="3329807422114758583">"搜索模式"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"搜索会话模式"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"设置“返回”按钮"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"删除“返回”按钮"</string>
+    <string name="normalMode" msgid="4250277414924926730">"设置普通模式"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"搜索结果模式"</string>
+    <string name="labelMode" msgid="1821987146443702635">"设置标签模式"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"正在搜索..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"最近"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"展开收件人详细信息"</string>

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

@@ -65,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"轉寄"</string>
     <string name="menu_compose" msgid="6274193058224230645">"撰寫"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"變更標籤"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"變更資料夾"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"管理標籤"</string>
     <string name="label_list_title" msgid="7948730824763052410">"標籤"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"同步處理並通知"</string>
@@ -193,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"已變更資料夾。"</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"搜尋結果"</string>
+    <string name="searchMode" msgid="3329807422114758583">"搜尋模式"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"搜尋會話群組模式"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"設定 [返回] 按鈕"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"移除 [返回] 按鈕"</string>
+    <string name="normalMode" msgid="4250277414924926730">"設定標準模式"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"搜尋結果模式"</string>
+    <string name="labelMode" msgid="1821987146443702635">"設定標籤模式"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"搜尋中..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"近期"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"展開收件者詳細資料"</string>
@@ -231,33 +237,22 @@
     <item msgid="665244114363057627">"儲存空間錯誤"</item>
     <item msgid="9190542479647789762">"內部錯誤"</item>
   </string-array>
-    <!-- no translation found for tap_to_configure (1181356242354390930) -->
-    <skip />
-    <!-- no translation found for non_synced_folder_description (6059194125558004080) -->
-    <skip />
-    <!-- no translation found for tap_to_configure_folder_sync (3846898229180591661) -->
-    <skip />
+    <string name="tap_to_configure" msgid="1181356242354390930">"輕觸即可設定"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"如要查看會話群組，請同步處理這個資料夾。"</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步處理資料夾"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <!-- no translation found for view_more_conversations (3151067626309674344) -->
-    <skip />
-    <!-- no translation found for loading_conversation (489160038366067983) -->
-    <skip />
-    <!-- no translation found for activity_mailbox_selection (6876105223659297603) -->
-    <skip />
-    <!-- no translation found for activity_folder_selection (5161845867397316052) -->
-    <skip />
-    <!-- no translation found for sync_all (1057043212338233359) -->
-    <skip />
-    <!-- no translation found for sync_recent:one (137489911893192702) -->
-    <!-- no translation found for sync_recent:other (6856940335775567991) -->
-    <!-- no translation found for sync_none (3581727068747471804) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_title (6889243150191948255) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_description (3287913520283417367) -->
-    <skip />
-    <!-- no translation found for folder_sync_for_widget_checkbox (5810741160405575956) -->
-    <skip />
-    <!-- no translation found for folder_selection_dialog_title (9194093596644845383) -->
-    <skip />
+    <string name="view_more_conversations" msgid="3151067626309674344">"查看更多會話群組"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"載入中…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"選擇帳戶"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"選擇資料夾"</string>
+    <string name="sync_all" msgid="1057043212338233359">"同步處理：全部"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"同步處理：最近 <xliff:g id="COUNT">%1$d</xliff:g> 天"</item>
+    <item quantity="other" msgid="6856940335775567991">"同步處理：最近 <xliff:g id="COUNT">%1$d</xliff:g> 天"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"同步處理：無"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"同步處理資料夾"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"如要在小工具中查看會話群組，請同步處理這個資料夾。"</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"同步處理最近 <xliff:g id="NUMSYNCDAYS">%d</xliff:g> 天"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"變更資料夾"</string>
 </resources>

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

@@ -192,6 +192,13 @@
     <item quantity="other" msgid="8918589141287976985">"Amafolda ashintshiwe."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Imiphumela"</string>
+    <string name="searchMode" msgid="3329807422114758583">"Imodi yokusesha"</string>
+    <string name="searchConversationMode" msgid="8015441927706455618">"Imodi yokusesha izingxoxo"</string>
+    <string name="setBackButton" msgid="3004728881963818222">"Setha inkinobho yasemuva"</string>
+    <string name="removeBackButton" msgid="860383341267568260">"Susa inkinobho yokubuyela emuva"</string>
+    <string name="normalMode" msgid="4250277414924926730">"Setha imodi yokuvamile"</string>
+    <string name="searchResultMode" msgid="3564180712046711968">"Imodi yokusesha imiphumela"</string>
+    <string name="labelMode" msgid="1821987146443702635">"Setha imodi yelebuli"</string>
     <string name="search_results_searching_header" msgid="3821361153909466819">"Iyasesha..."</string>
     <string name="recent_labels" msgid="5539494776429934547">"Okwakamuva"</string>
     <string name="expand_recipient_details" msgid="2266544827446346880">"Nweba imininigwane yomtholi"</string>
commit	f854e227e7658d18fccfaa8f253f0fac1c2881c0	[log] [tgz]
author	Eric Fischer <enf@google.com>	Wed Feb 29 11:57:10 2012 -0800
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed Feb 29 11:57:10 2012 -0800
tree	ed76581e4d5bcd3a4a9e3ed9b11465a74ae3ddc3
parent	04ff99c8ac7742e952afb8a25b17f7997fc907de [diff]
parent	263462b2064dbbe03cc9613763274270eff0dd42 [diff]