Merge "Remove unused layout"

commit: a029816ba1b5bf3318e2e7916960e3e8034f98a8 [log] [tgz]
author: Vikram Aggarwal <viki@google.com> Tue Feb 28 14:21:30 2012 -0800
committer: Android (Google) Code Review <android-gerrit@google.com> Tue Feb 28 14:21:30 2012 -0800
tree: 899de8991fbfce1b01a14156c7496f7b111b5bcc
parent: afa6621cfca269f47c9b8a91b45086c511f96a2b [diff]
parent: 02837159bacf655d58f90a0fdeb44170814046b1 [diff]
diff --git a/gmail_src/com/android/mail/providers/proto/boot/GmailAccountService.java b/gmail_src/com/android/mail/providers/proto/boot/GmailAccountService.java
index 08e969b..10db2e7 100644
--- a/gmail_src/com/android/mail/providers/proto/boot/GmailAccountService.java
+++ b/gmail_src/com/android/mail/providers/proto/boot/GmailAccountService.java

@@ -79,6 +79,10 @@
         return Uri.parse(DEFAULT_HELP_URL);
     }
 
+    private static Uri getAccountSettingsQueryUri(String account) {
+        return Uri.parse(GMAIL_UI_PROVIDER_BASE_URI_STRING + "/" + account + "/settings");
+    }
+
     private static Uri getAccountSaveDraftUri(String account) {
         return Uri.parse(GMAIL_UI_PROVIDER_BASE_URI_STRING + "/" + account + "/saveNewMessage");
     }
@@ -162,6 +166,7 @@
                             (Uri) mockAccountMap.get(AccountColumns.EXPUNGE_MESSAGE_URI),
                             getAccountUndoUri(account.name),
                             getAccountSettingUri(account.name),
+                            getAccountSettingsQueryUri(account.name),
                             getHelpUri(),
                             0,
                             getComposeUri());

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 83acf1f..2d36437 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Verenigde e-pos"</string>
     <string name="to" msgid="4392614766835725698">"Aan"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -193,13 +192,6 @@
     <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>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"የተዋሃደ ኢሜይል"</string>
     <string name="to" msgid="4392614766835725698">"ለ"</string>
     <string name="cc" msgid="7017720927911078193">"ካርቦን ቅጂ"</string>
     <string name="bcc" msgid="3098643138241111579">"ስውር ቅጂ"</string>
@@ -66,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">"አመሳስል &amp; አሳውቅ"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -221,10 +212,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>
@@ -239,33 +228,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-ar/strings.xml b/res/values-ar/strings.xml
index 8097f7c..757ae17 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"عنوان بريد إلكتروني موحَّد"</string>
     <string name="to" msgid="4392614766835725698">"إلى"</string>
     <string name="cc" msgid="7017720927911078193">"نسخة إلى"</string>
     <string name="bcc" msgid="3098643138241111579">"نسخة مخفية الوجهة"</string>
@@ -193,13 +192,6 @@
     <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-be/strings.xml b/res/values-be/strings.xml
index af63f92..3005750 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Унiфiкаваная электронная пошта"</string>
     <string name="to" msgid="4392614766835725698">"Каму"</string>
     <string name="cc" msgid="7017720927911078193">"Копія"</string>
     <string name="bcc" msgid="3098643138241111579">"Утоеная копія"</string>
@@ -66,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>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Памылка сховiшча"</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">"Сінхранізацыя тэчкi"</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">"Глядзець iншыя размовы"</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">"Сінхранізацыя за апошнія днi: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="6856940335775567991">"Сінхранізацыя за апошнія днi: <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">"Сінхранізацыя тэчкi"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Каб праглядаць размовы ў віджэце, сінхранізуйце гэту тэчку."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Сінхранізацыя за апошнія днi: <xliff:g id="NUMSYNCDAYS">%d</xliff:g>"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Змена тэчкі"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"До"</string>
     <string name="cc" msgid="7017720927911078193">"Як"</string>
     <string name="bcc" msgid="3098643138241111579">"Ск"</string>
@@ -194,13 +193,6 @@
     <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-ca/strings.xml b/res/values-ca/strings.xml
index de2ddac..2a1c005 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Correu electrònic unificat"</string>
     <string name="to" msgid="4392614766835725698">"Per a:"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Cco"</string>
@@ -193,13 +192,6 @@
     <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>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Sjednocené e-maily"</string>
     <string name="to" msgid="4392614766835725698">"Komu"</string>
     <string name="cc" msgid="7017720927911078193">"Kopie"</string>
     <string name="bcc" msgid="3098643138241111579">"Skrytá kopie"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Přeposlat"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Napsat"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Změnit štítky"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Změnit složky"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Spravovat štítky"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Štítky"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizace a upozornění"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Chyba úložiště"</item>
     <item msgid="9190542479647789762">"Vnitřní chyba"</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">"Nastavte dotykem"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Chcete-li zobrazit konverzace, synchronizujte tuto složku."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovat složku"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"&gt;%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">"Zobrazit další konverzace"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Načítá se..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Volba účtu"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Výběr složky"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Synchronizovat: vše"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Synchronizovat: <xliff:g id="COUNT">%1$d</xliff:g> den"</item>
+    <item quantity="other" msgid="6856940335775567991">"Synchronizovat <xliff:g id="COUNT">%1$d</xliff:g> d"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Synchronizovat: nic"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Synchronizace složky"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Chcete-li ve widgetu zobrazit konverzace, synchronizujte tuto složku."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synchronizovat <xliff:g id="NUMSYNCDAYS">%d</xliff:g> d"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Změnit složky"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Samlet e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Til"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -194,13 +193,6 @@
     <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>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Einheitliche E-Mail"</string>
     <string name="to" msgid="4392614766835725698">"An"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -193,13 +192,6 @@
     <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>
@@ -220,10 +212,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Nachricht wurde als Entwurf gespeichert."</string>
     <string name="sending_message" msgid="1498583163419122128">"Nachricht wird gesendet…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Die Adresse <xliff:g id="WRONGEMAIL">%s</xliff:g> ist ungültig."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Zitierten Text anzeigen"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Zitierten Text ausblenden"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Fertig"</string>
@@ -242,7 +232,7 @@
     <string name="non_synced_folder_description" msgid="6059194125558004080">"Ordner synchronisieren, um Konversationen einzublenden"</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Ordner synchronisieren"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
-    <string name="view_more_conversations" msgid="3151067626309674344">"Weitere Konversationen anzeigen"</string>
+    <string name="view_more_conversations" msgid="3151067626309674344">"Weitere Konversationen ansehen"</string>
     <string name="loading_conversation" msgid="489160038366067983">"Wird geladen..."</string>
     <string name="activity_mailbox_selection" msgid="6876105223659297603">"Konto auswählen"</string>
     <string name="activity_folder_selection" msgid="5161845867397316052">"Ordner auswählen"</string>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Ενοποιημένη ηλεκτρονική αλληλογραφία"</string>
     <string name="to" msgid="4392614766835725698">"Προς"</string>
     <string name="cc" msgid="7017720927911078193">"Κοιν."</string>
     <string name="bcc" msgid="3098643138241111579">"Κρυφ. κοιν."</string>
@@ -189,16 +188,11 @@
     <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; επισημάνθηκε ως μη αναγνωσμένη."</item>
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; επισημάνθηκαν ως μη αναγνωσμένες."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Αλλαγή φακέλου."</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>
@@ -229,12 +223,14 @@
     <string name="cancel" msgid="8762981157252199115">"Ακύρωση"</string>
     <string name="close" msgid="419945428844076406">"Κλείσιμο"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Δεν έχουν οριστεί φάκελοι σε αυτόν τον λογαριασμό."</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Επιτυχία"</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) -->

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"To"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Forward"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Compose"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Change labels"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Change folders"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Manage labels"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Labels"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sync &amp; notify"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Storage error"</item>
     <item msgid="9190542479647789762">"Internal error"</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">"Touch to set up"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"To view conversations, sync this folder."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sync 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">"View more conversations"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Loading…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Choose account"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Choose folder"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sync: All"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sync: Last <xliff:g id="COUNT">%1$d</xliff:g> day"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sync: Last <xliff:g id="COUNT">%1$d</xliff:g> days"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Sync: None"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sync folder"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"To view conversations in the widget, sync this folder."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sync last <xliff:g id="NUMSYNCDAYS">%d</xliff:g> days"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Change folders"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Correo unificado"</string>
     <string name="to" msgid="4392614766835725698">"Para"</string>
     <string name="cc" msgid="7017720927911078193">"CC"</string>
     <string name="bcc" msgid="3098643138241111579">"CCO"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Reenviar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Redactar"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Cambiar etiquetas"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Cambiar carpetas"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Administrar etiquetas"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiquetas"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Error de almacenamiento"</item>
     <item msgid="9190542479647789762">"Error 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">"Toca para configurarlo"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver conversaciones, sincroniza esta carpeta."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar carpeta"</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 más conversaciones"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Cargando..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Seleccionar cuenta"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Seleccionar carpeta"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sincronizar: todas"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sincronizar: las conversaciones de los últimos <xliff:g id="COUNT">%1$d</xliff:g> días"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sincronizar: las conversaciones de los últimos <xliff:g id="COUNT">%1$d</xliff:g> días"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Sincronización: ninguna"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sincronizar carpeta"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Para ver conversaciones en el widget, sincroniza esta carpeta."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sincronización: <xliff:g id="NUMSYNCDAYS">%d</xliff:g> días"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Cambiar carpetas"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Correo unificado"</string>
     <string name="to" msgid="4392614766835725698">"Para"</string>
     <string name="cc" msgid="7017720927911078193">"CC"</string>
     <string name="bcc" msgid="3098643138241111579">"CCO"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Reenviar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Redactar"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Cambiar etiquetas"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Cambiar carpetas"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Administrar etiquetas"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiquetas"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -221,10 +212,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 texto entre comillas"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto entre comillas"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"Aceptar"</string>
     <string name="done" msgid="3079981801778027540">"Listo"</string>
@@ -239,33 +228,22 @@
     <item msgid="665244114363057627">"Error de almacenamiento"</item>
     <item msgid="9190542479647789762">"Error 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">"Tocar para configurar"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver conversaciones, sincroniza esta carpeta."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar carpeta"</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 más conversaciones"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Cargando..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Seleccionar cuenta"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Seleccionar carpeta"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sincronizar todas"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sincronización: último día (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sincronización: últimos <xliff:g id="COUNT">%1$d</xliff:g> días"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"No sincronizar ninguna"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sincronizar carpeta"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Para ver conversaciones en el widget, sincroniza esta carpeta."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sincronizar últimos <xliff:g id="NUMSYNCDAYS">%d</xliff:g> días"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Cambiar carpetas"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Ühendatud e-post"</string>
     <string name="to" msgid="4392614766835725698">"Saaja"</string>
     <string name="cc" msgid="7017720927911078193">"Koopia"</string>
     <string name="bcc" msgid="3098643138241111579">"Pimekoopia"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Edasta"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Koosta"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Muuda silte"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Muudetud kaustad"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Halda silte"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Sildid"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sünkroonimine ja teavitamine"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -221,10 +212,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Sõnum salvestati mustandina."</string>
     <string name="sending_message" msgid="1498583163419122128">"Sõnumi saatmine ..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Aadress <xliff:g id="WRONGEMAIL">%s</xliff:g> on kehtetu."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Kuva osundatud tekst"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Peida osundatud tekst"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Valmis"</string>
@@ -239,33 +228,22 @@
     <item msgid="665244114363057627">"Viga salvestamisel"</item>
     <item msgid="9190542479647789762">"Sisemine viga"</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">"Puudutage seadistamiseks"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Meilivestl. vaatamis. sünkr. kaust."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Kausta sünkroonimine"</string>
     <string name="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">"Kuva rohkem meilivestlusi"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Laadimine …"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Konto valimine"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Kausta valimine"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sünkrooni: kõik"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sünkrooni: viimane <xliff:g id="COUNT">%1$d</xliff:g> päev"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sünkrooni: viimased <xliff:g id="COUNT">%1$d</xliff:g> päeva"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Ära sünkrooni midagi"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Kausta sünkroonimine"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Vidinas meilivestluste vaatamiseks sünkroonige see kaust."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sünkrooni viimased <xliff:g id="NUMSYNCDAYS">%d</xliff:g> päeva"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Muudetud kaustad"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"ایمیل یکپارچه"</string>
     <string name="to" msgid="4392614766835725698">"گیرنده"</string>
     <string name="cc" msgid="7017720927911078193">"گیرنده کپی"</string>
     <string name="bcc" msgid="3098643138241111579">"گیرنده کپی مخفی"</string>
@@ -194,13 +193,6 @@
     <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-fi/strings.xml b/res/values-fi/strings.xml
index 2b68116..21a0350 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Yhtenäinen sähköposti"</string>
     <string name="to" msgid="4392614766835725698">"Vastaanott."</string>
     <string name="cc" msgid="7017720927911078193">"Kopio"</string>
     <string name="bcc" msgid="3098643138241111579">"Piilokopio"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Lähetä edelleen"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Viestin kirjoitus"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Muuta tunnisteita"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Vaihda kansiota"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Hallinnoi tunnisteita"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Tunnisteet"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronoi ja ilmoita"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Tallennusvirhe"</item>
     <item msgid="9190542479647789762">"Sisäinen virhe"</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">"Kosketa ja määritä asetukset"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Synkronoi tämä kansio, jos haluat tarkastella keskusteluja."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkronoi kansio"</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">"Näytä lisää keskusteluita"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Ladataan…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Valitse tili"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Valitse kansio"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Synkronoi kaikki"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Synkronoi edellinen <xliff:g id="COUNT">%1$d</xliff:g> päivä"</item>
+    <item quantity="other" msgid="6856940335775567991">"Synkronoi edelliset <xliff:g id="COUNT">%1$d</xliff:g> päivää"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Älä synkronoi mitään"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Synkronoi kansio"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Synkronoi tämä kansio, jos haluat tarkastella keskusteluja widgetissä."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synkronoi edelliset <xliff:g id="NUMSYNCDAYS">%d</xliff:g> päivää"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Vaihda kansiota"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Application E-mail unifiée"</string>
     <string name="to" msgid="4392614766835725698">"À"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Cci"</string>
@@ -193,13 +192,6 @@
     <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>
@@ -220,10 +212,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Brouillon enregistré."</string>
     <string name="sending_message" msgid="1498583163419122128">"Envoi du message en cours…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"L\'adresse <xliff:g id="WRONGEMAIL">%s</xliff:g> est incorrecte."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Afficher le texte des messages précédents"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Masquer le texte des messages précédents"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"OK"</string>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"एकीकृत ईमेल"</string>
     <string name="to" msgid="4392614766835725698">"प्रति"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -66,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>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,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-hr/strings.xml b/res/values-hr/strings.xml
index 22c293a..6085409 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Objedinjena e-pošta"</string>
     <string name="to" msgid="4392614766835725698">"Prima"</string>
     <string name="cc" msgid="7017720927911078193">"Kopija"</string>
     <string name="bcc" msgid="3098643138241111579">"Skr. kopija"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Dalje"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Nova poruka"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Promijeni oznake"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Promjena mapa"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Upravljanje oznakama"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Oznake"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniziraj i obavijesti"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Pogreška u pohranjivanju"</item>
     <item msgid="9190542479647789762">"Interna pogreška"</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">"Dodirnite za postavljanje"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Za prikaz razgovora sinkronizirajte ovu mapu."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronizacija mape"</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">"Prikaži više razgovora"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Učitavanje…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Odabir računa"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Odabir mape"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sinkroniziraj: sve"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sinkronizacija: posljednji <xliff:g id="COUNT">%1$d</xliff:g> dan"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sinkronizacija: posljednjih <xliff:g id="COUNT">%1$d</xliff:g> dana"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Sinkroniziraj: ništa"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sinkronizacija mape"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Da biste vidjeli razgovore u widgetu, sinkronizirajte ovu mapu."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sink. pos. ovoliko dana: <xliff:g id="NUMSYNCDAYS">%d</xliff:g>"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Promjena mapa"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Egységes e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Címzett"</string>
     <string name="cc" msgid="7017720927911078193">"Másolatot kap"</string>
     <string name="bcc" msgid="3098643138241111579">"Titkos másolat"</string>
@@ -193,13 +192,6 @@
     <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>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Email Terpadu"</string>
     <string name="to" msgid="4392614766835725698">"Kepada"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Teruskan"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Tulis"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Ubah label"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Ganti map"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Kelola label"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Label"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkronkan &amp; beri tahu"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Galat penyimpanan"</item>
     <item msgid="9190542479647789762">"Galat internal"</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 menyiapkan"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat percakapan, sinkronkan map ini."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronkan Map"</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 percakapan lainnya"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Memuat…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Pilih akun"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Pilih map"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sinkronkan: Semua"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sinkronkan: <xliff:g id="COUNT">%1$d</xliff:g> hari terakhir"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sinkronkan: <xliff:g id="COUNT">%1$d</xliff:g> hari terakhir"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Sinkronkan: Tidak Satu Pun"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sinkronkan map"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Untuk melihat percakapan di gawit, sinkronkan map ini."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sinkronkan <xliff:g id="NUMSYNCDAYS">%d</xliff:g> hari terakhir"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Ganti map"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Email unificata"</string>
     <string name="to" msgid="4392614766835725698">"A"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Ccn"</string>
@@ -193,13 +192,6 @@
     <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>
@@ -220,10 +212,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Messaggio salvato come bozza."</string>
     <string name="sending_message" msgid="1498583163419122128">"Invio messaggio..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"L\'indirizzo <xliff:g id="WRONGEMAIL">%s</xliff:g> non è valido."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Mostra testo citato"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Nascondi testo citato"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Fine"</string>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"דוא\"ל מאוחד"</string>
     <string name="to" msgid="4392614766835725698">"אל"</string>
     <string name="cc" msgid="7017720927911078193">"עותק"</string>
     <string name="bcc" msgid="3098643138241111579">"עותק מוסתר"</string>
@@ -189,17 +188,10 @@
     <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>
@@ -220,10 +212,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>
@@ -232,7 +222,7 @@
     <string name="folders_activity_instructions" msgid="5237801615196958918">"לא הוגדרו תיקיות לחשבון זה."</string>
   <string-array name="sync_status">
     <item msgid="2446076619901049026">"בוצע בהצלחה"</item>
-    <item msgid="5037283655022689372">"שגיאת חיבור"</item>
+    <item msgid="5037283655022689372">"שגיאת התחברות"</item>
     <item msgid="4252875340758600974">"שגיאת אימות"</item>
     <item msgid="7611299631880179587">"שגיאת אבטחה"</item>
     <item msgid="665244114363057627">"שגיאת אחסון"</item>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"統合メール"</string>
     <string name="to" msgid="4392614766835725698">"To"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -66,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>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,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-ko/strings.xml b/res/values-ko/strings.xml
index 73b25c6..30a2799 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"통합 이메일"</string>
     <string name="to" msgid="4392614766835725698">"받는사람"</string>
     <string name="cc" msgid="7017720927911078193">"참조"</string>
     <string name="bcc" msgid="3098643138241111579">"숨은참조"</string>
@@ -194,13 +193,6 @@
     <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-lt/strings.xml b/res/values-lt/strings.xml
index 64a5532..93e8880 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Bendras el. laiškas"</string>
     <string name="to" msgid="4392614766835725698">"Kam:"</string>
     <string name="cc" msgid="7017720927911078193">"Kopija"</string>
     <string name="bcc" msgid="3098643138241111579">"Nemat. kop."</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Persiųsti"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Sukurti"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Keisti etiketes"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Keisti aplankus"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Tvarkyti etiketes"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketės"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinchronizuoti ir pranešti"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Atmintinės klaida"</item>
     <item msgid="9190542479647789762">"Vidinė klaida"</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">"Jei norite nustatyti, palieskite"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Jei norite perž. pok., sinchr. apl."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinchronizuoti aplanką"</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">"Peržiūrėti daugiau pokalbių"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Įkeliama..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Pasirinkti paskyrą"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Pasirinkti aplanką"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sinchronizuoti: viską"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sinchronizuoti: paskutin. <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
+    <item quantity="other" msgid="6856940335775567991">"Sinchronizuoti: paskutin. <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Nesinchronizuoti nieko"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sinchronizuoti aplanką"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Jei norite peržiūrėti pokalbius valdiklyje, sinchronizuokite šį aplanką."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sinchronizuoti paskutin. <xliff:g id="NUMSYNCDAYS">%d</xliff:g> d."</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Keisti aplankus"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Vienots e-pasts"</string>
     <string name="to" msgid="4392614766835725698">"Kam:"</string>
     <string name="cc" msgid="7017720927911078193">"Kopija"</string>
     <string name="bcc" msgid="3098643138241111579">"D. kopija"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Pārsūtīt"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Rakstīt"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Mainīt iezīmes"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Mainīt mapes"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Pārvaldīt iezīmes"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Iezīmes"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhronizēšana un paziņojumi"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Atmiņas kļūda"</item>
     <item msgid="9190542479647789762">"Iekšēja kļūda"</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">"Pieskarieties, lai iestatītu"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Lai skat. sarunas, sinhr. šo mapi."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinhronizēt mapi"</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">"Skatīt citas sarunas"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Notiek ielāde..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Izvēlēties kontu"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Izvēlēties mapi"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sinhronizēt: visas"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sinhronizēt: pēdējo <xliff:g id="COUNT">%1$d</xliff:g> dienu"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sinhronizēt: pēdējās <xliff:g id="COUNT">%1$d</xliff:g> dienas"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Nesinhronizēt"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sinhronizācijas mape"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Lai skatītu sarunas logrīkā, sinhronizējiet šo mapi."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sinhronizēt pēdējās <xliff:g id="NUMSYNCDAYS">%d</xliff:g> dienas"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Mapju maiņa"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"E-mel Disatukan"</string>
     <string name="to" msgid="4392614766835725698">"Kepada"</string>
     <string name="cc" msgid="7017720927911078193">"Sk"</string>
     <string name="bcc" msgid="3098643138241111579">"Skt"</string>
@@ -194,13 +193,6 @@
     <item quantity="other" msgid="8918589141287976985">"Folder 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>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"Til"</string>
     <string name="cc" msgid="7017720927911078193">"Kopi"</string>
     <string name="bcc" msgid="3098643138241111579">"Blindkopi"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Videresend"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv ny"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Endre etiketter"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Endre mapper"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Administrer etiketter"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketter"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronisering og varsling"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Lagringsfeil"</item>
     <item msgid="9190542479647789762">"Intern feil"</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">"Trykk for å konfigurere"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Synkroniser denne mappen for å se samtaler."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkroniser 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">"Se flere samtaler"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Laster inn …"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Velg konto"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Velg mappe"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Synkroniser: alle"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Synkronisering: siste <xliff:g id="COUNT">%1$d</xliff:g> dag"</item>
+    <item quantity="other" msgid="6856940335775567991">"Synkronisering: siste <xliff:g id="COUNT">%1$d</xliff:g> dager"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Synkroniser: ingen"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Synkroniser mappen"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Synkroniser denne mappen for å se samtaler i modulen."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synkroniser de siste <xliff:g id="NUMSYNCDAYS">%d</xliff:g> dagene"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Endre mapper"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Gecombineerde e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Aan"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Doorsturen"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Opstellen"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Labels wijzigen"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Mappen wijzigen"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Labels beheren"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Labels"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniseren en melden"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -221,10 +212,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Bericht opgeslagen als concept."</string>
     <string name="sending_message" msgid="1498583163419122128">"Bericht wordt verzonden…"</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Het 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">"▶ Tekst uit oorspronkelijk bericht weergeven"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Tekst uit oorspronkelijk bericht verbergen"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Gereed"</string>
@@ -239,33 +228,22 @@
     <item msgid="665244114363057627">"Opslagfout"</item>
     <item msgid="9190542479647789762">"Interne fout"</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">"Raak aan om in te stellen"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Synchroniseer deze map om conversaties weer te geven."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Map synchroniseren"</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">"Meer conversaties bekijken"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Laden..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Account kiezen"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Map selecteren"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Synchroniseren: alles"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Synchroniseren: afgelopen <xliff:g id="COUNT">%1$d</xliff:g> dag"</item>
+    <item quantity="other" msgid="6856940335775567991">"Synchroniseren: afgelopen <xliff:g id="COUNT">%1$d</xliff:g> dagen"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Synchroniseren: niets"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Map synchroniseren"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Synchroniseer deze map om conversaties weer te geven in de widget."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Afgelopen <xliff:g id="NUMSYNCDAYS">%d</xliff:g> dagen synchr."</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Mappen wijzigen"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Ujednolicony e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Do"</string>
     <string name="cc" msgid="7017720927911078193">"DW"</string>
     <string name="bcc" msgid="3098643138241111579">"UDW"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Przekaż dalej"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Utwórz"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Zmień etykiety"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Zmień foldery"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Zarządzaj etykietami"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etykiety"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizuj i powiadamiaj"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Błąd pamięci masowej"</item>
     <item msgid="9190542479647789762">"Błąd wewnętrzny"</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">"Kliknij, by skonfigurować"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Aby wyświetlić rozmowy, zsynchronizuj ten folder."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizuj 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">"Wyświetl więcej rozmów"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Wczytuję…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Wybierz konto"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Wybierz folder"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Synchronizuj: wszystko"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Synchronizuj: ostatni <xliff:g id="COUNT">%1$d</xliff:g> dzień"</item>
+    <item quantity="other" msgid="6856940335775567991">"Synchronizuj: ostatnie <xliff:g id="COUNT">%1$d</xliff:g> dni"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Synchronizuj: nic"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Synchronizuj folder"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Aby wyświetlić rozmowy w widżecie, zsynchronizuj ten folder."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synchronizuj ostatnie <xliff:g id="NUMSYNCDAYS">%d</xliff:g> dni"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Zmień foldery"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"E-mail Unificado"</string>
     <string name="to" msgid="4392614766835725698">"Para"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -194,13 +193,6 @@
     <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>
@@ -221,10 +213,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Mensagem guardada como rascunho."</string>
     <string name="sending_message" msgid="1498583163419122128">"A enviar mensagem..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"O endereço <xliff:g id="WRONGEMAIL">%s</xliff:g> não é válido."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Mostrar texto citado"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto citado"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"OK"</string>
     <string name="done" msgid="3079981801778027540">"Concluído"</string>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"E-mail unificado"</string>
     <string name="to" msgid="4392614766835725698">"Para"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Cco"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Encaminhar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Escrever"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Alterar marcadores"</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">"Gerenciar marcadores"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Marcadores"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,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 conversações, 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">"Carregando…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Escolher conta"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Escolher pasta"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sincronizar: todas"</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 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-ro/strings.xml b/res/values-ro/strings.xml
index c2c427a..4e3849b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Cont de e-mail unificat"</string>
     <string name="to" msgid="4392614766835725698">"Către"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -189,16 +188,11 @@
     <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; a fost marcată ca necitită."</item>
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; au fost marcate ca necitite."</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"Dosar modificat."</item>
+    <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>
@@ -229,12 +223,14 @@
     <string name="cancel" msgid="8762981157252199115">"Anulaţi"</string>
     <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>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
+  <string-array name="sync_status">
+    <item msgid="2446076619901049026">"Operaţiune 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) -->

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"Кому"</string>
     <string name="cc" msgid="7017720927911078193">"Копия"</string>
     <string name="bcc" msgid="3098643138241111579">"Скр. копия"</string>
@@ -66,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>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,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-sk/strings.xml b/res/values-sk/strings.xml
index 4f1c702..b6d116f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Zjednotený e-mail"</string>
     <string name="to" msgid="4392614766835725698">"Komu"</string>
     <string name="cc" msgid="7017720927911078193">"Kópia"</string>
     <string name="bcc" msgid="3098643138241111579">"Skrytá kópia"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Poslať ďalej"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Napísať správu"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Zmeniť menovky"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Zmeniť priečinky"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Spravovať menovky"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Menovky"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizovať a upozorniť"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Chyba úložiska"</item>
     <item msgid="9190542479647789762">"Interná chyba"</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">"Klepnutím nastavte"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Zobr. konverz., synchr. priečinok."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovať priečinok"</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">"Zobraziť ďalšie konverzácie"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Prebieha načítavanie..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Vybrať účet"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Vybrať priečinok"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Synchronizovať: všetko"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Synchronizovať: posled. <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
+    <item quantity="other" msgid="6856940335775567991">"Synchronizovať: posled. <xliff:g id="COUNT">%1$d</xliff:g> d."</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Nesynchronizovať žiadnu konverzáciu"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Synchronizovať priečinok"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Ak chcete v miniaplikácii zobraziť konverzácie, synchronizujte tento priečinok."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Synchronizovať posled. <xliff:g id="NUMSYNCDAYS">%d</xliff:g> d."</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Zmeniť priečinky"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Poenotena e-pošta"</string>
     <string name="to" msgid="4392614766835725698">"Za"</string>
     <string name="cc" msgid="7017720927911078193">"Kp"</string>
     <string name="bcc" msgid="3098643138241111579">"Skp"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Posreduj"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Novo"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Spremeni oznake"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Spremenite mape"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Upravljanje oznak"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Oznake"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhroniziraj in obvesti"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Napaka shrambe"</item>
     <item msgid="9190542479647789762">"Notranja napaka"</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">"Dotaknite se za nastavitev"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Če si želite ogledati pogovore, sinhronizirajte to mapo."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinhroniziranje mape"</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">"Oglejte si več pogovorov"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Nalaganje ..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Izberite račun"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Izberite mapo"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Sinhroniziraj: vse"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Sinhronizacija zadnjih toliko dni: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="6856940335775567991">"Sinhronizacija zadnjih toliko dni: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Sinhroniziraj: nič"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Sinhroniziranje mape"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Če si želite ogledati pogovore v pripomočku, sinhronizirajte to mapo."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Sinhronizacija zadnjih toliko dni: <xliff:g id="NUMSYNCDAYS">%d</xliff:g>"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Spreminjanje map"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Обједињена е-пошта"</string>
     <string name="to" msgid="4392614766835725698">"Коме"</string>
     <string name="cc" msgid="7017720927911078193">"Копија"</string>
     <string name="bcc" msgid="3098643138241111579">"Скривена копија"</string>
@@ -66,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>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,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-sv/strings.xml b/res/values-sv/strings.xml
index 111c480..ee1dcfc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"Till"</string>
     <string name="cc" msgid="7017720927911078193">"Kopia"</string>
     <string name="bcc" msgid="3098643138241111579">"Hemlig kopia"</string>
@@ -194,13 +193,6 @@
     <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>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Barua pepe Iliyounganishwa"</string>
     <string name="to" msgid="4392614766835725698">"Kwa"</string>
     <string name="cc" msgid="7017720927911078193">"Nakala kwa"</string>
     <string name="bcc" msgid="3098643138241111579">"Nakala fiche kwa"</string>
@@ -39,7 +38,7 @@
     <string name="forward_attribution" msgid="1498936339458535158">"---------- Ujumbe uliosambazwa ----------&lt;br&gt;Kutoka: <xliff:g id="FROM">%1$s</xliff:g>&lt;br&gt;Tarehe: <xliff:g id="DATE">%2$s</xliff:g>&lt;br&gt;Kichwa: <xliff:g id="SUBJECT">%3$s</xliff:g>&lt;br&gt;Kwa: <xliff:g id="TO">%4$s</xliff:g>&lt;br&gt;"</string>
     <string name="cc_attribution" msgid="374493748526504562">"Nakala kwa: <xliff:g id="CC">%1$s</xliff:g>&lt;br&gt;"</string>
     <string name="select_attachment_type" msgid="4711524151968942082">"Chagua aina ya kiambatisho"</string>
-    <string name="too_large_to_attach" msgid="6355534239324333583">"Faili ni kubwa sana kuambatisha."</string>
+    <string name="too_large_to_attach" msgid="6355534239324333583">"Faili ni kubwa sana haiwezi kuambatisha."</string>
     <string name="generic_attachment_problem" msgid="8775959340559458709">"Haikuweza kuambatisha faili."</string>
     <string name="recipient_needed" msgid="999037027358925655">"Ongeza angalau mpokeaji mmoja."</string>
     <string name="recipient_error_dialog_title" msgid="6051694305498669180">"Hitilafu ya mpokeaji"</string>
@@ -72,12 +71,12 @@
     <string name="label_list_title" msgid="7948730824763052410">"Lebo"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Landanisha &amp; arifu"</string>
     <string name="menu_label_options" msgid="1811414840489117457">"Mipangilio ya lebo"</string>
-    <string name="menu_done" msgid="5791134842152855128">"Imefanywa"</string>
+    <string name="menu_done" msgid="5791134842152855128">"Imekamilika"</string>
     <string name="menu_account_preferences" msgid="825820027931270435">"Mipangilio ya akaunti"</string>
     <string name="menu_preferences" msgid="8957431987536606063">"Mipangilio"</string>
     <string name="menu_search" msgid="5297197523031943248">"Tafuta"</string>
     <string name="more" msgid="1238344647379009858">"Zaidi"</string>
-    <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> ya <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> wa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="newer" msgid="1007166236908596854">"Mpya zaidi"</string>
     <string name="older" msgid="6651690916337202936">"Nzee zaidi"</string>
     <string name="mark_important" msgid="6904096897104265870">"Tia alama kama muhimu"</string>
@@ -87,7 +86,7 @@
     <string name="feedback" msgid="79365993169715049">"Tuma maoni"</string>
     <string name="help_and_info" msgid="7873089811705257882">"Msaada"</string>
     <string name="quoted_text" msgid="7250749398672037355">"Jumuisha maandishi yaliyonukuliwa"</string>
-    <string name="quoted_text_label" msgid="541007446961960617">"Maandishi yaliyonukuliwa"</string>
+    <string name="quoted_text_label" msgid="541007446961960617">"Nukuu maandishi"</string>
     <string name="respond_inline" msgid="6797117334768201180">"Jibu katika mstari"</string>
     <string name="bytes" msgid="8851050881674287386">"B"</string>
     <string name="kilobytes" msgid="8506546136898321025">"KB"</string>
@@ -97,15 +96,15 @@
     <string name="attachment_audio" msgid="135527133955622936">"Sauti"</string>
     <string name="attachment_text" msgid="5544874374971562759">"Maandishi"</string>
     <string name="attachment_application_msword" msgid="2326909450865637910">"Waraka"</string>
-    <string name="attachment_application_vnd_ms_powerpoint" msgid="861348289167216897">"Onyesho"</string>
-    <string name="attachment_application_vnd_ms_excel" msgid="5861224590731578901">"Lahajedwali"</string>
+    <string name="attachment_application_vnd_ms_powerpoint" msgid="861348289167216897">"Wasilisho"</string>
+    <string name="attachment_application_vnd_ms_excel" msgid="5861224590731578901">"Lohojedwali"</string>
     <string name="attachment_application_pdf" msgid="6922990425001131901">"PDF"</string>
     <string name="attachment_unknown" msgid="6005445955982153931">"Faili <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
     <string name="search_hint" msgid="3625734263059221350">"Tafuta barua pepe"</string>
     <string name="choosertitle_sharevia" msgid="6142681649048665134">"Shiriki kupitia"</string>
     <string name="contextmenu_openlink" msgid="2176176524824953775">"Fungua katika Kivinjari"</string>
     <string name="contextmenu_copy" msgid="4604170699444153037">"Nakili"</string>
-    <string name="contextmenu_copylink" msgid="3580131515400610839">"Nakili kiungo cha URL"</string>
+    <string name="contextmenu_copylink" msgid="3580131515400610839">"Nakili URL ya kiungo"</string>
     <string name="contextmenu_dial_dot" msgid="9104426720103729453">"Piga simu…"</string>
     <string name="contextmenu_sms_dot" msgid="6481040539501081547">"Ujumbe mfupi..."</string>
     <string name="contextmenu_add_contact" msgid="8395100913366045250">"Ongeza mwasiliani"</string>
@@ -134,12 +133,12 @@
     <string name="no_conversations" msgid="35400008890372241">"Hakuna mazungumzo."</string>
     <string name="undo" msgid="6070869718469782251">"Tengua"</string>
   <plurals name="conversation_marking_read">
-    <item quantity="one" msgid="394911867474214874">"Inatia alama mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> yaliosomwa."</item>
-    <item quantity="other" msgid="247178462544083532">"Inatia alama mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> yaliosomwa."</item>
+    <item quantity="one" msgid="394911867474214874">"Inatia alama kuwa mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> yamesomwa."</item>
+    <item quantity="other" msgid="247178462544083532">"Inatia alama kuwa mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> yamesomwa."</item>
   </plurals>
   <plurals name="conversation_marking_unread">
     <item quantity="one" msgid="2959859634779672558">"Inatia alama kuwa mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> hayajasomwa."</item>
-    <item quantity="other" msgid="6577233770583912846">"Inatia alama mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> kuwa hayajasomwa."</item>
+    <item quantity="other" msgid="6577233770583912846">"Inatia alama kuwa mazungumzo <xliff:g id="COUNT">%1$d</xliff:g> hayajasomwa."</item>
   </plurals>
   <plurals name="conversation_starring">
     <item quantity="one" msgid="8780588287902503608">"Inaweka nyota mazungumzo <xliff:g id="COUNT">%1$d</xliff:g>."</item>
@@ -154,61 +153,54 @@
     <item quantity="other" msgid="850868849811019745">"Inasubiri utendaji kwenye mazungumzo <xliff:g id="COUNT">%1$d</xliff:g>."</item>
   </plurals>
   <plurals name="conversation_muted">
-    <item quantity="one" msgid="3197365771487542615">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imenyamazishwa."</item>
-    <item quantity="other" msgid="1941193356069303587">"&lt;b&gt; <xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imenyamazishwa."</item>
+    <item quantity="one" msgid="3197365771487542615">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamenyamazishwa."</item>
+    <item quantity="other" msgid="1941193356069303587">"&lt;b&gt; <xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamenyamazishwa."</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="3060864972122279220">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imeripotiwa kama barua taka."</item>
-    <item quantity="other" msgid="5071459475389411227">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imeripotiwa kama barua taka."</item>
+    <item quantity="one" msgid="3060864972122279220">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yameripotiwa kama barua taka."</item>
+    <item quantity="other" msgid="5071459475389411227">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yameripotiwa kama barua taka."</item>
   </plurals>
   <plurals name="conversation_archived">
-    <item quantity="one" msgid="5457612502965117672">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zimenyarakishwa."</item>
-    <item quantity="other" msgid="3012054504370916482">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zimenyarakishwa."</item>
+    <item quantity="one" msgid="5457612502965117672">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&amp;gt: zimehifadhiwa"</item>
+    <item quantity="other" msgid="3012054504370916482">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>:&lt;/b&amp;gt: zimehifadhiwa"</item>
   </plurals>
   <plurals name="conversation_moved_to_inbox">
-    <item quantity="one" msgid="8031416635831380071">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zimehamishwa hadi kwa Kikasha."</item>
-    <item quantity="other" msgid="395816799927580909">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zimehamishwa hadi kwa Kikasha."</item>
+    <item quantity="one" msgid="8031416635831380071">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamehamishwa hadi kwa Kikasha."</item>
+    <item quantity="other" msgid="395816799927580909">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yamehamishwa hadi kwa Kikasha."</item>
   </plurals>
   <plurals name="conversation_deleted">
     <item quantity="one" msgid="4398693029405479323">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imefutwa."</item>
     <item quantity="other" msgid="8630099095360065837">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imefutwa."</item>
   </plurals>
   <plurals name="conversation_marked_important">
-    <item quantity="one" msgid="2335171317119674993">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imetiwa alama kama muhimu."</item>
-    <item quantity="other" msgid="709648106181749594">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imetiwa alama kama muhimu."</item>
+    <item quantity="one" msgid="2335171317119674993">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kama muhimu."</item>
+    <item quantity="other" msgid="709648106181749594">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kama muhimu."</item>
   </plurals>
   <plurals name="conversation_marked_not_important">
-    <item quantity="one" msgid="63750576337670941">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imetiwa alama kama isiyo muhimu."</item>
-    <item quantity="other" msgid="6160886583510022920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imetiwa alama kama isiyo muhimu."</item>
+    <item quantity="one" msgid="63750576337670941">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kama yasiyo muhimu."</item>
+    <item quantity="other" msgid="6160886583510022920">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kama yasiyo muhimu."</item>
   </plurals>
   <plurals name="conversation_marked_read">
-    <item quantity="one" msgid="7853066345561670409">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imetiwa alama kuwa imesomwa."</item>
-    <item quantity="other" msgid="6554100868671029370">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; imetiwa alama kuwa imesomwa."</item>
+    <item quantity="one" msgid="7853066345561670409">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kuwa yamesomwa."</item>
+    <item quantity="other" msgid="6554100868671029370">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kuwa yamesomwa."</item>
   </plurals>
   <plurals name="conversation_marked_unread">
-    <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zimetiwa alama kuwa hazijasomwa."</item>
-    <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; zimetiwa alama kuwa hazijasomwa."</item>
+    <item quantity="one" msgid="365581967734960166">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kuwa hayajasomwa."</item>
+    <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; yametiwa alama kuwa hayajasomwa."</item>
   </plurals>
   <plurals name="conversation_folder_changed">
     <item quantity="one" msgid="4930161390461457462">"Folda iliyobadilishwa."</item>
     <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">"Tafuta Hali ya 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>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Kunja maelezo ya wapokeaji"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Onyesha maelezo ya mawasiliano ya <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="contact_info_string_default" msgid="596531738469809159">"Onyesha maelezo ya mawasiliano"</string>
-    <string name="expand_read_messages" msgid="7458927270492299063">"Panua ujumbe uliosomwa"</string>
-    <string name="show_messages_read" msgid="9132147830566909631">"Ujumbe uliokuwa umesomwa awali"</string>
+    <string name="expand_read_messages" msgid="7458927270492299063">"Panua jumbe zilizosomwa"</string>
+    <string name="show_messages_read" msgid="9132147830566909631">"Jumbe zilizokuwa umesomwa awali"</string>
     <string name="date_heading" msgid="2414358582984879303">"Tarehe:"</string>
     <string name="replyto_heading" msgid="2081358811894701297">"Jibu-kwa:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Kwa:"</string>
@@ -227,7 +219,7 @@
     <skip />
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"SAWA"</string>
-    <string name="done" msgid="3079981801778027540">"Imefanywa"</string>
+    <string name="done" msgid="3079981801778027540">"Imekamilika"</string>
     <string name="cancel" msgid="8762981157252199115">"Ghairi"</string>
     <string name="close" msgid="419945428844076406">"Funga"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"Hakuna folda zilizowekwa za akaunti hii."</string>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"อีเมลเดียว"</string>
     <string name="to" msgid="4392614766835725698">"ถึง"</string>
     <string name="cc" msgid="7017720927911078193">"สำเนา"</string>
     <string name="bcc" msgid="3098643138241111579">"สำเนาลับ"</string>
@@ -66,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>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,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-tl/strings.xml b/res/values-tl/strings.xml
index 935f279..d24256e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Pinag-isang Email"</string>
     <string name="to" msgid="4392614766835725698">"Para kay"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Ipasa"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Bumuo"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Baguhin ang mga label"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Baguhin ang mga folder"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Pamahalaan ang mga label"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Mga Label"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"I-sync at i-notify"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Error sa storage"</item>
     <item msgid="9190542479647789762">"Panloob na error"</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">"Pindutin upang i-set up"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Para tingin pag-uusap, sync folder."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"I-sync ang 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">"Tumingin ng higit pang pag-uusap"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Naglo-load…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Pumili ng account"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Pumili ng folder"</string>
+    <string name="sync_all" msgid="1057043212338233359">"I-sync: Lahat"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"I-sync: Huling <xliff:g id="COUNT">%1$d</xliff:g> araw"</item>
+    <item quantity="other" msgid="6856940335775567991">"I-sync: Huling <xliff:g id="COUNT">%1$d</xliff:g> (na) araw"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"I-sync: Wala"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"I-sync ang folder"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Upang tumingin ng mga pag-uusap sa widget, i-sync ang folder na ito."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"I-sync ang huling <xliff:g id="NUMSYNCDAYS">%d</xliff:g> (na) araw"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Baguhin ang mga folder"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Birleştirilmiş E-posta"</string>
     <string name="to" msgid="4392614766835725698">"Alıcı:"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Yönlendir"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Oluştur"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Etiketleri değiştir"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Klasörleri değiştir"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Etiketleri yönet"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Etiketler"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Senkronize et ve bildir"</string>
@@ -192,13 +190,6 @@
     <!-- 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>
@@ -235,33 +226,22 @@
     <!-- no translation found for sync_status:3 (7611299631880179587) -->
     <!-- no translation found for sync_status:4 (665244114363057627) -->
     <!-- no translation found for sync_status:5 (9190542479647789762) -->
-    <!-- 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">"Kurulum için dokunun"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"İleti dizilerini görüntülemek için bu klasörü senk edin."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Klasörü Senkronize Et"</string>
     <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">"Diğer ileti dizilerini görüntüle"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Yükleniyor..."</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Hesap seç"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Klasör seç"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Senkronizasyon: Tümü"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Senkronizasyon: Son <xliff:g id="COUNT">%1$d</xliff:g> gün"</item>
+    <item quantity="other" msgid="6856940335775567991">"Senkronizasyon: Son <xliff:g id="COUNT">%1$d</xliff:g> gün"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Senkronizasyon: Yok"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Klasörü senkronize et"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Widget\'taki ileti dizilerini görüntülemek için bu klasörü senkronize edin."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Son <xliff:g id="NUMSYNCDAYS">%d</xliff:g> günü senkronize et"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Klasörleri değiştir"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Об’єднана електронна пошта"</string>
     <string name="to" msgid="4392614766835725698">"Кому"</string>
     <string name="cc" msgid="7017720927911078193">"Копія"</string>
     <string name="bcc" msgid="3098643138241111579">"Прих. копія"</string>
@@ -66,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>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,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-vi/strings.xml b/res/values-vi/strings.xml
index 7d97980..d2fc862 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Email hợp nhất"</string>
     <string name="to" msgid="4392614766835725698">"Tới"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -66,8 +65,7 @@
     <string name="forward" msgid="6822914459902983767">"Chuyển tiếp"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Soạn thư"</string>
     <string name="menu_change_labels" msgid="9121087142079721959">"Thay đổi nhãn"</string>
-    <!-- no translation found for menu_change_folders (1542713666608888717) -->
-    <skip />
+    <string name="menu_change_folders" msgid="1542713666608888717">"Thay đổi thư mục"</string>
     <string name="menu_manage_labels" msgid="8618788259638720538">"Quản lý nhãn"</string>
     <string name="label_list_title" msgid="7948730824763052410">"Nhãn"</string>
     <string name="manage_labels_subtitle" msgid="8802709983773098505">"Đ.bộ hóa &amp; t.báo"</string>
@@ -194,13 +192,6 @@
     <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>
@@ -239,33 +230,22 @@
     <item msgid="665244114363057627">"Lỗi lưu trữ"</item>
     <item msgid="9190542479647789762">"Lỗi nội bộ"</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">"Chạm để thiết lập"</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Để xem các cuộc hội thoại, hãy đồng bộ hóa thư mục này."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Đồng bộ hóa thư mục"</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">"Xem các cuộc hội thoại khác"</string>
+    <string name="loading_conversation" msgid="489160038366067983">"Đang tải…"</string>
+    <string name="activity_mailbox_selection" msgid="6876105223659297603">"Chọn tài khoản"</string>
+    <string name="activity_folder_selection" msgid="5161845867397316052">"Chọn thư mục"</string>
+    <string name="sync_all" msgid="1057043212338233359">"Đồng bộ hóa: Tất cả"</string>
+  <plurals name="sync_recent">
+    <item quantity="one" msgid="137489911893192702">"Đồng bộ hóa: <xliff:g id="COUNT">%1$d</xliff:g> ngày qua"</item>
+    <item quantity="other" msgid="6856940335775567991">"Đồng bộ hóa: <xliff:g id="COUNT">%1$d</xliff:g> ngày qua"</item>
+  </plurals>
+    <string name="sync_none" msgid="3581727068747471804">"Đồng bộ hóa: Không có"</string>
+    <string name="folder_sync_for_widget_title" msgid="6889243150191948255">"Đồng bộ hóa thư mục"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Để xem các cuộc hội thoại trong tiện ích, hãy đồng bộ hóa thư mục này."</string>
+    <string name="folder_sync_for_widget_checkbox" msgid="5810741160405575956">"Đồng bộ hóa <xliff:g id="NUMSYNCDAYS">%d</xliff:g> ngày qua"</string>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Thay đổi thư mục"</string>
 </resources>

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

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"统一电子邮件"</string>
     <string name="to" msgid="4392614766835725698">"收件人"</string>
     <string name="cc" msgid="7017720927911078193">"抄送"</string>
     <string name="bcc" msgid="3098643138241111579">"密送"</string>
@@ -55,7 +54,7 @@
     <string name="add_star" msgid="2866003744391266498">"加注星标"</string>
     <string name="remove_star" msgid="4372327933122106128">"删除星标"</string>
     <string name="archive" msgid="847250094775910499">"归档"</string>
-    <string name="report_spam" msgid="6467567747975393907">"举报垃圾内容"</string>
+    <string name="report_spam" msgid="6467567747975393907">"举报垃圾邮件"</string>
     <string name="delete" msgid="844871204175957681">"删除"</string>
     <string name="next" msgid="4674401197968248302">"更早"</string>
     <string name="previous" msgid="309943944831349924">"更晚"</string>
@@ -66,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>
@@ -158,8 +156,8 @@
     <item quantity="other" msgid="1941193356069303587">"已忽略 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话。"</item>
   </plurals>
   <plurals name="conversation_spammed">
-    <item quantity="one" msgid="3060864972122279220">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为垃圾内容。"</item>
-    <item quantity="other" msgid="5071459475389411227">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为垃圾内容。"</item>
+    <item quantity="one" msgid="3060864972122279220">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为垃圾邮件。"</item>
+    <item quantity="other" msgid="5071459475389411227">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话举报为垃圾邮件。"</item>
   </plurals>
   <plurals name="conversation_archived">
     <item quantity="one" msgid="5457612502965117672">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话归档。"</item>
@@ -189,16 +187,11 @@
     <item quantity="one" msgid="365581967734960166">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话标记为未读。"</item>
     <item quantity="other" msgid="858491333253953462">"已将 &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; 个会话标记为未读。"</item>
   </plurals>
-    <!-- no translation found for conversation_folder_changed:one (4930161390461457462) -->
-    <!-- no translation found for conversation_folder_changed:other (8918589141287976985) -->
+  <plurals name="conversation_folder_changed">
+    <item quantity="one" msgid="4930161390461457462">"已更改文件夹。"</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>
@@ -229,39 +222,30 @@
     <string name="cancel" msgid="8762981157252199115">"取消"</string>
     <string name="close" msgid="419945428844076406">"关闭"</string>
     <string name="folders_activity_instructions" msgid="5237801615196958918">"此帐户尚未设置文件夹。"</string>
-    <!-- no translation found for sync_status:0 (2446076619901049026) -->
-    <!-- no translation found for sync_status:1 (5037283655022689372) -->
-    <!-- no translation found for sync_status:2 (4252875340758600974) -->
-    <!-- no translation found for sync_status:3 (7611299631880179587) -->
-    <!-- no translation found for sync_status:4 (665244114363057627) -->
-    <!-- no translation found for sync_status:5 (9190542479647789762) -->
-    <!-- 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-array name="sync_status">
+    <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>
+    <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-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1f72b9d..adfe671 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"Unified Email"</string>
     <string name="to" msgid="4392614766835725698">"收件者"</string>
     <string name="cc" msgid="7017720927911078193">"副本"</string>
     <string name="bcc" msgid="3098643138241111579">"密件副本"</string>
@@ -194,13 +193,6 @@
     <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-zu/strings.xml b/res/values-zu/strings.xml
index 1b736b9..380ab74 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -18,7 +18,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8197930422134712215">"I-imeyili ehlanganisiwe"</string>
     <string name="to" msgid="4392614766835725698">"Kuya"</string>
     <string name="cc" msgid="7017720927911078193">"Cc"</string>
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
@@ -193,13 +192,6 @@
     <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>
@@ -220,10 +212,8 @@
     <string name="message_saved" msgid="7073947895562277576">"Umlayezo ulondolozwe njengokusalungiswa."</string>
     <string name="sending_message" msgid="1498583163419122128">"Ithumela umlayezo..."</string>
     <string name="invalid_recipient" msgid="2161317422860961623">"Ikheli <xliff:g id="WRONGEMAIL">%s</xliff:g> alivumelekile."</string>
-    <!-- no translation found for show_elided (5255917904110437886) -->
-    <skip />
-    <!-- no translation found for hide_elided (8907305605854960737) -->
-    <skip />
+    <string name="show_elided" msgid="5255917904110437886">"▶ Bonisa umbhalo ocashuniwe"</string>
+    <string name="hide_elided" msgid="8907305605854960737">"▼ Fihla umbhalo ocashuniwe"</string>
     <string name="enumeration_comma" msgid="5191660524342286026">", "</string>
     <string name="ok" msgid="8339355733816891026">"KULUNGILE"</string>
     <string name="done" msgid="3079981801778027540">"Kwenziwe"</string>

diff --git a/src/com/android/mail/providers/Account.java b/src/com/android/mail/providers/Account.java
index 332a3e9..4a9811f 100644
--- a/src/com/android/mail/providers/Account.java
+++ b/src/com/android/mail/providers/Account.java

@@ -95,6 +95,11 @@
     public final Uri settingIntentUri;
 
     /**
+     * The content provider uri that can be used to query user settings/preferences
+     */
+    public final Uri settingQueryUri;
+
+    /**
      * Uri for VIEW intent that will cause the help screens for this account type to be
      * shown.
      */
@@ -117,7 +122,7 @@
      * includes the members described above and name and type from the
      * superclass.
      */
-    private static final int NUMBER_MEMBERS = 16;
+    private static final int NUMBER_MEMBERS = 17;
 
     /**
      * Examples of expected format for the joined account strings
@@ -150,6 +155,7 @@
         out.append(expungeMessageUri).append(ACCOUNT_COMPONENT_SEPARATOR);
         out.append(undoUri).append(ACCOUNT_COMPONENT_SEPARATOR);
         out.append(settingIntentUri).append(ACCOUNT_COMPONENT_SEPARATOR);
+        out.append(settingQueryUri).append(ACCOUNT_COMPONENT_SEPARATOR);
         out.append(helpIntentUri).append(ACCOUNT_COMPONENT_SEPARATOR);
         out.append(syncStatus).append(ACCOUNT_COMPONENT_SEPARATOR);
         out.append(composeIntentUri);
@@ -180,9 +186,10 @@
         expungeMessageUri = Uri.parse(accountMembers[10]);
         undoUri = Uri.parse(accountMembers[11]);
         settingIntentUri = Uri.parse(accountMembers[12]);
-        helpIntentUri = Uri.parse(accountMembers[13]);
-        syncStatus = Integer.valueOf(accountMembers[14]);
-        composeIntentUri = Uri.parse(accountMembers[15]);
+        settingQueryUri = Uri.parse(accountMembers[13]);
+        helpIntentUri = Uri.parse(accountMembers[14]);
+        syncStatus = Integer.valueOf(accountMembers[15]);
+        composeIntentUri = Uri.parse(accountMembers[16]);
     }
 
     public Account(Parcel in) {
@@ -198,6 +205,7 @@
         expungeMessageUri = in.readParcelable(null);
         undoUri = in.readParcelable(null);
         settingIntentUri = in.readParcelable(null);
+        settingQueryUri = in.readParcelable(null);
         helpIntentUri = in.readParcelable(null);
         syncStatus = in.readInt();
         composeIntentUri = in.readParcelable(null);
@@ -213,19 +221,21 @@
         providerVersion = cursor.getInt(UIProvider.ACCOUNT_PROVIDER_VERISON_COLUMN);
         uri = Uri.parse(cursor.getString(UIProvider.ACCOUNT_URI_COLUMN));
         folderListUri = Uri.parse(cursor.getString(UIProvider.ACCOUNT_FOLDER_LIST_URI_COLUMN));
-        String search = cursor.getString(UIProvider.ACCOUNT_SEARCH_URI_COLUMN);
+        final String search = cursor.getString(UIProvider.ACCOUNT_SEARCH_URI_COLUMN);
         searchUri = !TextUtils.isEmpty(search) ? Uri.parse(search) : null;
         saveDraftUri = Uri.parse(cursor.getString(UIProvider.ACCOUNT_SAVE_DRAFT_URI_COLUMN));
         sendMessageUri = Uri.parse(cursor.getString(UIProvider.ACCOUNT_SEND_MESSAGE_URI_COLUMN));
-        String expunge = cursor.getString(UIProvider.ACCOUNT_EXPUNGE_MESSAGE_URI_COLUMN);
+        final String expunge = cursor.getString(UIProvider.ACCOUNT_EXPUNGE_MESSAGE_URI_COLUMN);
         expungeMessageUri = !TextUtils.isEmpty(expunge) ? Uri.parse(expunge) : null;
         undoUri = Uri.parse(cursor.getString(UIProvider.ACCOUNT_UNDO_URI_COLUMN));
-        String settings = cursor.getString(UIProvider.ACCOUNT_SETTINGS_INTENT_URI_COLUMN);
+        final String settings = cursor.getString(UIProvider.ACCOUNT_SETTINGS_INTENT_URI_COLUMN);
         settingIntentUri = !TextUtils.isEmpty(settings) ? Uri.parse(settings) : null;
-        String help = cursor.getString(UIProvider.ACCOUNT_HELP_INTENT_URI_COLUMN);
+        final String settingsQuery = cursor.getString(UIProvider.ACCOUNT_SETTINGS_QUERY_URI_COLUMN);
+        settingQueryUri = !TextUtils.isEmpty(settingsQuery) ? Uri.parse(settingsQuery) : null;
+        final String help = cursor.getString(UIProvider.ACCOUNT_HELP_INTENT_URI_COLUMN);
         helpIntentUri = !TextUtils.isEmpty(help) ? Uri.parse(help) : null;
         syncStatus = cursor.getInt(UIProvider.ACCOUNT_SYNC_STATUS_COLUMN);
-        String compose = cursor.getString(UIProvider.ACCOUNT_COMPOSE_INTENT_URI_COLUMN);
+        final String compose = cursor.getString(UIProvider.ACCOUNT_COMPOSE_INTENT_URI_COLUMN);
         composeIntentUri = !TextUtils.isEmpty(compose) ? Uri.parse(compose) : null;
     }
 
@@ -271,6 +281,7 @@
         dest.writeParcelable(expungeMessageUri, 0);
         dest.writeParcelable(undoUri, 0);
         dest.writeParcelable(settingIntentUri, 0);
+        dest.writeParcelable(settingQueryUri, 0);
         dest.writeParcelable(helpIntentUri, 0);
         dest.writeInt(syncStatus);
         dest.writeParcelable(composeIntentUri, 0);

diff --git a/src/com/android/mail/providers/AccountCacheProvider.java b/src/com/android/mail/providers/AccountCacheProvider.java
index 8c9a709..9b6058a 100644
--- a/src/com/android/mail/providers/AccountCacheProvider.java
+++ b/src/com/android/mail/providers/AccountCacheProvider.java

@@ -115,6 +115,9 @@
                         UIProvider.AccountColumns.SETTINGS_INTENT_URI)) {
                     builder.add(account.mSettingsIntentUri);
                 } else if (TextUtils.equals(column,
+                        UIProvider.AccountColumns.SETTINGS_QUERY_URI)) {
+                    builder.add(account.mSettingsQueryUri);
+                } else if (TextUtils.equals(column,
                         UIProvider.AccountColumns.HELP_INTENT_URI)) {
                     builder.add(account.mHelpIntentUri);
                 } else if (TextUtils.equals(column, UIProvider.AccountColumns.SYNC_STATUS)) {
@@ -201,6 +204,7 @@
         private final Uri mExpungeMessageUri;
         private final Uri mUndoUri;
         private final Uri mSettingsIntentUri;
+        private final Uri mSettingsQueryUri;
         private final Uri mHelpIntentUri;
         private final int mSyncStatus;
         private final Uri mComposeIntentUri;
@@ -208,7 +212,7 @@
         public CachedAccount(long id, String name, Uri uri, long capabilities,
                 Uri folderListUri, Uri searchUri, Uri fromAddressesUri,
                 Uri saveDraftUri, Uri sendMailUri, Uri expungeMessageUri, Uri undoUri,
-                Uri settingsIntentUri, Uri helpIntentUri, int syncStatus,
+                Uri settingsIntentUri, Uri settingsQueryUri, Uri helpIntentUri, int syncStatus,
                 Uri composeIntentUri) {
             mId = id;
             mName = name;
@@ -222,6 +226,7 @@
             mExpungeMessageUri = expungeMessageUri;
             mUndoUri = undoUri;
             mSettingsIntentUri = settingsIntentUri;
+            mSettingsQueryUri = settingsQueryUri;
             mHelpIntentUri = helpIntentUri;
             mSyncStatus = syncStatus;
             mComposeIntentUri = composeIntentUri;
@@ -240,6 +245,7 @@
             mExpungeMessageUri = acct.expungeMessageUri;
             mUndoUri = acct.undoUri;
             mSettingsIntentUri = acct.settingIntentUri;
+            mSettingsQueryUri = acct.settingQueryUri;
             mHelpIntentUri = acct.helpIntentUri;
             mSyncStatus = acct.syncStatus;
             mComposeIntentUri = acct.composeIntentUri;
@@ -266,6 +272,7 @@
                     mExpungeMessageUri.equals(other.mExpungeMessageUri) &&
                     mUndoUri.equals(other.mUndoUri) &&
                     mSettingsIntentUri.equals(other.mSettingsIntentUri) &&
+                    mSettingsQueryUri.equals(other.mSettingsQueryUri) &&
                     mHelpIntentUri.equals(other.mHelpIntentUri) &&
                     (mSyncStatus == other.mSyncStatus) &&
                     mComposeIntentUri.equals(other.mComposeIntentUri);
@@ -275,7 +282,8 @@
         public int hashCode() {
             return Objects.hashCode(mId, mName, mUri, mCapabilities, mFolderListUri, mSearchUri,
                     mAccountFromAddressesUri, mSaveDraftUri, mSendMailUri, mExpungeMessageUri,
-                    mUndoUri, mSettingsIntentUri, mHelpIntentUri, mSyncStatus, mComposeIntentUri);
+                    mUndoUri, mSettingsIntentUri, mSettingsQueryUri, mHelpIntentUri, mSyncStatus,
+                    mComposeIntentUri);
         }
     }
 }
\ No newline at end of file

diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 18d3179..a51b8a9 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java

@@ -92,6 +92,7 @@
             AccountColumns.EXPUNGE_MESSAGE_URI,
             AccountColumns.UNDO_URI,
             AccountColumns.SETTINGS_INTENT_URI,
+            AccountColumns.SETTINGS_QUERY_URI,
             AccountColumns.SYNC_STATUS,
             AccountColumns.HELP_INTENT_URI,
             AccountColumns.COMPOSE_URI
@@ -110,9 +111,10 @@
     public static final int ACCOUNT_EXPUNGE_MESSAGE_URI_COLUMN = 10;
     public static final int ACCOUNT_UNDO_URI_COLUMN = 11;
     public static final int ACCOUNT_SETTINGS_INTENT_URI_COLUMN = 12;
-    public static final int ACCOUNT_SYNC_STATUS_COLUMN = 13;
-    public static final int ACCOUNT_HELP_INTENT_URI_COLUMN = 14;
-    public static final int ACCOUNT_COMPOSE_INTENT_URI_COLUMN = 14;
+    public static final int ACCOUNT_SETTINGS_QUERY_URI_COLUMN = 13;
+    public static final int ACCOUNT_SYNC_STATUS_COLUMN = 14;
+    public static final int ACCOUNT_HELP_INTENT_URI_COLUMN = 15;
+    public static final int ACCOUNT_COMPOSE_INTENT_URI_COLUMN = 16;
 
     public static final class AccountCapabilities {
         /**
@@ -271,6 +273,14 @@
         public static String SETTINGS_INTENT_URI = "accountSettingsIntentUri";
 
         /**
+         * This string column contains the content provider uri that can be used to query user
+         * settings/preferences.
+         *
+         * The cursor returned by this query support columnms declared in {@link #SettingsColumns}
+         */
+        public static final String SETTINGS_QUERY_URI = "accountSettingsQueryUri";
+
+        /**
          * Uri for VIEW intent that will cause the help screens for this account type to be
          * shown.
          * TODO: When we want to support a heterogeneous set of account types, this value may need
@@ -818,4 +828,102 @@
 
     // Parameter used to indicate the sequence number for an undoable operation
     public static final String SEQUENCE_QUERY_PARAMETER = "seq";
+
+
+    public static final String[] SETTINGS_PROJECTION = {
+            SettingsColumns.SIGNATURE,
+            SettingsColumns.AUTO_ADVANCE,
+            SettingsColumns.MESSAGE_TEXT_SIZE,
+            SettingsColumns.SNAP_HEADERS,
+            SettingsColumns.REPLY_BEHAVIOR,
+            SettingsColumns.HIDE_CHECKBOXES,
+            SettingsColumns.CONFIRM_DELETE,
+            SettingsColumns.CONFIRM_ARCHIVE,
+            SettingsColumns.CONFIRM_SEND,
+    };
+
+    public static final class AutoAdvance {
+        public static final int UNSET = 0;
+        public static final int OLDER = 1;
+        public static final int NEWER = 2;
+        public static final int LIST = 3;
+    }
+
+    public static final class SnapHeaderValue {
+        public static final int ALWAYS = 0;
+        public static final int PORTRAIT_ONLY = 1;
+        public static final int NEVER = 2;
+    }
+
+    public static final class MessageTextSize {
+        public static final int TINY = -2;
+        public static final int SMALL = -1;
+        public static final int NORMAL = 0;
+        public static final int LARGE = 1;
+        public static final int HUGE = 2;
+    }
+
+    public static final class DefaultReplyBehavior {
+        public static final int REPLY = 0;
+        public static final int REPLY_ALL = 1;
+    }
+
+    public static final class SettingsColumns {
+        /**
+         * String column containing the contents of the signature for this account.  If no
+         * signature has been specified, the value will be null.
+         */
+        public static final String SIGNATURE = "signature";
+
+        /**
+         * Integer column containing the user's specified auto-advance policy.  This value will be
+         * one of the values in {@link UIProvider.AutoAdvance}
+         */
+        public static final String AUTO_ADVANCE = "auto_advance";
+
+        /**
+         * Integer column containing the user's specified message text size preference.  This value
+         * will be one of the values in {@link UIProvider.MessageTextSize}
+         */
+        public static final String MESSAGE_TEXT_SIZE = "message_text_size";
+
+        /**
+         * Integer column contaning the user's specified snap header preference.  This value
+         * will be one of the values in {@link UIProvider.SnapHeaderValue}
+         */
+        public static final String SNAP_HEADERS = "snap_headers";
+
+        /**
+         * Integer column containing the user's specified default reply behavior.  This value will
+         * be one of the values in {@link UIProvider.DefaultReplyBehavior}
+         */
+        public static final String REPLY_BEHAVIOR = "reply_behavior";
+
+        /**
+         * Integer column containing the user's specified checkbox preference.  The  value
+         * of 0 indicates that checkboxes are not hidden.
+         */
+        public static final String HIDE_CHECKBOXES = "hide_checkboxes";
+
+        /**
+         * Integer column containing the user's specified confirm delete preference value.
+         * A value of 1 indicates that the user has indicated that a confirmation should
+         * be shown when a delete action is performed.
+         */
+        public static final String CONFIRM_DELETE = "confirm_delete";
+
+        /**
+         * Integer column containing the user's specified confirm archive preference value.
+         * A value of 1 indicates that the user has indicated that a confirmation should
+         * be shown when an archive action is performed.
+         */
+        public static final String CONFIRM_ARCHIVE = "confirm_archive";
+
+        /**
+         * Integer column containing the user's specified confirm send preference value.
+         * A value of 1 indicates that the user has indicated that a confirmation should
+         * be shown when a send action is performed.
+         */
+        public static final String CONFIRM_SEND = "confirm_send";
+    }
 }

diff --git a/src/com/android/mail/providers/UIProviderValidator.java b/src/com/android/mail/providers/UIProviderValidator.java
index 4aaef35..5e80625 100644
--- a/src/com/android/mail/providers/UIProviderValidator.java
+++ b/src/com/android/mail/providers/UIProviderValidator.java

@@ -60,6 +60,13 @@
         return getValidProjection(projection, UIProvider.MESSAGE_PROJECTION);
     }
 
+    /**
+     * Validates and returns the projection that can be used for a settings query.
+     */
+    public static String[] validateSettingsProjection(String[] projection) {
+        return getValidProjection(projection, UIProvider.SETTINGS_PROJECTION);
+    }
+
 
     private static String[] getValidProjection(String[] requestedProjection,
             String[] allColumnProjection) {

diff --git a/src/com/android/mail/providers/protos/mock/MockUiProvider.java b/src/com/android/mail/providers/protos/mock/MockUiProvider.java
index 532f4a6..dfd42ae 100644
--- a/src/com/android/mail/providers/protos/mock/MockUiProvider.java
+++ b/src/com/android/mail/providers/protos/mock/MockUiProvider.java

@@ -271,6 +271,7 @@
                 Uri.parse(accountUri + "/expungeMessage"));
         accountMap.put(AccountColumns.UNDO_URI, Uri.parse(accountUri + "/undo"));
         accountMap.put(AccountColumns.SETTINGS_INTENT_URI, Uri.parse("http://www.google.com"));
+        accountMap.put(AccountColumns.SETTINGS_QUERY_URI, Uri.parse(accountUri + "/settings"));
         accountMap.put(AccountColumns.HELP_INTENT_URI, Uri.parse("http://www.google.com"));
         accountMap.put(AccountColumns.SYNC_STATUS, 0);
         accountMap.put(AccountColumns.COMPOSE_URI, Uri.parse(accountUri + "/compose"));
@@ -363,10 +364,10 @@
                 (Uri) accountInfo.get(AccountColumns.EXPUNGE_MESSAGE_URI),
                 (Uri) accountInfo.get(AccountColumns.UNDO_URI),
                 (Uri) accountInfo.get(AccountColumns.SETTINGS_INTENT_URI),
+                (Uri)accountInfo.get(AccountColumns.SETTINGS_QUERY_URI),
                 (Uri) accountInfo.get(AccountColumns.HELP_INTENT_URI),
                 (Integer) accountInfo.get(AccountColumns.SYNC_STATUS),
                 (Uri) accountInfo.get(AccountColumns.COMPOSE_URI));
-
         AccountCacheProvider.addAccount(account);
     }
 }
commit	a029816ba1b5bf3318e2e7916960e3e8034f98a8	[log] [tgz]
author	Vikram Aggarwal <viki@google.com>	Tue Feb 28 14:21:30 2012 -0800
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Feb 28 14:21:30 2012 -0800
tree	899de8991fbfce1b01a14156c7496f7b111b5bcc
parent	afa6621cfca269f47c9b8a91b45086c511f96a2b [diff]
parent	02837159bacf655d58f90a0fdeb44170814046b1 [diff]