Merge "Add strings."

commit: ba6de4171d8baaa7b0804d31134977cb1d4faa9d [log] [tgz]
author: Mindy Pereira <mindyp@google.com> Fri Mar 09 11:26:58 2012 -0800
committer: Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 11:26:58 2012 -0800
tree: 495ba8330537628b326c6c53cfead5120303f339
parent: efee8c0723a25ba5162d67fc25d6b0b800d69a82 [diff]
parent: 5907460fa269cfb3e8b8f8cf244aa1feaf76174a [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ed73af0..8a60010 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Onderwerp"</string>
     <string name="body_hint" msgid="4279864165439577668">"Skryf e-pos"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Heg lêer aan"</string>
     <string name="save_draft" msgid="5555744208032445632">"Stoor konsep"</string>
     <string name="discard" msgid="1714960202994370243">"Gooi weg"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Redigeer"</string>
     <string name="forward" msgid="6822914459902983767">"Stuur aan"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skryf"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Verander etikette"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Verander vouers"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Bestuur etikette"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Etikette"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniseer en laat weet"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Etiket-instellings"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Klaar"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Rekeninginstellings"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Instellings"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Stuur tans..."</string>
     <string name="send_failed" msgid="750908595144529579">"Boodskap is nie gestuur nie."</string>
     <string name="me" msgid="6480762904022198669">"ek"</string>
-    <string name="labels" msgid="1519770547536283663">"Etikette"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Wys alle vouers"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vee hierdie gesprek uit?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Soek tans…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Onlangs"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Vou ontvanger se details uit"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Vou ontvanger se details in"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Wys kontakinligting vir <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3e61692..51c1bca 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"ስውር ቅጂ"</string>
     <string name="subject_hint" msgid="7253964583324677128">"ርእሰ ጉዳይ"</string>
     <string name="body_hint" msgid="4279864165439577668">"ኢሜይል ፃፍ"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"ፋይል አያይዝ"</string>
     <string name="save_draft" msgid="5555744208032445632">"ረቂቅ አስቀምጥ"</string>
     <string name="discard" msgid="1714960202994370243">"አስወግድ"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"አርትዕ"</string>
     <string name="forward" msgid="6822914459902983767">"አስተላልፍ"</string>
     <string name="menu_compose" msgid="6274193058224230645">"አዲስ ጻፍ"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"ስያሜዎች ቀይር"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"የስያሜ ቅንጅቶች"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"ተከናውኗል"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"የመለያ ቅንጅቶች"</string>
     <string name="menu_settings" msgid="6007027046949837282">"ቅንጅቶች"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"በመላክ ላይ…"</string>
     <string name="send_failed" msgid="750908595144529579">"መልዕክት አልተላከም።"</string>
     <string name="me" msgid="6480762904022198669">"እኔ"</string>
-    <string name="labels" msgid="1519770547536283663">"መለያዎች"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"ሁሉንም አቃፊዎች አሳይ"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"ይሄ ውይይት ይሰረዝ?"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"የተመለስ አዘራር አስወግድ"</string>
     <string name="normalMode" msgid="4250277414924926730">"መደበኛ ሁኔታ አዘጋጅ"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"የፍለጋ ውጤት ሁናቴ"</string>
-    <string name="labelMode" msgid="1821987146443702635">"የስያሜ ሁናቴ አዘጋጅ"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"በመፈለግ ላይ…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"የቅርብ ጊዜ"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"የተቀባይ ዝርዝሮችን ዘርጋ"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"የተቀባይ ዝርዝሮች ሰብስብ"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"የ<xliff:g id="NAME">%1$s</xliff:g> የእውቂያ መረጃ አሳይ"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b7eeee4..9734f0c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"نسخة مخفية الوجهة"</string>
     <string name="subject_hint" msgid="7253964583324677128">"الموضوع"</string>
     <string name="body_hint" msgid="4279864165439577668">"إنشاء رسالة إلكترونية"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"إرفاق ملف"</string>
     <string name="save_draft" msgid="5555744208032445632">"حفظ كمسودة"</string>
     <string name="discard" msgid="1714960202994370243">"إلغاء"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"تعديل"</string>
     <string name="forward" msgid="6822914459902983767">"إعادة توجيه"</string>
     <string name="menu_compose" msgid="6274193058224230645">"إنشاء"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"تغيير التصنيفات"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"إعدادات التصنيفات"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"تم"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"إعدادات الحساب"</string>
     <string name="menu_settings" msgid="6007027046949837282">"إعدادات"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"جارٍ الإرسال…"</string>
     <string name="send_failed" msgid="750908595144529579">"لم يتم إرسال الرسالة."</string>
     <string name="me" msgid="6480762904022198669">"أنا"</string>
-    <string name="labels" msgid="1519770547536283663">"التصنيفات"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"عرض جميع المجلدات"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"هل تريد حذف هذه المحادثة؟"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"إزالة زر الرجوع"</string>
     <string name="normalMode" msgid="4250277414924926730">"تعيين الوضع العادي"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"وضع نتائج البحث"</string>
-    <string name="labelMode" msgid="1821987146443702635">"تعيين وضع التصنيف"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"جارٍ البحث…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"الأحدث"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"توسيع تفاصيل المستلم"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"تصغير تفاصيل المستلم"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"عرض معلومات جهة الاتصال لـ <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index aea85af..7dd630b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Утоеная копія"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Тэма"</string>
     <string name="body_hint" msgid="4279864165439577668">"Скласцi ліст"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Далучыць файл"</string>
     <string name="save_draft" msgid="5555744208032445632">"Захаваць чарнавік"</string>
     <string name="discard" msgid="1714960202994370243">"Скасаваць"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Рэдагаваць"</string>
     <string name="forward" msgid="6822914459902983767">"Пераслаць"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Напісаць"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Змяніць цэтлікі"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Налады цэтліка"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Гатова"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Налады ўліковага запісу"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Налады"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Адпраўка..."</string>
     <string name="send_failed" msgid="750908595144529579">"Паведамленне не адпраўлена."</string>
     <string name="me" msgid="6480762904022198669">"я"</string>
-    <string name="labels" msgid="1519770547536283663">"Цэтлікі"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Паказаць усе тэчкі"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Выдаліць размову?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Пошук..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Нядаўнiя навіны"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Разгарнуць звесткi пра атрымальніка"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Згарнуць дадзеныя пра атрымальніка"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Паказаць кантактную інфармацыю карыстальнiка <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0b43704..cf30858 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Ск"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Тема"</string>
     <string name="body_hint" msgid="4279864165439577668">"Напишете имейл"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Прикачване на файл"</string>
     <string name="save_draft" msgid="5555744208032445632">"Запазване на черновата"</string>
     <string name="discard" msgid="1714960202994370243">"Отхвърляне"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Редактиране"</string>
     <string name="forward" msgid="6822914459902983767">"Препращане"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Ново съобщение"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Промяна на етикетите"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Настройки за етикети"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Готово"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Настройки на профила"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Настройки"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Изпраща се…"</string>
     <string name="send_failed" msgid="750908595144529579">"Съобщ. не бе изпратено."</string>
     <string name="me" msgid="6480762904022198669">"аз"</string>
-    <string name="labels" msgid="1519770547536283663">"Етикети"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Показване на всички папки"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Да се изтрие ли тази кореспонденция?"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"Премахване на бутона за назад"</string>
     <string name="normalMode" msgid="4250277414924926730">"Задаване на нормален режим"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"Режим на търсене в резултатите"</string>
-    <string name="labelMode" msgid="1821987146443702635">"Задаване на режим с етикети"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Търси се…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Скорошни"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Разгъване на подробностите за получателя"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Свиване на подробностите за получателя"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Показване на информацията за връзка със: <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fbe585f..5a61c05 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Cco"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Assumpte"</string>
     <string name="body_hint" msgid="4279864165439577668">"Redacta un correu electrònic"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Adjunta un fitxer"</string>
     <string name="save_draft" msgid="5555744208032445632">"Desa l\'esborrany"</string>
     <string name="discard" msgid="1714960202994370243">"Descarta"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edita"</string>
     <string name="forward" msgid="6822914459902983767">"Reenvia"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Redacta"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Canvia les etiquetes"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Canvia les carpetes"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Gestiona les etiquetes"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Etiquetes"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronitza i notifica"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Configuració de l\'etiqueta"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Fet"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Configuració del compte"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Configuració"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"S\'està enviant…"</string>
     <string name="send_failed" msgid="750908595144529579">"No s\'ha enviat el missatge."</string>
     <string name="me" msgid="6480762904022198669">"jo"</string>
-    <string name="labels" msgid="1519770547536283663">"Etiquetes"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Mostra totes les carpetes"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vols suprimir aquesta conversa?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"S\'està cercant..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Recents"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Amplia els detalls del destinatari"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Redueix les dades del destinatari"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostra la informació de contacte de <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f5c5443..52a3981 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Skrytá kopie"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Předmět"</string>
     <string name="body_hint" msgid="4279864165439577668">"Napsat e-mail"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Přiložit soubor"</string>
     <string name="save_draft" msgid="5555744208032445632">"Uložit koncept"</string>
     <string name="discard" msgid="1714960202994370243">"Zrušit"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Upravit"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Nastavení štítku"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Hotovo"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Nastavení účtu"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Nastavení"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Odesílání..."</string>
     <string name="send_failed" msgid="750908595144529579">"Zpráva nebyla odeslána."</string>
     <string name="me" msgid="6480762904022198669">"já"</string>
-    <string name="labels" msgid="1519770547536283663">"Štítky"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Zobrazit všechny složky"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Smazat tuto konverzaci?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Vyhledávání..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Nejnovější"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Rozbalit podrobnosti o příjemci"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sbalit podrobnosti o příjemci"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Zobrazit kontaktní údaje uživatele <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3fdd5a1..58794ea 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Emne"</string>
     <string name="body_hint" msgid="4279864165439577668">"Skriv e-mail"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Vedhæft fil"</string>
     <string name="save_draft" msgid="5555744208032445632">"Gem kladde"</string>
     <string name="discard" msgid="1714960202994370243">"Kassér"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Rediger"</string>
     <string name="forward" msgid="6822914459902983767">"Videresend"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Skift etiketter"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Skift mapper"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Administrer etiketter"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Etiketter"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkroniser og underret"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Etiketindstillinger"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Udført"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Kontoindstillinger"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Indstillinger"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Sender…"</string>
     <string name="send_failed" msgid="750908595144529579">"Besked ikke sendt."</string>
     <string name="me" msgid="6480762904022198669">"mig"</string>
-    <string name="labels" msgid="1519770547536283663">"Etiketter"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtale?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Søger..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Seneste"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Udvid modtageroplysninger"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Skjul modtageroplysninger"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Vis kontaktoplysninger for <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c28d594..7da9978 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Betreff"</string>
     <string name="body_hint" msgid="4279864165439577668">"E-Mail schreiben"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Datei anhängen"</string>
     <string name="save_draft" msgid="5555744208032445632">"Entwurf speichern"</string>
     <string name="discard" msgid="1714960202994370243">"Verwerfen"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Bearbeiten"</string>
     <string name="forward" msgid="6822914459902983767">"Weiterleiten"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Schreiben"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Labels ändern"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Ordner ändern"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Labels verwalten"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Labels"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchr. &amp; benachrichtigen"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Label-Einstellungen"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Fertig"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Kontoeinstellungen"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Einstellungen"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Senden..."</string>
     <string name="send_failed" msgid="750908595144529579">"Nicht gesendet"</string>
     <string name="me" msgid="6480762904022198669">"Ich"</string>
-    <string name="labels" msgid="1519770547536283663">"Labels"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Alle Ordner anzeigen"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Diese Konversation löschen?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Wird gesucht..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Letzte"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Empfängerdetails maximieren"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Empfängerdetails minimieren"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Kontaktinformationen für <xliff:g id="NAME">%1$s</xliff:g> anzeigen"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4f5f14b..8a83004 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Κρυφ. κοιν."</string>
     <string name="subject_hint" msgid="7253964583324677128">"Θέμα"</string>
     <string name="body_hint" msgid="4279864165439577668">"Σύνταξη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Επισύναψη αρχείου"</string>
     <string name="save_draft" msgid="5555744208032445632">"Αποθήκευση προχείρου"</string>
     <string name="discard" msgid="1714960202994370243">"Απόρριψη"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Επεξεργασία"</string>
     <string name="forward" msgid="6822914459902983767">"Προώθηση"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Σύνταξη"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Αλλαγή ετικετών"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Ρυθμίσεις ετικέτας"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Τέλος"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Ρυθμίσεις Λογαριασμού"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Ρυθμίσεις"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Γίνεται αποστολή…"</string>
     <string name="send_failed" msgid="750908595144529579">"Μήνυμα δεν εστάλη."</string>
     <string name="me" msgid="6480762904022198669">"εγώ"</string>
-    <string name="labels" msgid="1519770547536283663">"Ετικέτες"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Εμφάνιση όλων των φακέλων"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Να διαγραφεί αυτή η συνομιλία;"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"Κατάργηση κουμπιού \"Πίσω\""</string>
     <string name="normalMode" msgid="4250277414924926730">"Ορισμός κανονικής λειτουργίας"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"Λειτουργία αποτελεσμάτων αναζήτησης"</string>
-    <string name="labelMode" msgid="1821987146443702635">"Ορισμός λειτουργίας ετικέτας"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Αναζήτηση…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Πρόσφατες"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Ανάπτυξη στοιχείων παραλήπτη"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Σύμπτυξη στοιχείων παραλήπτη"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Εμφάνιση στοιχείων επικοινωνίας για τον χρήστη <xliff:g id="NAME">%1$s</xliff:g>"</string>

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

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Subject"</string>
     <string name="body_hint" msgid="4279864165439577668">"Compose email"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Attach file"</string>
     <string name="save_draft" msgid="5555744208032445632">"Save draft"</string>
     <string name="discard" msgid="1714960202994370243">"Discard"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edit"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Label settings"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Finished"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Account settings"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Settings"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Sending…"</string>
     <string name="send_failed" msgid="750908595144529579">"Message wasn\'t sent."</string>
     <string name="me" msgid="6480762904022198669">"me"</string>
-    <string name="labels" msgid="1519770547536283663">"Labels"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Show all folders"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Delete this conversation?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Searching…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Recent"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expand recipient details"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Collapse recipient details"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Show contact information for <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8de12c2..7df6aeb 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"CCO"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Asunto"</string>
     <string name="body_hint" msgid="4279864165439577668">"Redactar un correo"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar un archivo"</string>
     <string name="save_draft" msgid="5555744208032445632">"Guardar como borrador"</string>
     <string name="discard" msgid="1714960202994370243">"Descartar"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editar"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Configuración de la etiqueta"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Listo"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Configuración de la cuenta"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Configuración"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Enviando..."</string>
     <string name="send_failed" msgid="750908595144529579">"No se envió el mensaje."</string>
     <string name="me" msgid="6480762904022198669">"yo"</string>
-    <string name="labels" msgid="1519770547536283663">"Etiquetas"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"¿Deseas eliminar esta conversación?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Buscando…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Recientes"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandir detalles del destinatario"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Contraer detalles del destinatario"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar la información de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index eeff517..b490a91 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"CCO"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Asunto"</string>
     <string name="body_hint" msgid="4279864165439577668">"Redactar correo"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar archivo"</string>
     <string name="save_draft" msgid="5555744208032445632">"Guardar borrador"</string>
     <string name="discard" msgid="1714960202994370243">"Descartar"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editar"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Ajustes de etiquetas"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Listo"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Ajustes de cuenta"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Ajustes"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Enviando..."</string>
     <string name="send_failed" msgid="750908595144529579">"No se ha enviado el mensaje."</string>
     <string name="me" msgid="6480762904022198669">"yo"</string>
-    <string name="labels" msgid="1519770547536283663">"Etiquetas"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"¿Eliminar esta conversación?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Buscando..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Reciente"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Ampliar información del destinatario"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Contraer información del destinatario"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar información de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 092cee9..a9b746a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Pimekoopia"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Teema"</string>
     <string name="body_hint" msgid="4279864165439577668">"Koostage meil"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Manusta fail"</string>
     <string name="save_draft" msgid="5555744208032445632">"Salvesta mustand"</string>
     <string name="discard" msgid="1714960202994370243">"Loobu"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Muuda"</string>
     <string name="forward" msgid="6822914459902983767">"Edasta"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Koosta"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Muuda silte"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Muuda kaustu"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Halda silte"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Sildid"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sünkroonimine ja teavitamine"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Sildi seaded"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Valmis"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Konto seaded"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Seaded"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Saatmine ..."</string>
     <string name="send_failed" msgid="750908595144529579">"Sõnumit ei saadetud."</string>
     <string name="me" msgid="6480762904022198669">"mina"</string>
-    <string name="labels" msgid="1519770547536283663">"Sildid"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Kuva kõik kaustad"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Kas kustutada see meilivestlus?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Otsimine ..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Hiljutised"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Saaja üksikasjade laiendamine"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Ahenda saaja üksikasjad"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Kuva saatja <xliff:g id="NAME">%1$s</xliff:g> kontaktandmed"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index becd7bb..c90d3d8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"گیرنده کپی مخفی"</string>
     <string name="subject_hint" msgid="7253964583324677128">"موضوع"</string>
     <string name="body_hint" msgid="4279864165439577668">"نوشتن ایمیل"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"پیوست کردن فایل"</string>
     <string name="save_draft" msgid="5555744208032445632">"ذخیره پیش‌نویس"</string>
     <string name="discard" msgid="1714960202994370243">"رد کردن"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"ویرایش"</string>
     <string name="forward" msgid="6822914459902983767">"باز ارسال"</string>
     <string name="menu_compose" msgid="6274193058224230645">"نوشتن نامه"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"تغییر برچسب‌ها"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"تنظیمات برچسب"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"انجام شد"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"تنظیمات حساب"</string>
     <string name="menu_settings" msgid="6007027046949837282">"تنظیمات"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"درحال ارسال..."</string>
     <string name="send_failed" msgid="750908595144529579">"پیام ارسال نشد."</string>
     <string name="me" msgid="6480762904022198669">"من"</string>
-    <string name="labels" msgid="1519770547536283663">"برچسب‌ها"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"نمایش همه پوشه‌ها"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"این مکالمه حذف شود؟"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"حذف دکمه بازگشت"</string>
     <string name="normalMode" msgid="4250277414924926730">"تنظیم حالت عادی"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"حالت جستجوی نتیجه"</string>
-    <string name="labelMode" msgid="1821987146443702635">"تنظیم حالت برچسب"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"درحال جستجو..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"اخیر"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"گسترش جزئیات گیرنده"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"کوچک کردن جزئیات گیرنده"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"نمایش اطلاعات تماس برای <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fc98177..00db2a6 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Piilokopio"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Aihe"</string>
     <string name="body_hint" msgid="4279864165439577668">"Kirjoita sähköposti"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Liitä tiedosto"</string>
     <string name="save_draft" msgid="5555744208032445632">"Tallenna luonnos"</string>
     <string name="discard" msgid="1714960202994370243">"Hylkää"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Muokkaa"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Tunnisteen asetukset"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Valmis"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Tilin asetukset"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Asetukset"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Lähetetään…"</string>
     <string name="send_failed" msgid="750908595144529579">"Viestiä ei lähetetty."</string>
     <string name="me" msgid="6480762904022198669">"minä"</string>
-    <string name="labels" msgid="1519770547536283663">"Tunnisteet"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Näytä kaikki kansiot"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Poistetaanko tämä keskustelu?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Haetaan.."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Uusimmat"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Laajenna vastaanottajan tiedot"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Tiivistä vastaanottajan tiedot"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Näytä henkilön <xliff:g id="NAME">%1$s</xliff:g> yhteystiedot"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4e741e7..fed8ad2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Cci"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Objet"</string>
     <string name="body_hint" msgid="4279864165439577668">"Composez un message"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Joindre un fichier"</string>
     <string name="save_draft" msgid="5555744208032445632">"Enregistrer le brouillon"</string>
     <string name="discard" msgid="1714960202994370243">"Ignorer"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Modifier"</string>
     <string name="forward" msgid="6822914459902983767">"Transférer"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Nouveau message"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Modifier les libellés"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Modifier les dossiers"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Gérer les libellés"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Libellés"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniser et signaler"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Paramètres du libellé"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"OK"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Paramètres de compte"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Paramètres"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Envoi en cours…"</string>
     <string name="send_failed" msgid="750908595144529579">"Échec de l\'envoi."</string>
     <string name="me" msgid="6480762904022198669">"moi"</string>
-    <string name="labels" msgid="1519770547536283663">"Libellés"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Afficher tous les dossiers"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Supprimer cette conversation ?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Recherche en cours…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Récents"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Développer coordonnées du destinataire"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Réduire les coordonnées du destinataire"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Afficher les coordonnées de <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ee4edae..2832c1b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"विषय"</string>
     <string name="body_hint" msgid="4279864165439577668">"ईमेल लिखें"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"फ़ाइल अनुलग्‍न करें"</string>
     <string name="save_draft" msgid="5555744208032445632">"ड्राफ़्ट सहेजें"</string>
     <string name="discard" msgid="1714960202994370243">"छोड़ें"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"संपादित करें"</string>
     <string name="forward" msgid="6822914459902983767">"अग्रेषित करें"</string>
     <string name="menu_compose" msgid="6274193058224230645">"लिखें"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"लेबल बदलें"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"लेबल सेटिंग"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"पूर्ण"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"खाता सेटिंग"</string>
     <string name="menu_settings" msgid="6007027046949837282">"सेटिंग"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"भेज रहा है…"</string>
     <string name="send_failed" msgid="750908595144529579">"संदेश नहीं भेजा गया था."</string>
     <string name="me" msgid="6480762904022198669">"मुझे"</string>
-    <string name="labels" msgid="1519770547536283663">"लेबल"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"सभी फ़ोल्‍डर दिखाएं"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"इस बातचीत को हटाएं?"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"वापस जाएं बटन निकालें"</string>
     <string name="normalMode" msgid="4250277414924926730">"सामान्य मोड सेट करें"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"खोज परिणाम मोड"</string>
-    <string name="labelMode" msgid="1821987146443702635">"लेबल मोड सेट करें"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"खोज रहा है…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"हाल ही के"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"प्राप्तकर्ता जानकारी विस्तृत करें"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"प्राप्तकर्ता जानकारी संक्षिप्त करें"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g> की संपर्क जानकारी दिखाएं"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8f374b9..2833de6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Skr. kopija"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Predmet"</string>
     <string name="body_hint" msgid="4279864165439577668">"Stvori novu poruku e-pošte"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteku"</string>
     <string name="save_draft" msgid="5555744208032445632">"Spremi skicu"</string>
     <string name="discard" msgid="1714960202994370243">"Odbaci"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Uredi"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Postavke oznake"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Gotovo"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Postavke računa"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Postavke"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Slanje…"</string>
     <string name="send_failed" msgid="750908595144529579">"Poruka nije poslana."</string>
     <string name="me" msgid="6480762904022198669">"ja"</string>
-    <string name="labels" msgid="1519770547536283663">"Oznake"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Prikaži sve mape"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Izbrisati ovaj razgovor?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Traženje..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Nedavno"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Proširi podatke o primatelju"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sažmi podatke o primatelju"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Prikaži podatke o kontaktu za <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index ede1e8b..801e5b0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Titkos másolat"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Tárgy"</string>
     <string name="body_hint" msgid="4279864165439577668">"Levélírás"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Fájl csatolása"</string>
     <string name="save_draft" msgid="5555744208032445632">"Piszkozat mentése"</string>
     <string name="discard" msgid="1714960202994370243">"Elvetés"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Szerkesztés"</string>
     <string name="forward" msgid="6822914459902983767">"Továbbítás"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Levélírás"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Címkék módosítása"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Mappaváltás"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Címkék kezelése"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Címkék"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Szinkronizálás és értesítés"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Címkebeállítások"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Kész"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Fiókbeállítások"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Beállítások"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Küldés…"</string>
     <string name="send_failed" msgid="750908595144529579">"Nincs elküldve"</string>
     <string name="me" msgid="6480762904022198669">"saját magam"</string>
-    <string name="labels" msgid="1519770547536283663">"Címkék"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Összes mappa megjelenítése"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Törli ezt a beszélgetést?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Keresés..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Legújabbak"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Címzett adatainak megjelenítése"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Címzett adatainak elrejtése"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g> elérhetőségi adatainak megjelenítése"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b4b2bb1..556d5f3 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Subjek"</string>
     <string name="body_hint" msgid="4279864165439577668">"Tulis email"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan file"</string>
     <string name="save_draft" msgid="5555744208032445632">"Simpan konsep"</string>
     <string name="discard" msgid="1714960202994370243">"Buang"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edit"</string>
     <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>
-    <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Pengaturan label"</string>
+    <string name="menu_change_folders" msgid="1542713666608888717">"Ganti folder"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Selesai"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Setelan akun"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Setelan"</string>
@@ -127,8 +132,9 @@
     <string name="sending" msgid="8214361929125649771">"Mengirim…"</string>
     <string name="send_failed" msgid="750908595144529579">"Pesan tidak dikirim."</string>
     <string name="me" msgid="6480762904022198669">"saya"</string>
-    <string name="labels" msgid="1519770547536283663">"Label"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Tampilkan semua map"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
+    <string name="show_all_folders" msgid="3281420732307737553">"Tampilkan semua folder"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Hapus percakapan ini?"</item>
     <item quantity="other" msgid="930334208937121234">"Hapus <xliff:g id="COUNT">%1$d</xliff:g> percakapan ini?"</item>
@@ -197,8 +203,8 @@
     <item quantity="other" msgid="858491333253953462">"&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; ditandai sebagai belum dibaca."</item>
   </plurals>
   <plurals name="conversation_folder_changed">
-    <item quantity="one" msgid="4930161390461457462">"Map diubah."</item>
-    <item quantity="other" msgid="8918589141287976985">"Map diubah."</item>
+    <item quantity="one" msgid="4930161390461457462">"Folder diubah."</item>
+    <item quantity="other" msgid="8918589141287976985">"Folder diubah."</item>
   </plurals>
     <string name="search_results_header" msgid="4669917471897026269">"Hasil"</string>
     <string name="searchMode" msgid="3329807422114758583">"Mode Penelusuran"</string>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Menelusuri…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Terkini"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Bentangkan detail penerima"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Ciutkan detail penerima"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Tampilkan informasi data kenalan untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -235,7 +243,7 @@
     <string name="done" msgid="3079981801778027540">"Selesai"</string>
     <string name="cancel" msgid="8762981157252199115">"Batal"</string>
     <string name="close" msgid="419945428844076406">"Tutup"</string>
-    <string name="folders_activity_instructions" msgid="5237801615196958918">"Tidak ada map yang disetel untuk akun ini."</string>
+    <string name="folders_activity_instructions" msgid="5237801615196958918">"Tidak ada folder yang disetel untuk akun ini."</string>
   <string-array name="sync_status">
     <item msgid="2446076619901049026">"Berhasil"</item>
     <item msgid="5037283655022689372">"Galat sambungan"</item>
@@ -245,23 +253,23 @@
     <item msgid="9190542479647789762">"Galat internal"</item>
   </string-array>
     <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="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat percakapan, sinkronkan folder ini."</string>
+    <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronkan Folder"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <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="activity_folder_selection" msgid="5161845867397316052">"Pilih folder"</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_title" msgid="6889243150191948255">"Sinkronkan folder"</string>
+    <string name="folder_sync_for_widget_description" msgid="3287913520283417367">"Untuk melihat percakapan di gawit, sinkronkan folder 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>
+    <string name="folder_selection_dialog_title" msgid="9194093596644845383">"Ganti folder"</string>
     <string name="search_hint" msgid="3625734263059221350">"Telusuri email"</string>
     <!-- no translation found for search_results_loaded (7840075360438913721) -->
     <skip />

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 845af45..b0e6a62 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Ccn"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Oggetto"</string>
     <string name="body_hint" msgid="4279864165439577668">"Scrivi email"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Allega file"</string>
     <string name="save_draft" msgid="5555744208032445632">"Salva bozza"</string>
     <string name="discard" msgid="1714960202994370243">"Elimina"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Modifica"</string>
     <string name="forward" msgid="6822914459902983767">"Inoltra"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Scrivi"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Cambia etichette"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Cambia cartelle"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Gestisci etichette"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Etichette"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizza e notifica"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Impostazioni etichetta"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Fine"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Impostazioni account"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Impostazioni"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Invio..."</string>
     <string name="send_failed" msgid="750908595144529579">"Messaggio non inviato."</string>
     <string name="me" msgid="6480762904022198669">"me"</string>
-    <string name="labels" msgid="1519770547536283663">"Etichette"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Visualizza tutte le cartelle"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Eliminare questa conversazione?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Ricerca…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Recenti"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Espandi i dettagli destinatario"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Comprimi i dettagli destinatario"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostra informazioni di contatto di <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4993d57..2da437e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"עותק מוסתר"</string>
     <string name="subject_hint" msgid="7253964583324677128">"נושא"</string>
     <string name="body_hint" msgid="4279864165439577668">"כתוב דוא\"ל"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"צרף קובץ"</string>
     <string name="save_draft" msgid="5555744208032445632">"שמור טיוטה"</string>
     <string name="discard" msgid="1714960202994370243">"מחק"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"ערוך"</string>
     <string name="forward" msgid="6822914459902983767">"העבר"</string>
     <string name="menu_compose" msgid="6274193058224230645">"כתוב"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"שנה תוויות"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"הגדרות תווית"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"בוצע"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"הגדרות חשבון"</string>
     <string name="menu_settings" msgid="6007027046949837282">"הגדרות"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"שולח…"</string>
     <string name="send_failed" msgid="750908595144529579">"ההודעה לא נשלחה."</string>
     <string name="me" msgid="6480762904022198669">"אני"</string>
-    <string name="labels" msgid="1519770547536283663">"תוויות"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"הצג את כל התיקיות"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"האם למחוק שיחה זו?"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"הסר את הלחצן \'הקודם\'"</string>
     <string name="normalMode" msgid="4250277414924926730">"הגדר מצב רגיל"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"מצב תוצאת חיפוש"</string>
-    <string name="labelMode" msgid="1821987146443702635">"הגדר מצב תווית"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"מחפש…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"אחרונות"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"הרחב פרטי נמען"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"כווץ את פרטי הנמען"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"הצג פרטי איש קשר של <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b1c3604..862e963 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"件名"</string>
     <string name="body_hint" msgid="4279864165439577668">"メールを作成します"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"ファイルを添付"</string>
     <string name="save_draft" msgid="5555744208032445632">"下書きを保存"</string>
     <string name="discard" msgid="1714960202994370243">"破棄"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"編集"</string>
     <string name="forward" msgid="6822914459902983767">"転送"</string>
     <string name="menu_compose" msgid="6274193058224230645">"作成"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"ラベルを変更"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"ラベルの設定"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"完了"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"アカウント設定"</string>
     <string name="menu_settings" msgid="6007027046949837282">"設定"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"送信しています…"</string>
     <string name="send_failed" msgid="750908595144529579">"送信に失敗しました。"</string>
     <string name="me" msgid="6480762904022198669">"自分"</string>
-    <string name="labels" msgid="1519770547536283663">"ラベル"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"すべてのフォルダを表示"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"このスレッドを削除しますか？"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"戻るボタンの削除"</string>
     <string name="normalMode" msgid="4250277414924926730">"通常モードの設定"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"検索結果モード"</string>
-    <string name="labelMode" msgid="1821987146443702635">"ラベルモードの設定"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"検索しています…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"最近"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"受信者の詳細を表示"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"受信者の詳細を隠す"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g>の連絡先情報を表示"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 601068f..b1d4f51 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"숨은참조"</string>
     <string name="subject_hint" msgid="7253964583324677128">"제목"</string>
     <string name="body_hint" msgid="4279864165439577668">"이메일 작성"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"파일 첨부"</string>
     <string name="save_draft" msgid="5555744208032445632">"임시보관함에 저장"</string>
     <string name="discard" msgid="1714960202994370243">"삭제"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"수정"</string>
     <string name="forward" msgid="6822914459902983767">"전달"</string>
     <string name="menu_compose" msgid="6274193058224230645">"편지쓰기"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"라벨 변경"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"라벨 설정"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"완료"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"계정 설정"</string>
     <string name="menu_settings" msgid="6007027046949837282">"설정"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"전송 중..."</string>
     <string name="send_failed" msgid="750908595144529579">"메일이 전송되지 않았습니다."</string>
     <string name="me" msgid="6480762904022198669">"나"</string>
-    <string name="labels" msgid="1519770547536283663">"라벨"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"모든 폴더 표시"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"대화를 삭제하시겠습니까?"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"뒤로 버튼 제거"</string>
     <string name="normalMode" msgid="4250277414924926730">"일반 모드 설정"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"결과 검색 모드"</string>
-    <string name="labelMode" msgid="1821987146443702635">"라벨 모드 설정"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"검색 중…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"최근"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"수신자 세부정보 펼치기"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"수신자 세부정보 접기"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g>님에 대한 연락처 정보 표시"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c1b24c4..1f1f814 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Nemat. kop."</string>
     <string name="subject_hint" msgid="7253964583324677128">"Tema"</string>
     <string name="body_hint" msgid="4279864165439577668">"Kurti el. laišką"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Pridėti failą"</string>
     <string name="save_draft" msgid="5555744208032445632">"Išsaugoti juodraštį"</string>
     <string name="discard" msgid="1714960202994370243">"Atmesti"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Redaguoti"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Etiketės nustatymai"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Atlikta"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Paskyros nustatymai"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Nustatymai"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Siunčiama…"</string>
     <string name="send_failed" msgid="750908595144529579">"Pranešimas neišsiųstas."</string>
     <string name="me" msgid="6480762904022198669">"man"</string>
-    <string name="labels" msgid="1519770547536283663">"Etiketės"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Rodyti visus aplankus"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Ištrinti šį pokalbį?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Ieškoma…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Naujausia"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Išskleisti išsamią gavėjo informaciją"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sutraukti išsamią gavėjo informaciją"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Rodyti <xliff:g id="NAME">%1$s</xliff:g> kontaktinę informaciją"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0b45898..1bbbe60 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"D. kopija"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Temats"</string>
     <string name="body_hint" msgid="4279864165439577668">"Rakstiet e-pasta ziņojumu"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Pievienot failu"</string>
     <string name="save_draft" msgid="5555744208032445632">"Saglabāt melnrakstu"</string>
     <string name="discard" msgid="1714960202994370243">"Atmest"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Rediģēt"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Iezīmes iestatījumi"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Gatavs"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Konta iestatījumi"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Iestatījumi"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Notiek sūtīšana…"</string>
     <string name="send_failed" msgid="750908595144529579">"Ziņoj. nav nosūtīts."</string>
     <string name="me" msgid="6480762904022198669">"man"</string>
-    <string name="labels" msgid="1519770547536283663">"Iezīmes"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Rādīt visas mapes"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vai dzēst šo sarunu?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Notiek meklēšana..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Jaunākās"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Izvērst informāciju par adresātu"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Sakļaut informāciju par adresātu"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Rādīt sūtītāja <xliff:g id="NAME">%1$s</xliff:g> kontaktinformāciju"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e6b4a96..141d456 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Skt"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Subjek"</string>
     <string name="body_hint" msgid="4279864165439577668">"Karang e-mel"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan fail"</string>
     <string name="save_draft" msgid="5555744208032445632">"Simpan draf"</string>
     <string name="discard" msgid="1714960202994370243">"Buang"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edit"</string>
     <string name="forward" msgid="6822914459902983767">"Kirim semula"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Karang"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Tukar label"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Tukar folder"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Urus label"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Label"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Segerakkan &amp; beritahu"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Tetapan label"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Selesai"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Tetapan akaun"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Tetapan"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Menghantar…"</string>
     <string name="send_failed" msgid="750908595144529579">"Mesej tidak dihantar."</string>
     <string name="me" msgid="6480762904022198669">"saya"</string>
-    <string name="labels" msgid="1519770547536283663">"Label"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Tunjukkan semua folder"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Padamkan perbualan ini?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Mencari..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Terbaru"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Kembangkan butiran penerima"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Runtuhkan butiran penerima"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Papar maklumat kenalan untuk <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e949697..5a697b1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Blindkopi"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Emne"</string>
     <string name="body_hint" msgid="4279864165439577668">"Skriv e-post"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Legg ved fil"</string>
     <string name="save_draft" msgid="5555744208032445632">"Lagre utkast"</string>
     <string name="discard" msgid="1714960202994370243">"Forkast"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Rediger"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Innstillinger for etikett"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Ferdig"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Kontoinnstillinger"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Innstillinger"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Sender …"</string>
     <string name="send_failed" msgid="750908595144529579">"E-post ikke sendt."</string>
     <string name="me" msgid="6480762904022198669">"meg"</string>
-    <string name="labels" msgid="1519770547536283663">"Etiketter"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtalen?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Søker …"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Nylig"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Utvid detaljer om mottaker"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Skjul detaljer om mottaker"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Vis kontaktinformasjon for <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 88883aa..440f679 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Onderwerp"</string>
     <string name="body_hint" msgid="4279864165439577668">"E-mail opstellen"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Bestand bijvoegen"</string>
     <string name="save_draft" msgid="5555744208032445632">"Concept opslaan"</string>
     <string name="discard" msgid="1714960202994370243">"Weggooien"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Bewerken"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Labelinstellingen"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Gereed"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Accountinstellingen"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Instellingen"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Verzenden..."</string>
     <string name="send_failed" msgid="750908595144529579">"Niet verzonden."</string>
     <string name="me" msgid="6480762904022198669">"ik"</string>
-    <string name="labels" msgid="1519770547536283663">"Labels"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Alle mappen weergeven"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Deze conversatie verwijderen?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Zoeken…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Recent"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Ontvangersdetails uitvouwen"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Ontvangersdetails samenvouwen"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Contactgegevens weergeven voor <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 64d9703..5543011 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"UDW"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Temat"</string>
     <string name="body_hint" msgid="4279864165439577668">"Napisz e-maila."</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Załącz plik"</string>
     <string name="save_draft" msgid="5555744208032445632">"Zapisz wersję roboczą"</string>
     <string name="discard" msgid="1714960202994370243">"Odrzuć"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Edytuj"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Ustawienia etykiety"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Gotowe"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Ustawienia konta"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Ustawienia"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Wysyłanie..."</string>
     <string name="send_failed" msgid="750908595144529579">"Wiadomość nie została wysłana."</string>
     <string name="me" msgid="6480762904022198669">"ja"</string>
-    <string name="labels" msgid="1519770547536283663">"Etykiety"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Pokaż wszystkie foldery"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Usunąć wątek?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Wyszukiwanie…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Ostatnie"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Rozwiń szczegóły odbiorcy"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Zwiń szczegóły odbiorcy"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Pokaż informacje kontaktowe: <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8e07ef2..f4e7272 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Assunto"</string>
     <string name="body_hint" msgid="4279864165439577668">"Escrever e-mail"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Anexar ficheiro"</string>
     <string name="save_draft" msgid="5555744208032445632">"Guardar rascunho"</string>
     <string name="discard" msgid="1714960202994370243">"Rejeitar"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editar"</string>
     <string name="forward" msgid="6822914459902983767">"Encaminhar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Compor"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Alterar etiquetas"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Alterar pastas"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Gerir etiquetas"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Etiquetas"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Definições de etiquetas"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Concluído"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Definições da conta"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Definições"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"A enviar..."</string>
     <string name="send_failed" msgid="750908595144529579">"Mensagem não enviada."</string>
     <string name="me" msgid="6480762904022198669">"utilizador"</string>
-    <string name="labels" msgid="1519770547536283663">"Etiquetas"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas as pastas"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Eliminar esta conversa?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"A pesquisar..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Recente"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandir detalhes do destinatário"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Fechar detalhes do destinatário"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar informações de contacto de <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4925228..a176b24 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Cco"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Assunto"</string>
     <string name="body_hint" msgid="4279864165439577668">"Escrever e-mail"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Anexar arquivo"</string>
     <string name="save_draft" msgid="5555744208032445632">"Salvar rascunho"</string>
     <string name="discard" msgid="1714960202994370243">"Descartar"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editar"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Configurações do marcador"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Concluído"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Configurações da conta"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Configurações"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Enviando..."</string>
     <string name="send_failed" msgid="750908595144529579">"A mensagem não foi enviada."</string>
     <string name="me" msgid="6480762904022198669">"eu"</string>
-    <string name="labels" msgid="1519770547536283663">"Marcadores"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas as pastas"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Excluir esta conversa?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Pesquisando..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Recentes"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandir detalhes do destinatário"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Recolher detalhes do destinatário"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Mostrar informações de contato de <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8e6235e..b89c914 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Subiect"</string>
     <string name="body_hint" msgid="4279864165439577668">"Scrieţi un e-mail"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Ataşaţi un fişier"</string>
     <string name="save_draft" msgid="5555744208032445632">"Salvaţi mesajul nefinal."</string>
     <string name="discard" msgid="1714960202994370243">"Renunţaţi"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Editaţi"</string>
     <string name="forward" msgid="6822914459902983767">"Redirecţionaţi"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Scrieţi"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Modificaţi etichetele"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Modificaţi dosarele"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Gestionaţi etichetele"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Etichete"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizare şi notificare"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Setări pentru etichete"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Terminat"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Setările contului"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Setări"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Se trimite..."</string>
     <string name="send_failed" msgid="750908595144529579">"Mesaj netrimis."</string>
     <string name="me" msgid="6480762904022198669">"eu"</string>
-    <string name="labels" msgid="1519770547536283663">"Etichete"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Afişaţi toate dosarele"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Ştergeţi această conversaţie?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Se caută..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Recente"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Extindeţi detaliile destinatarului"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Restrângeţi detaliile destinatarului"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Afişaţi informaţiile de contact pentru <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fee355b..ef91970 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Скр. копия"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Тема"</string>
     <string name="body_hint" msgid="4279864165439577668">"Текст сообщения"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Прикрепить файл"</string>
     <string name="save_draft" msgid="5555744208032445632">"Сохранить черновик"</string>
     <string name="discard" msgid="1714960202994370243">"Закрыть"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Изменить"</string>
     <string name="forward" msgid="6822914459902983767">"Переслать"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Написать"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Изменить ярлыки"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Настройки ярлыка"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Готово"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Настройки аккаунта"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Настройки"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Отправка…"</string>
     <string name="send_failed" msgid="750908595144529579">"Не отправлено."</string>
     <string name="me" msgid="6480762904022198669">"мне"</string>
-    <string name="labels" msgid="1519770547536283663">"Ярлыки"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Показать все почтовые ящики"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Удалить эту цепочку?"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"Удалить кнопку \"Назад\""</string>
     <string name="normalMode" msgid="4250277414924926730">"Обычный режим"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"Результаты поиска"</string>
-    <string name="labelMode" msgid="1821987146443702635">"Режим ярлыков"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Поиск…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Недавние"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Показать сведения о получателе"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Скрыть сведения о получателе"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Показать контактные данные пользователя <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0c9f9c1..2d2bf3b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Skrytá kópia"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Predmet"</string>
     <string name="body_hint" msgid="4279864165439577668">"Napísať e-mail"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Pripojiť súbor"</string>
     <string name="save_draft" msgid="5555744208032445632">"Uložiť koncept"</string>
     <string name="discard" msgid="1714960202994370243">"Zahodiť"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Upraviť"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Nastavenia menovky"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Hotovo"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Nastavenia účtu"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Nastavenia"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Odosielanie..."</string>
     <string name="send_failed" msgid="750908595144529579">"Správa nebola odoslaná."</string>
     <string name="me" msgid="6480762904022198669">"ja"</string>
-    <string name="labels" msgid="1519770547536283663">"Menovky"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Zobraziť všetky priečinky"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Odstrániť túto konverzáciu?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Prebieha vyhľadávanie..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Nedávne"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Rozbaliť podrobnosti o príjemcovi"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Zbaliť podrobnosti o príjemcovi"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Zobraziť informácie kontaktu <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ef6cc1f..4e758cc 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Skp"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Zadeva"</string>
     <string name="body_hint" msgid="4279864165439577668">"Novo e-poštno sporočilo"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteko"</string>
     <string name="save_draft" msgid="5555744208032445632">"Shrani osnutek"</string>
     <string name="discard" msgid="1714960202994370243">"Zavrzi"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Uredi"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Nastavitve oznake"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Končano"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Nastavitve računa"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Nastavitve"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Pošiljanje…"</string>
     <string name="send_failed" msgid="750908595144529579">"Sporočilo ni bilo poslano."</string>
     <string name="me" msgid="6480762904022198669">"jaz"</string>
-    <string name="labels" msgid="1519770547536283663">"Oznake"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Pokaži vse mape"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Želite izbrisati ta pogovor?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Iskanje ..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Nedavni"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Razširi podrobnosti prejemnika"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Strni podrobnosti prejemnika"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Prikaz podatkov za stik za <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 108b70a..f9b9577 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Скривена копија"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Наслов"</string>
     <string name="body_hint" msgid="4279864165439577668">"Напишите поруку е-поште"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Приложи датотеку"</string>
     <string name="save_draft" msgid="5555744208032445632">"Сачувај недовршену поруку"</string>
     <string name="discard" msgid="1714960202994370243">"Одбаци"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Измени"</string>
     <string name="forward" msgid="6822914459902983767">"Проследи"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Нова порука"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Промени ознаке"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Подешавања ознаке"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Готово"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Подешавања налога"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Подешавања"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Слање..."</string>
     <string name="send_failed" msgid="750908595144529579">"Порука није послата."</string>
     <string name="me" msgid="6480762904022198669">"мени"</string>
-    <string name="labels" msgid="1519770547536283663">"Ознаке"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Прикажи све директоријуме"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Желите ли да избришете ову преписку?"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"Уклони дугме Назад"</string>
     <string name="normalMode" msgid="4250277414924926730">"Подеси нормални режим"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"Режим резултата претраге"</string>
-    <string name="labelMode" msgid="1821987146443702635">"Подеси режим ознаке"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Претраживање..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Недавне"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Прошири детаље о примаоцу"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Скупи детаље о примаоцу"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Прикажи контакт информације корисника <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e6a2503..5eb3441 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Hemlig kopia"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Ämne"</string>
     <string name="body_hint" msgid="4279864165439577668">"Skriv ett e-postmeddelande"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Bifoga fil"</string>
     <string name="save_draft" msgid="5555744208032445632">"Spara utkast"</string>
     <string name="discard" msgid="1714960202994370243">"Släng"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Redigera"</string>
     <string name="forward" msgid="6822914459902983767">"Vidarebefordra"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Ändra etiketter"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Byt mapp"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Hantera etiketter"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Etiketter"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Synka och meddela"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Inställningar för etikett"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Klar"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Kontoinställningar"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Inställningar"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Skickar ..."</string>
     <string name="send_failed" msgid="750908595144529579">"E-post skickades ej."</string>
     <string name="me" msgid="6480762904022198669">"jag"</string>
-    <string name="labels" msgid="1519770547536283663">"Etiketter"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Visa alla mappar"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vill du ta bort konversationen?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Söker …"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Senaste"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Expandera mottagardetaljer"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Komprimera mottagardetaljer"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Visa kontaktuppgifter för <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0021f33..15a1c0d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Nakala fiche kwa"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Kichwa"</string>
     <string name="body_hint" msgid="4279864165439577668">"Tunga barua pepe"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Ambatisha faili"</string>
     <string name="save_draft" msgid="5555744208032445632">"Hifadhi rasimu"</string>
     <string name="discard" msgid="1714960202994370243">"Tupa"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Hariri"</string>
     <string name="forward" msgid="6822914459902983767">"Sambaza"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Tunga"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Badilisha lebo"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Badilisha folda"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Dhibiti lebo"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Lebo"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Landanisha &amp; arifu"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Mipangilio ya lebo"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Imekamilika"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Mipangilio ya akaunti"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Mipangilio"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Inatuma…"</string>
     <string name="send_failed" msgid="750908595144529579">"Ujumbe haukutumwa."</string>
     <string name="me" msgid="6480762904022198669">"mimi"</string>
-    <string name="labels" msgid="1519770547536283663">"Lebo"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Onyesha folda zote"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Mazungumzo haya yafutwe?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Inatafuta…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Hivi karibuni"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <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>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index e2a1633..31d0659 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"สำเนาลับ"</string>
     <string name="subject_hint" msgid="7253964583324677128">"หัวเรื่อง"</string>
     <string name="body_hint" msgid="4279864165439577668">"เขียนอีเมล"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"แนบไฟล์"</string>
     <string name="save_draft" msgid="5555744208032445632">"บันทึกร่างจดหมาย"</string>
     <string name="discard" msgid="1714960202994370243">"ยกเลิก"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"แก้ไข"</string>
     <string name="forward" msgid="6822914459902983767">"ส่งต่อ"</string>
     <string name="menu_compose" msgid="6274193058224230645">"เขียน"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"เปลี่ยนป้ายกำกับ"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"การตั้งค่าป้ายกำกับ"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"เสร็จสิ้น"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"การตั้งค่าบัญชี"</string>
     <string name="menu_settings" msgid="6007027046949837282">"การตั้งค่า"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"กำลังส่ง…"</string>
     <string name="send_failed" msgid="750908595144529579">"ไม่ได้ส่งข้อความ"</string>
     <string name="me" msgid="6480762904022198669">"ฉัน"</string>
-    <string name="labels" msgid="1519770547536283663">"ป้ายกำกับ"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"แสดงโฟลเดอร์ทั้งหมด"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"ลบการสนทนานี้หรือไม่"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"นำปุ่ม \"ย้อนกลับ\" ออก"</string>
     <string name="normalMode" msgid="4250277414924926730">"ตั้งโหมดปกติ"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"โหมดผลการค้นหา"</string>
-    <string name="labelMode" msgid="1821987146443702635">"ตั้งโหมดป้ายกำกับ"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"กำลังค้นหา..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"ล่าสุด"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"ขยายรายละเอียดผู้รับ"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"ยุบรายละเอียดผู้รับ"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"แสดงข้อมูลติดต่อของ <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 48179a6..c9b824b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Paksa"</string>
     <string name="body_hint" msgid="4279864165439577668">"Bumuo ng email"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Mag-attach ng file"</string>
     <string name="save_draft" msgid="5555744208032445632">"I-save ang draft"</string>
     <string name="discard" msgid="1714960202994370243">"Itapon"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"I-edit"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Mga setting ng label"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Tapos na"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Mga setting ng account"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Mga Setting"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Ipinapadala…"</string>
     <string name="send_failed" msgid="750908595144529579">"Di pinadala mensahe."</string>
     <string name="me" msgid="6480762904022198669">"ako"</string>
-    <string name="labels" msgid="1519770547536283663">"Mga Label"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Ipakita ang lahat ng folder"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Tanggalin ang pag-uusap na ito?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Naghahanap..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Kamakailan"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Palawakin ang mga detalye ng recipient"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Tiklupin ang mga detalye ng recipient"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Ipakita ang impormasyon ng contact para kay <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a7eac79..6d1b1f7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Konu"</string>
     <string name="body_hint" msgid="4279864165439577668">"E-posta yazın"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Dosya ekleyin"</string>
     <string name="save_draft" msgid="5555744208032445632">"Taslağı kaydet"</string>
     <string name="discard" msgid="1714960202994370243">"Sil"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Düzenle"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Etiket ayarları"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Bitti"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Hesap ayarları"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Ayarlar"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Gönderiliyor..."</string>
     <string name="send_failed" msgid="750908595144529579">"İleti gönderilmedi."</string>
     <string name="me" msgid="6480762904022198669">"ben"</string>
-    <string name="labels" msgid="1519770547536283663">"Etiketler"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Tüm klasörleri göster"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Bu ileti dizisi silinsin mi?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Aranıyor…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Son"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Alıcı ayrıntılarını genişlet"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Alıcı ayrıntılarını daralt"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"<xliff:g id="NAME">%1$s</xliff:g> iletişim bilgilerini göster"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7f6ecc8..5785f72 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Прих. копія"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Тема"</string>
     <string name="body_hint" msgid="4279864165439577668">"Напишіть електронний лист"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Вкласти файл"</string>
     <string name="save_draft" msgid="5555744208032445632">"Зберегти як чернетку"</string>
     <string name="discard" msgid="1714960202994370243">"Закрити"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Редагувати"</string>
     <string name="forward" msgid="6822914459902983767">"Переслати"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Написати"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Змінити мітки"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Налаштування мітки"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Готово"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Налаштування облікового запису"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Налаштування"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Надсилання…"</string>
     <string name="send_failed" msgid="750908595144529579">"Повідомл. не надісл."</string>
     <string name="me" msgid="6480762904022198669">"я"</string>
-    <string name="labels" msgid="1519770547536283663">"Мітки"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Показати всі папки"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Видалити цю бесіду?"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"Видалити кнопку \"Назад\""</string>
     <string name="normalMode" msgid="4250277414924926730">"Установити нормальний режим"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"Режим пошуку в результатах"</string>
-    <string name="labelMode" msgid="1821987146443702635">"Установити режим міток"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Пошук..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Останні"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Розгорнути дані отримувача"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Згорнути дані отримувача"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Показати контактну інформацію відправника <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ec15e49..8a2c662 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Chủ đề"</string>
     <string name="body_hint" msgid="4279864165439577668">"Soạn email"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Đính kèm tệp"</string>
     <string name="save_draft" msgid="5555744208032445632">"Lưu bản nháp"</string>
     <string name="discard" msgid="1714960202994370243">"Hủy"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Chỉnh sửa"</string>
     <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>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"Cài đặt nhãn"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Hoàn tất"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Cài đặt tài khoản"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Cài đặt"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Đang gửi…"</string>
     <string name="send_failed" msgid="750908595144529579">"Thư chưa được gửi."</string>
     <string name="me" msgid="6480762904022198669">"tôi"</string>
-    <string name="labels" msgid="1519770547536283663">"Nhãn"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Hiển thị tất cả thư mục"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Xóa cuộc hội thoại này?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Đang tìm kiếm…"</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Gần đây"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Mở rộng chi tiết người nhận"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Thu gọn chi tiết người nhận"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Hiển thị thông tin liên hệ cho <xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a5d1060..5b6bf90 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"密送"</string>
     <string name="subject_hint" msgid="7253964583324677128">"主题"</string>
     <string name="body_hint" msgid="4279864165439577668">"撰写电子邮件"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"添加附件"</string>
     <string name="save_draft" msgid="5555744208032445632">"保存草稿"</string>
     <string name="discard" msgid="1714960202994370243">"舍弃"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"修改"</string>
     <string name="forward" msgid="6822914459902983767">"转发"</string>
     <string name="menu_compose" msgid="6274193058224230645">"写邮件"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"更改标签"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"标签设置"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"完成"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"帐户设置"</string>
     <string name="menu_settings" msgid="6007027046949837282">"设置"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"正在发送..."</string>
     <string name="send_failed" msgid="750908595144529579">"邮件发送失败。"</string>
     <string name="me" msgid="6480762904022198669">"我"</string>
-    <string name="labels" msgid="1519770547536283663">"标签"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"显示所有文件夹"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"要删除此会话吗？"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"删除“返回”按钮"</string>
     <string name="normalMode" msgid="4250277414924926730">"设置普通模式"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"搜索结果模式"</string>
-    <string name="labelMode" msgid="1821987146443702635">"设置标签模式"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"正在搜索..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"最近"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"展开收件人详细信息"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"折叠收件人详细信息"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"显示<xliff:g id="NAME">%1$s</xliff:g>的联系人信息"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8d5cd7e..d9e0bff 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"密件副本"</string>
     <string name="subject_hint" msgid="7253964583324677128">"主旨"</string>
     <string name="body_hint" msgid="4279864165439577668">"撰寫電子郵件"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"附加檔案"</string>
     <string name="save_draft" msgid="5555744208032445632">"儲存草稿"</string>
     <string name="discard" msgid="1714960202994370243">"捨棄"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"編輯"</string>
     <string name="forward" msgid="6822914459902983767">"轉寄"</string>
     <string name="menu_compose" msgid="6274193058224230645">"撰寫"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"變更標籤"</string>
     <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>
-    <string name="menu_label_options" msgid="1811414840489117457">"標籤設定"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"完成"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"帳戶設定"</string>
     <string name="menu_settings" msgid="6007027046949837282">"設定"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"傳送中…"</string>
     <string name="send_failed" msgid="750908595144529579">"郵件未傳送。"</string>
     <string name="me" msgid="6480762904022198669">"我"</string>
-    <string name="labels" msgid="1519770547536283663">"標籤"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"顯示所有資料夾"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"刪除這個會話群組？"</item>
@@ -207,9 +213,11 @@
     <string name="removeBackButton" msgid="860383341267568260">"移除 [返回] 按鈕"</string>
     <string name="normalMode" msgid="4250277414924926730">"設定標準模式"</string>
     <string name="searchResultMode" msgid="3564180712046711968">"搜尋結果模式"</string>
-    <string name="labelMode" msgid="1821987146443702635">"設定標籤模式"</string>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"搜尋中..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"近期"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"展開收件者詳細資料"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"收合收件者詳細資料"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"顯示 <xliff:g id="NAME">%1$s</xliff:g> 的聯絡人資訊"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f79017a..06162b1 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -23,8 +23,10 @@
     <string name="bcc" msgid="3098643138241111579">"Bcc"</string>
     <string name="subject_hint" msgid="7253964583324677128">"Isihloko"</string>
     <string name="body_hint" msgid="4279864165439577668">"Ukwakha i-imeyili"</string>
-    <string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
-    <string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
+    <!-- no translation found for plus_cc_folder (1214307160559508302) -->
+    <skip />
+    <!-- no translation found for plus_bcc_folder (4756816436930806526) -->
+    <skip />
     <string name="add_file_attachment" msgid="2203398371671979481">"Namathisela ifayela"</string>
     <string name="save_draft" msgid="5555744208032445632">"Londoloza okusazolungiswa"</string>
     <string name="discard" msgid="1714960202994370243">"Lahla"</string>
@@ -65,12 +67,15 @@
     <string name="resume_draft" msgid="6450150180834092146">"Hlela"</string>
     <string name="forward" msgid="6822914459902983767">"Dlulisela"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Bhala"</string>
-    <string name="menu_change_labels" msgid="9121087142079721959">"Shintsha amalebuli"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Shintsha amafolda"</string>
-    <string name="menu_manage_labels" msgid="8618788259638720538">"Phatha amalebuli"</string>
-    <string name="label_list_title" msgid="7948730824763052410">"Amalebuli"</string>
-    <string name="manage_labels_subtitle" msgid="8802709983773098505">"Ukuvumelanisa &amp; ukuqaphelisa"</string>
-    <string name="menu_label_options" msgid="1811414840489117457">"Izilungiselelo zelebuli"</string>
+    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <skip />
+    <!-- no translation found for folder_list_title (4276644062440415214) -->
+    <skip />
+    <!-- no translation found for manage_folders_subtitle (7702199674083260433) -->
+    <skip />
+    <!-- no translation found for menu_folder_options (8897520487430647932) -->
+    <skip />
     <string name="menu_done" msgid="5791134842152855128">"Kwenziwe"</string>
     <string name="menu_account_settings" msgid="8230989362863431918">"Izilungiselelo ze-akhawunti"</string>
     <string name="menu_settings" msgid="6007027046949837282">"Izilungiselelo"</string>
@@ -127,7 +132,8 @@
     <string name="sending" msgid="8214361929125649771">"Iyathumela..."</string>
     <string name="send_failed" msgid="750908595144529579">"Umlayezo awuthunyelwanga."</string>
     <string name="me" msgid="6480762904022198669">"mina"</string>
-    <string name="labels" msgid="1519770547536283663">"Amalebuli"</string>
+    <!-- no translation found for folders (3359679829905256429) -->
+    <skip />
     <string name="show_all_folders" msgid="3281420732307737553">"Bonisa onke amafolda"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Susa le ngxoxo?"</item>
@@ -207,9 +213,11 @@
     <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>
+    <!-- no translation found for folderMode (553052020619895714) -->
+    <skip />
     <string name="search_results_searching_header" msgid="3821361153909466819">"Iyasesha..."</string>
-    <string name="recent_labels" msgid="5539494776429934547">"Okwakamuva"</string>
+    <!-- no translation found for recent_folders (8240081561436891330) -->
+    <skip />
     <string name="expand_recipient_details" msgid="2266544827446346880">"Nweba imininigwane yomtholi"</string>
     <string name="collapse_recipient_details" msgid="3608892454869745927">"Goqa imininingwane yomtholi"</string>
     <string name="contact_info_string" msgid="6911322458329265644">"Khombisa imininingwane yokuxhumana ka-<xliff:g id="NAME">%1$s</xliff:g>"</string>

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index d1bdb6d..bba426d 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java

@@ -476,11 +476,6 @@
         // TODO(viki): Auto-generated method stub
     }
 
-    @Override
-    public void reloadSearch(String string) {
-        // TODO(viki): Auto-generated method stub
-    }
-
     /**
      * @param savedState
      */
@@ -546,16 +541,6 @@
     }
 
     @Override
-    public void startActionBarStatusCursorLoader(String account) {
-        // TODO(viki): Auto-generated method stub
-    }
-
-    @Override
-    public void stopActionBarStatusCursorLoader(String account) {
-        // TODO(viki): Auto-generated method stub
-    }
-
-    @Override
     public void toggleStar(boolean toggleOn, long conversationId, long maxMessageId) {
         // TODO(viki): Auto-generated method stub
     }

diff --git a/src/com/android/mail/ui/ActionBarView.java b/src/com/android/mail/ui/ActionBarView.java
index 30beac0..d5eaffb 100644
--- a/src/com/android/mail/ui/ActionBarView.java
+++ b/src/com/android/mail/ui/ActionBarView.java

@@ -50,44 +50,9 @@
  */
 public final class ActionBarView extends LinearLayout implements OnNavigationListener,
         ViewMode.ModeChangeListener, OnQueryTextListener {
-    /**
-     * This interface is used to send notifications back to the calling
-     * activity. MenuHandler takes care of updating the provider, so this
-     * interface should be used for notification purposes only (such as updating
-     * the UI).
-     */
-    // TODO(viki): This callback is currently unused and may be entirely unnecessary in the new
-    // code, where the Actionbar is switched into navigation mode, relying on the framework for most
-    // heavy lifting. Also, we can switch ViewMode to the appropriate mode and rely on all UI
-    // components updating through ViewMode change listeners.
-    public interface Callback {
-        /**
-         * Returns the current account.
-         */
-        Account getCurrentAccount();
-
-        /**
-         * Called when the TwoPaneActionBar wants to get the current conversation list context.
-         */
-        ConversationListContext getCurrentListContext();
-
-        /**
-         * Invoked when the user is already viewing search results
-         * and enters a new query.
-         * @param string Query
-         */
-        void reloadSearch(String string);
-
-        void showFolderList();
-
-        void startActionBarStatusCursorLoader(String account);
-
-        void stopActionBarStatusCursorLoader(String account);
-    }
-
     private ActionBar mActionBar;
     private RestrictedActivity mActivity;
-    private ActivityController mCallback;
+    private ActivityController mController;
     private View mFolderView;
     /**
      * The current mode of the ActionBar. This references constants in {@link ViewMode}
@@ -178,7 +143,7 @@
     public void initialize(RestrictedActivity activity, ActivityController callback,
             ViewMode viewMode, ActionBar actionBar) {
         mActionBar = actionBar;
-        mCallback = callback;
+        mController = callback;
         mActivity = activity;
 
         mSpinner = new AccountSpinnerAdapter(getContext());
@@ -188,7 +153,7 @@
     }
 
     public void setAccounts(Account[] accounts) {
-        Account currentAccount = mCallback.getCurrentAccount();
+        Account currentAccount = mController.getCurrentAccount();
         mSpinner.setAccounts(accounts);
         mSpinner.setCurrentAccount(currentAccount);
         int position = -1;
@@ -230,12 +195,12 @@
                 // Get the capabilities associated with this account.
                 final Object item = mSpinner.getItem(position);
                 assert (item instanceof Account);
-                mCallback.onAccountChanged((Account) mSpinner.getItem(position));
+                mController.onAccountChanged((Account) mSpinner.getItem(position));
                 break;
             case AccountSpinnerAdapter.TYPE_FOLDER:
                 final Object folder = mSpinner.getItem(position);
                 assert (folder instanceof Folder);
-                mCallback.onFolderChanged((Folder) folder);
+                mController.onFolderChanged((Folder) folder);
                 break;
         }
         return false;
@@ -247,11 +212,7 @@
     public void onResume() {
     }
 
-    public void onStatusResult(String account, int status) {
-        // Update the inbox folder if required
-        mCallback.stopActionBarStatusCursorLoader(account);
-    }
-
+    @Override
     public void onViewModeChanged(int newMode) {
         mMode = newMode;
         // Always update the options menu and redraw. This will read the new mode and redraw
@@ -332,7 +293,7 @@
     private void setPopulatedSearchView() {
         if (mSearch != null) {
             mSearch.expandActionView();
-            ConversationListContext context = mCallback.getCurrentListContext();
+            ConversationListContext context = mController.getCurrentListContext();
             if (context != null) {
                 mSearchWidget.setQuery(context.searchQuery, false);
             }

diff --git a/src/com/android/mail/ui/ActivityController.java b/src/com/android/mail/ui/ActivityController.java
index e024bd9..b9f13fa 100644
--- a/src/com/android/mail/ui/ActivityController.java
+++ b/src/com/android/mail/ui/ActivityController.java

@@ -29,6 +29,7 @@
 
 import com.android.mail.ConversationListContext;
 import com.android.mail.browse.ConversationItemView.StarHandler;
+import com.android.mail.providers.Account;
 import com.android.mail.providers.Conversation;
 import com.android.mail.providers.Settings;
 import com.android.mail.ui.ViewMode.ModeChangeListener;
@@ -39,7 +40,7 @@
  * or respond to user action.
  */
 public interface ActivityController extends MenuCallback, LayoutListener, SubjectDisplayChanger,
-        ModeChangeListener, ActionBarView.Callback, StarHandler, ConversationListCallbacks,
+        ModeChangeListener, StarHandler, ConversationListCallbacks,
         FolderChangeListener, AccountChangeListener, LoaderManager.LoaderCallbacks<Cursor> {
 
     // As far as possible, the methods here that correspond to Activity lifecycle have the same name
@@ -72,6 +73,16 @@
     void attachConversationView(ConversationViewFragment conversationViewFragment);
 
     /**
+     * Returns the current account.
+     */
+    Account getCurrentAccount();
+
+    /**
+     * Returns the current conversation list context.
+     */
+    ConversationListContext getCurrentListContext();
+
+    /**
      * Return the current mode the activity is in. Values need to be matched against constants in
      * {@link ViewMode}.
      * @return
@@ -226,7 +237,6 @@
     /**
      * Show the folder list associated with the currently selected account.
      */
-    @Override
     void showFolderList();
 
     /**
commit	ba6de4171d8baaa7b0804d31134977cb1d4faa9d	[log] [tgz]
author	Mindy Pereira <mindyp@google.com>	Fri Mar 09 11:26:58 2012 -0800
committer	Android (Google) Code Review <android-gerrit@google.com>	Fri Mar 09 11:26:58 2012 -0800
tree	495ba8330537628b326c6c53cfead5120303f339
parent	efee8c0723a25ba5162d67fc25d6b0b800d69a82 [diff]
parent	5907460fa269cfb3e8b8f8cf244aa1feaf76174a [diff]