Import translations. DO NOT MERGE

Change-Id: I70b28e94485a5895c97f8dd76a9f1586bb1669df
Auto-generated-cl: translation import

97 files changed, 140 insertions, 104 deletions

diff --git a/res/values-af-sw600dp/strings.xml b/res/values-af-sw600dp/strings.xml
index 0fb1d9982..cb96dc159 100644
--- a/res/values-af-sw600dp/strings.xml
+++ b/res/values-af-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Bestuur etikette"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Bestuur vouers"</string>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c7a421056..da2ffe239 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Stuur aan"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skryf"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Verander vouers"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Bestuur vouers"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Vouerinstellings"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Vouers"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sinkroniseer en stel in kennis"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Vouerinstellings"</string>
diff --git a/res/values-am-sw600dp/strings.xml b/res/values-am-sw600dp/strings.xml
index 06b57aff8..06c6cc676 100644
--- a/res/values-am-sw600dp/strings.xml
+++ b/res/values-am-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ ካርቦን ቅጂ/ስውር ቅጂ"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ ስውር ቅጂ"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"የመለያ ስሞችን አቀናብር"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"አቃፊዎችን አስተዳድር"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c5ab4ce07..5bbd6e603 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"አስተላልፍ"</string>
     <string name="menu_compose" msgid="6274193058224230645">"አዲስ ጻፍ"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"አቃፊዎችን ቀይር"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"አቃፊዎች አቀናብር"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"የአቃፊ ቅንብሮች"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"አቃፊዎች"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"አመሳስልና አሳውቅ"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"የአቃፊ ቅንብሮች"</string>
diff --git a/res/values-ar-sw600dp/strings.xml b/res/values-ar-sw600dp/strings.xml
index 2f1fcac75..92f4d9dd4 100644
--- a/res/values-ar-sw600dp/strings.xml
+++ b/res/values-ar-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ نسخة إلى/ مخفية"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ نسخة مخفية الوجهة"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"إدارة التصنيفات"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"إدارة المجلدات"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 22b2716af..718ba4885 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"إعادة توجيه"</string>
     <string name="menu_compose" msgid="6274193058224230645">"إنشاء"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"تغيير المجلدات"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"إدارة المجلدات"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"إعدادات المجلدات"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"المجلدات"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"المزامنة والإشعارات"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"إعدادات المجلد"</string>
diff --git a/res/values-be-sw600dp/strings.xml b/res/values-be-sw600dp/strings.xml
index 492ea67e3..9464eaa94 100644
--- a/res/values-be-sw600dp/strings.xml
+++ b/res/values-be-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Копія/УК"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ схаваная копія"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Кіраванне цэтлікамі"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Кiраванне тэчкамі"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index ba1b8b8dc..92ef3ffbe 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Пераслаць"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Напісаць"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Змена тэчкі"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Кіраванне тэчкамi"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Налады тэчкi"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Тэчкі"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Сінхранізацыя і апавяшчэнне"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Налады тэчак"</string>
diff --git a/res/values-bg-sw600dp/strings.xml b/res/values-bg-sw600dp/strings.xml
index 8601ff27c..3407ca8c9 100644
--- a/res/values-bg-sw600dp/strings.xml
+++ b/res/values-bg-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Як/Ск"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Ск"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Управление на етикетите"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0d95388a3..ffba7b234 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Препращане"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Ново съобщение"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Промяна на папките"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Управление на папките"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Синхронизиране и известяване"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Настройки за папката"</string>
diff --git a/res/values-ca-sw600dp/strings.xml b/res/values-ca-sw600dp/strings.xml
index 305512b5e..7836c54a3 100644
--- a/res/values-ca-sw600dp/strings.xml
+++ b/res/values-ca-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cco"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Cco"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Gestiona les etiquetes"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Gestiona les carpetes"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 17f7d47f3..caf4417cc 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Reenvia"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Redacta"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Canvia les carpetes"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Gestiona les carpetes"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Configuració de la carpeta"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Carpetes"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sincronitza i notifica"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Configuració de la carpeta"</string>
diff --git a/res/values-cs-sw600dp/strings.xml b/res/values-cs-sw600dp/strings.xml
index 3f3a43990..c6df3f3c3 100644
--- a/res/values-cs-sw600dp/strings.xml
+++ b/res/values-cs-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopie/skrytá"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Skrytá kopie"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Správa štítků"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Správa složek"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c451f3667..a8a2df1cb 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Přeposlat"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Nová zpráva"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Změnit složky"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Správa složek"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Nastavení složek"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Složky"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synchronizace a upozornění"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Nastavení složek"</string>
diff --git a/res/values-da-sw600dp/strings.xml b/res/values-da-sw600dp/strings.xml
index 4ea604603..501443ba3 100644
--- a/res/values-da-sw600dp/strings.xml
+++ b/res/values-da-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Administrer etiketter"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Administrer mapper"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2e42bc194..d39b3e74c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Videresend"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Skift mapper"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Administrer mapper"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Indstillinger for mapper"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mapper"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synkroniser og underret"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Indstillinger for mapper"</string>
diff --git a/res/values-de-sw600dp/strings.xml b/res/values-de-sw600dp/strings.xml
index ec5cd75c1..9329ebc7c 100644
--- a/res/values-de-sw600dp/strings.xml
+++ b/res/values-de-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Labels verwalten"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Ordner verwalten"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 949821e16..449280626 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Weiterleiten"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Schreiben"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Ordner ändern"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Ordner verwalten"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Ordnereinstellungen"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Ordner"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synchron. &amp;  benachrichtigen"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Ordnereinstellungen"</string>
diff --git a/res/values-el-sw600dp/strings.xml b/res/values-el-sw600dp/strings.xml
index 5612412d9..b21bd68d4 100644
--- a/res/values-el-sw600dp/strings.xml
+++ b/res/values-el-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Κοιν./Κρ.κοιν."</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Κρυφή κοιν."</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Διαχείριση ετικετών"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Διαχείριση φακέλων"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 36f7e7059..a66e94a20 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Προώθηση"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Σύνταξη"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Αλλαγή φακέλων"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Διαχείριση φακέλων"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Ρυθμίσεις φακέλων"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Φάκελοι"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Συγχρονισμός και ειδοποίηση"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Ρυθμίσεις φακέλου..."</string>
diff --git a/res/values-en-rGB-sw600dp/strings.xml b/res/values-en-rGB-sw600dp/strings.xml
index a5b5a98dd..106589b56 100644
--- a/res/values-en-rGB-sw600dp/strings.xml
+++ b/res/values-en-rGB-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Manage labels"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Manage folders"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f58dc1b5a..836f00696 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Forward"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Compose"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Change folders"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Manage folders"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Folder settings"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Folders"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sync &amp; notify"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Folder settings"</string>
diff --git a/res/values-es-rUS-sw600dp/strings.xml b/res/values-es-rUS-sw600dp/strings.xml
index 946cf1db5..30a8d51dd 100644
--- a/res/values-es-rUS-sw600dp/strings.xml
+++ b/res/values-es-rUS-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ CC/CCO"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ CCO"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Administrar etiquetas"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 13261e5d9..d79ffbfec 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Reenviar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Redactar"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Cambiar carpetas"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Administrar carpetas"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Carpetas"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sincronizar y notificar"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Configuración de la carpeta"</string>
diff --git a/res/values-es-sw600dp/strings.xml b/res/values-es-sw600dp/strings.xml
index 946cf1db5..3f578aaea 100644
--- a/res/values-es-sw600dp/strings.xml
+++ b/res/values-es-sw600dp/strings.xml
@@ -18,7 +18,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="add_cc_label" msgid="6156834609108442458">"+ CC/CCO"</string>
-    <string name="add_bcc_label" msgid="7648769906379235693">"+ CCO"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Administrar etiquetas"</string>
+    <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cco"</string>
+    <string name="add_bcc_label" msgid="7648769906379235693">"+ Cco"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Administrar carpetas"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6a5bb0d4a..c24fb6929 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -20,7 +20,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="to" msgid="4392614766835725698">"Para"</string>
     <string name="cc" msgid="7017720927911078193">"CC"</string>
-    <string name="bcc" msgid="3098643138241111579">"CCO"</string>
+    <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>
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Reenviar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Redactar"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Cambiar carpetas"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Administrar carpetas"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Ajustes de carpeta"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Carpetas"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sincronizar y notificar"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Ajustes de carpeta"</string>
@@ -83,8 +83,8 @@
     <string name="older" msgid="6651690916337202936">"Anterior"</string>
     <string name="mark_important" msgid="6904096897104265870">"Marcar como importante"</string>
     <string name="mark_not_important" msgid="4550967327747977068">"Marcar como no importante"</string>
-    <string name="add_cc_label" msgid="504861315425773180">"Añadir CC/CCO"</string>
-    <string name="add_bcc_label" msgid="7432027645493843336">"Añadir CCO"</string>
+    <string name="add_cc_label" msgid="504861315425773180">"Añadir Cc/Cco"</string>
+    <string name="add_bcc_label" msgid="7432027645493843336">"Añadir Cco"</string>
     <string name="feedback" msgid="79365993169715049">"Enviar comentarios"</string>
     <string name="help_and_info" msgid="7873089811705257882">"Ayuda"</string>
     <string name="quoted_text" msgid="7250749398672037355">"Incluir texto citado"</string>
@@ -253,7 +253,7 @@
     <string name="replyto_heading" msgid="2081358811894701297">"Responder a:"</string>
     <string name="to_heading" msgid="3219994961726691756">"Para:"</string>
     <string name="cc_heading" msgid="8116221732072085180">"CC:"</string>
-    <string name="bcc_heading" msgid="5528824453033598299">"CCO:"</string>
+    <string name="bcc_heading" msgid="5528824453033598299">"Cco:"</string>
     <string name="show_images" msgid="1875700481186331432">"Mostrar imágenes"</string>
     <string name="always_show_images" msgid="5966408990164581801">"Mostrar siempre imágenes de este remitente"</string>
     <string name="always_show_images_toast" msgid="6218061921546973716">"Las imágenes de este remitente se mostrarán automáticamente."</string>
diff --git a/res/values-et-sw600dp/strings.xml b/res/values-et-sw600dp/strings.xml
index 01d687fa2..e31324951 100644
--- a/res/values-et-sw600dp/strings.xml
+++ b/res/values-et-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ koopia/pimekoopia"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ pimekoopia"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Halda silte"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Halda kaustu"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 6aef8ba24..7f997c45f 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Edasta"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Koosta"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Muuda kaustu"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Halda kaustu"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Kausta seaded"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Kaustad"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sünkroonimine ja teavitamine"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Kausta seaded"</string>
diff --git a/res/values-fa-sw600dp/strings.xml b/res/values-fa-sw600dp/strings.xml
index 0a39c8b92..b17a54aa9 100644
--- a/res/values-fa-sw600dp/strings.xml
+++ b/res/values-fa-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ گیرنده کپی/گیرنده مخفی"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ گیرنده مخفی"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"مدیریت برچسب‌ها"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6c2d2d6f7..3389a7d18 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"باز ارسال"</string>
     <string name="menu_compose" msgid="6274193058224230645">"نوشتن نامه"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"تغییر پوشه‌ها"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"مدیریت پوشه‌ها"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"پوشه‌ها"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"همگام‌سازی و اعلان"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"تنظیمات پوشه"</string>
diff --git a/res/values-fi-sw600dp/strings.xml b/res/values-fi-sw600dp/strings.xml
index 4e5af7b00..a9f823aa5 100644
--- a/res/values-fi-sw600dp/strings.xml
+++ b/res/values-fi-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopio/piilokopio"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Piilokopio"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Hallinnoi tunnisteita"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Hallinnoi kansioita"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index cb5851854..00f253144 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Lähetä edelleen"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Viestin kirjoitus"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Vaihda kansiota"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Kansioiden hallinta"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Kansion asetukset"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Kansiot"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synkronoi ja ilmoita"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Kansion asetukset..."</string>
diff --git a/res/values-fr-sw600dp/strings.xml b/res/values-fr-sw600dp/strings.xml
index 99e112af1..5d13a8d07 100644
--- a/res/values-fr-sw600dp/strings.xml
+++ b/res/values-fr-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cci"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Cci"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Gérer les libellés"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Gérer les dossiers"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index af1c06c4d..425c731e3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Transférer"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Nouveau message"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Modifier les dossiers"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Gérer les dossiers"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Paramètres des dossiers"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Dossiers"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synchroniser et signaler"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Paramètres du dossier"</string>
diff --git a/res/values-hi-sw600dp/strings.xml b/res/values-hi-sw600dp/strings.xml
index fb5438a2d..101ab742e 100644
--- a/res/values-hi-sw600dp/strings.xml
+++ b/res/values-hi-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"Cc/Bcc जोड़ें"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"Bcc जोड़ें"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"लेबल प्रबंधित करें"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index ac6fcb9af..4f67f7dd4 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"अग्रेषित करें"</string>
     <string name="menu_compose" msgid="6274193058224230645">"लिखें"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"फ़ोल्डर परिवर्तित करें"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"फ़ोल्‍डर प्रबंधित करें"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"फ़ोल्डर"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"समन्वयित करें और सूचित करें"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"फ़ोल्डर सेटिंग"</string>
diff --git a/res/values-hr-sw600dp/strings.xml b/res/values-hr-sw600dp/strings.xml
index 276af1dfe..0e2a9aaf6 100644
--- a/res/values-hr-sw600dp/strings.xml
+++ b/res/values-hr-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopija/skriv. kop."</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Skrivena kopija"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Upravljanje oznakama"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Upravljanje mapama"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 188ad8499..e1e00698c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Dalje"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Nova poruka"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Promjena mapa"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Upravljanje mapama"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Postavke mapa"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mape"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sinkroniziraj i obavijesti"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Postavke mape"</string>
diff --git a/res/values-hu-sw600dp/strings.xml b/res/values-hu-sw600dp/strings.xml
index 778d2d7a0..baa35533d 100644
--- a/res/values-hu-sw600dp/strings.xml
+++ b/res/values-hu-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Másolatmezők"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Titkos másolat"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Címkék kezelése"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Mappák kezelése"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 31c42a00c..00911ee94 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -69,7 +69,7 @@
     <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_folders" msgid="1542713666608888717">"Mappaváltás"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Mappák kezelése"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Mappabeállítások"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mappák"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Szinkronizálás és értesítés"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Mappabeállítások"</string>
diff --git a/res/values-in-sw600dp/strings.xml b/res/values-in-sw600dp/strings.xml
index 98647125a..d47205f00 100644
--- a/res/values-in-sw600dp/strings.xml
+++ b/res/values-in-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Kelola label"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Kelola folder"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 710062124..e66a8251e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Teruskan"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Tulis"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Ganti folder"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Kelola folder"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Setelan folder"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Folder"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sinkronkan &amp; beri tahu"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Setelan folder"</string>
diff --git a/res/values-it-sw600dp/strings.xml b/res/values-it-sw600dp/strings.xml
index 5644ffe55..d26b1b693 100644
--- a/res/values-it-sw600dp/strings.xml
+++ b/res/values-it-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Ccn"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Ccn"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Gestisci etichette"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Gestisci cartelle"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b7d266e54..ef5ef702d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Inoltra"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Scrivi"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Cambia cartelle"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Gestisci cartelle"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Impostazioni cartella"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Cartelle"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sincronizza e notifica"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Impostazioni cartella"</string>
diff --git a/res/values-iw-sw600dp/strings.xml b/res/values-iw-sw600dp/strings.xml
index 807a87b29..59cc741fe 100644
--- a/res/values-iw-sw600dp/strings.xml
+++ b/res/values-iw-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ עותק/עותק מוסתר"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ עותק מוסתר"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"ניהול תוויות"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"ניהול תיקיות"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 50c1a6cb6..8b6c88f9d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"העבר"</string>
     <string name="menu_compose" msgid="6274193058224230645">"כתוב"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"שנה תיקיות"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"ניהול תיקיות"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"הגדרות תיקיה"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"תיקיות"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"סנכרן ושלח התראה"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"הגדרות תיקיה"</string>
diff --git a/res/values-ja-sw600dp/strings.xml b/res/values-ja-sw600dp/strings.xml
index c2ed25abf..0f03cd6f2 100644
--- a/res/values-ja-sw600dp/strings.xml
+++ b/res/values-ja-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"Cc/Bccを追加"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"Bccを追加"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"ラベルを管理"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c171a372e..4e58e4c0d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"転送"</string>
     <string name="menu_compose" msgid="6274193058224230645">"作成"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"フォルダを変更"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"フォルダを管理"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"フォルダ"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"同期と通知"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"フォルダの設定"</string>
diff --git a/res/values-ko-sw600dp/strings.xml b/res/values-ko-sw600dp/strings.xml
index 2e8f065e5..eadb5d13d 100644
--- a/res/values-ko-sw600dp/strings.xml
+++ b/res/values-ko-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ 참조/숨은참조"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ 숨은참조"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"라벨 관리"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 081f2262c..da669e36c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"전달"</string>
     <string name="menu_compose" msgid="6274193058224230645">"편지쓰기"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"폴더 변경"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"폴더 관리"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"폴더"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"동기화 및 알림"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"폴더 설정"</string>
diff --git a/res/values-lt-sw600dp/strings.xml b/res/values-lt-sw600dp/strings.xml
index 97e0d79d2..8cff8f584 100644
--- a/res/values-lt-sw600dp/strings.xml
+++ b/res/values-lt-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ kop. / nemat. kop."</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ nematomoji kopija"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Tvarkyti etiketes"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Tvarkyti aplankus"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d9e871d6a..395318690 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Persiųsti"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Sukurti"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Keisti aplankus"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Tvarkyti aplankus"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Aplankų nustatymai"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Aplankai"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sinchronizuoti ir pranešti"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Aplankų nustatymai"</string>
diff --git a/res/values-lv-sw600dp/strings.xml b/res/values-lv-sw600dp/strings.xml
index c9b970fac..ff1294d76 100644
--- a/res/values-lv-sw600dp/strings.xml
+++ b/res/values-lv-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopija/diskr. kop."</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Diskrētā kopija"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Pārvaldīt iezīmes"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Pārvaldīt mapes"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9cc97e3aa..4df07d7be 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Pārsūtīt"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Rakstīt"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Mainīt mapes"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Pārvaldīt mapes"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Mapju iestatījumi"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mapes"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sinhronizācija un paziņojumi"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Mapes iestatījumi"</string>
diff --git a/res/values-ms-sw600dp/strings.xml b/res/values-ms-sw600dp/strings.xml
index 2fbd19cd7..4498c8902 100644
--- a/res/values-ms-sw600dp/strings.xml
+++ b/res/values-ms-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Sk/Skt"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Skt"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Urus label"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c9b019e7e..61d32222a 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Kirim semula"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Karang"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Tukar folder"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Urus folder"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Folder"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Segerakkan &amp; beritahu"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Tetapan folder"</string>
diff --git a/res/values-nb-sw600dp/strings.xml b/res/values-nb-sw600dp/strings.xml
index 272e2eaf5..3a1123f81 100644
--- a/res/values-nb-sw600dp/strings.xml
+++ b/res/values-nb-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopi/blindkopi"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Blindkopi"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Administrer etiketter"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Administrer mapper"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d5e3cc6d7..f4b501c4b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Videresend"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv ny"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Endre mapper"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Administrer mapper"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Mappeinnstillinger"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mapper"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synkronisering og varsler"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Mappeinnstillinger"</string>
diff --git a/res/values-nl-sw600dp/strings.xml b/res/values-nl-sw600dp/strings.xml
index dd466341d..00b23ba6a 100644
--- a/res/values-nl-sw600dp/strings.xml
+++ b/res/values-nl-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Labels beheren"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Mappen beheren"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index fc76c64a6..c28e0bb8a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Doorsturen"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Opstellen"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Mappen wijzigen"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Mappen beheren"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Mapinstellingen"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mappen"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synchroniseren en melden"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Mapinstellingen"</string>
diff --git a/res/values-pl-sw600dp/strings.xml b/res/values-pl-sw600dp/strings.xml
index 583b4d85b..e1aff5c81 100644
--- a/res/values-pl-sw600dp/strings.xml
+++ b/res/values-pl-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ DW/UDW"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ UDW"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Zarządzaj etykietami"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Zarządzaj folderami"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 12476a180..e363d0de0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Przekaż dalej"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Utwórz"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Zmień foldery"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Zarządzaj folderami"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Ustawienia folderów"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Foldery"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synchronizuj i powiadamiaj"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Ustawienia folderu"</string>
diff --git a/res/values-pt-rPT-sw600dp/strings.xml b/res/values-pt-rPT-sw600dp/strings.xml
index 18100a945..18c66009f 100644
--- a/res/values-pt-rPT-sw600dp/strings.xml
+++ b/res/values-pt-rPT-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Gerir etiquetas"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b12f9db1b..00857ed9a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Encaminhar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Compor"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Alterar pastas"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Gerir pastas"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Pastas"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sincronizar e notificar"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Definições da pasta"</string>
diff --git a/res/values-pt-sw600dp/strings.xml b/res/values-pt-sw600dp/strings.xml
index 71790938e..162287b50 100644
--- a/res/values-pt-sw600dp/strings.xml
+++ b/res/values-pt-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cco"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Cco"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Gerenciar marcadores"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4f1d4b39b..eb26fed23 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Encaminhar"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Escrever"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Alterar pastas"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Gerenciar pastas"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Pastas"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sincronizar e notificar"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Configurações da pasta"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index dff698a31..5a6f7fa93 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -113,7 +113,7 @@
     <skip />
     <!-- no translation found for menu_change_folders (1542713666608888717) -->
     <skip />
-    <!-- no translation found for menu_manage_folders (7499103037978814445) -->
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
     <skip />
     <!-- no translation found for folder_list_title (4276644062440415214) -->
     <skip />
diff --git a/res/values-ro-sw600dp/strings.xml b/res/values-ro-sw600dp/strings.xml
index ec22d631b..18c66009f 100644
--- a/res/values-ro-sw600dp/strings.xml
+++ b/res/values-ro-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Gestionaţi etichetele"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 9222486c1..f2662b770 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Redirecţionaţi"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Scrieţi"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Modificaţi dosarele"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Gestionaţi dosarele"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Dosare"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sincronizare şi notificare"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Setări pentru dosar"</string>
diff --git a/res/values-ru-sw600dp/strings.xml b/res/values-ru-sw600dp/strings.xml
index 2a13b481c..76323a0e7 100644
--- a/res/values-ru-sw600dp/strings.xml
+++ b/res/values-ru-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"Копия"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"Скрытая копия"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Управление ярлыками"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e6129258c..9c4403b82 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Переслать"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Написать"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Изменить папки"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Управление папками"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Синхронизация и уведомления"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Настройки папки"</string>
diff --git a/res/values-sk-sw600dp/strings.xml b/res/values-sk-sw600dp/strings.xml
index 1f4eaa3a4..a72346791 100644
--- a/res/values-sk-sw600dp/strings.xml
+++ b/res/values-sk-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ kópia/skr.kópia"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ skrytá kópia"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Spravovať menovky"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 88b1a4a38..30bd39d4c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Poslať ďalej"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Napísať správu"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Zmeniť priečinky"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Správa priečinkov"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Priečinky"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synchronizovať a upozorniť"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Nastavenia priečinka"</string>
diff --git a/res/values-sl-sw600dp/strings.xml b/res/values-sl-sw600dp/strings.xml
index 7ce7d284a..57dabcd5e 100644
--- a/res/values-sl-sw600dp/strings.xml
+++ b/res/values-sl-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kp/Skp"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Skp"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Upravljanje oznak"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Upravljanje map"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e95740136..21da7b569 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -57,7 +57,7 @@
     <string name="remove_star" msgid="4372327933122106128">"Odstrani zvezdico"</string>
     <string name="archive" msgid="847250094775910499">"Arhiviraj"</string>
     <string name="report_spam" msgid="6467567747975393907">"Prijavite neželeno vsebino"</string>
-    <string name="mark_not_spam" msgid="694891665407228160">"Poročilo ni vsiljena pošta"</string>
+    <string name="mark_not_spam" msgid="694891665407228160">"Ni vsiljena pošta"</string>
     <string name="report_phishing" msgid="5714205737453138338">"Prijavi lažno predstavljanje"</string>
     <string name="delete" msgid="844871204175957681">"Izbriši"</string>
     <string name="next" msgid="4674401197968248302">"Starejše"</string>
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Posreduj"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Novo"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Spremenite mape"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Upravljanje map"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Nastavitve mape"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mape"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Sinhronizacija in obveščanje"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Nastavitve mape"</string>
diff --git a/res/values-sr-sw600dp/strings.xml b/res/values-sr-sw600dp/strings.xml
index 4609e54bb..79c112938 100644
--- a/res/values-sr-sw600dp/strings.xml
+++ b/res/values-sr-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Управљај ознакама"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Управљај директоријумима"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 719c786f0..8a8ecdcad 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Проследи"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Нова порука"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Промени директоријуме"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Управљај директоријумима"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Подешавања директоријума"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Директоријуми"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Синхронизовање и обавештавање"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Подешавања директоријума"</string>
diff --git a/res/values-sv-sw600dp/strings.xml b/res/values-sv-sw600dp/strings.xml
index 5e3208b71..14ee2da28 100644
--- a/res/values-sv-sw600dp/strings.xml
+++ b/res/values-sv-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+kopia/heml kop"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Hemlig kopia"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Hantera etiketter"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Hantera mappar"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bd5f7080d..315f0d368 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Vidarebefordra"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Skriv"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Byt mapp"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Hantera mappar"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Mappinställningar"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mappar"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Synka och meddela"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Mappinställningar"</string>
diff --git a/res/values-sw-sw600dp/strings.xml b/res/values-sw-sw600dp/strings.xml
index d9c96f7b0..6a2953c07 100644
--- a/res/values-sw-sw600dp/strings.xml
+++ b/res/values-sw-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Nakala kwa/Nakala fiche kwa"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Nakala fiche kwa"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Dhibiti lebo"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Dhibiti folda"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index bae3b3fe5..eaad2c45c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Sambaza"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Tunga"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Badilisha folda"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Dhibiti folda"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Mipangilio ya folda"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Folda"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Landanisha na arifu"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Mipangilio ya folda"</string>
diff --git a/res/values-th-sw600dp/strings.xml b/res/values-th-sw600dp/strings.xml
index ae65b8bae..3e3ccace0 100644
--- a/res/values-th-sw600dp/strings.xml
+++ b/res/values-th-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ สำเนา/สำเนาลับ"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ สำเนาลับ"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"จัดการป้ายกำกับ"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 460b6f368..090866b48 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"ส่งต่อ"</string>
     <string name="menu_compose" msgid="6274193058224230645">"เขียน"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"เปลี่ยนโฟลเดอร์"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"จัดการโฟลเดอร์"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"โฟลเดอร์"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"ซิงค์และแจ้งเตือน"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"การตั้งค่าโฟลเดอร์"</string>
diff --git a/res/values-tl-sw600dp/strings.xml b/res/values-tl-sw600dp/strings.xml
index 839b35241..18c66009f 100644
--- a/res/values-tl-sw600dp/strings.xml
+++ b/res/values-tl-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Pamahalaan ang mga label"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 19e0782f0..2740ab927 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Ipasa"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Bumuo"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Baguhin ang mga folder"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Pamahalaan ang mga folder"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Mga Folder"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"I-sync at i-notify"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Mga setting ng folder"</string>
diff --git a/res/values-tr-sw600dp/strings.xml b/res/values-tr-sw600dp/strings.xml
index 6d98ef530..18c66009f 100644
--- a/res/values-tr-sw600dp/strings.xml
+++ b/res/values-tr-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Etiketleri yönet"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 70b28462c..9d028bf9f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Yönlendir"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Oluştur"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Klasörleri değiştir"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Klasörleri yönet"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Klasörler"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Senkronize et ve bildir"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Klasör ayarları"</string>
diff --git a/res/values-uk-sw600dp/strings.xml b/res/values-uk-sw600dp/strings.xml
index 021292379..3e3881380 100644
--- a/res/values-uk-sw600dp/strings.xml
+++ b/res/values-uk-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Копія/прихована"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Прихована копія"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Керувати мітками"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Керувати папками"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b6fd6cbfd..1aba02022 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Переслати"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Написати"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Змінити папки"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Керувати папками"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Налаштування папки"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Синхронізація та сповіщення"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Налаштування папки"</string>
diff --git a/res/values-vi-sw600dp/strings.xml b/res/values-vi-sw600dp/strings.xml
index 0c7e3da83..18c66009f 100644
--- a/res/values-vi-sw600dp/strings.xml
+++ b/res/values-vi-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Quản lý nhãn"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d1dc6edb3..d43f5855f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"Chuyển tiếp"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Soạn thư"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Thay đổi thư mục"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Quản lý thư mục"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"Thư mục"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Đồng bộ hóa và thông báo"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Cài đặt thư mục"</string>
diff --git a/res/values-zh-rCN-sw600dp/strings.xml b/res/values-zh-rCN-sw600dp/strings.xml
index 2f7c4dca0..ac9996d90 100644
--- a/res/values-zh-rCN-sw600dp/strings.xml
+++ b/res/values-zh-rCN-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ 抄送/密送"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ 密送"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"管理标签"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b53041069..505a6227b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"转发"</string>
     <string name="menu_compose" msgid="6274193058224230645">"写邮件"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"更改文件夹"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"管理文件夹"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"文件夹"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"同步与通知"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"文件夹设置"</string>
diff --git a/res/values-zh-rTW-sw600dp/strings.xml b/res/values-zh-rTW-sw600dp/strings.xml
index 927dc092b..ed515db36 100644
--- a/res/values-zh-rTW-sw600dp/strings.xml
+++ b/res/values-zh-rTW-sw600dp/strings.xml
@@ -20,5 +20,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"新增副本/密件副本"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"新增密件副本"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"管理標籤"</string>
+    <!-- no translation found for menu_manage_folders (7574962882483466700) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a78996d05..2b2ea6776 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -69,7 +69,8 @@
     <string name="forward" msgid="6822914459902983767">"轉寄"</string>
     <string name="menu_compose" msgid="6274193058224230645">"撰寫"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"變更資料夾"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"管理資料夾"</string>
+    <!-- no translation found for menu_manage_folders (6755623004628177492) -->
+    <skip />
     <string name="folder_list_title" msgid="4276644062440415214">"資料夾"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"同步處理並通知"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"資料夾設定"</string>
diff --git a/res/values-zu-sw600dp/strings.xml b/res/values-zu-sw600dp/strings.xml
index 1b0d5b7ca..cc04e6421 100644
--- a/res/values-zu-sw600dp/strings.xml
+++ b/res/values-zu-sw600dp/strings.xml
@@ -20,5 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
-    <string name="menu_label_options" msgid="501791283402303675">"Lawula amalebuli"</string>
+    <string name="menu_manage_folders" msgid="7574962882483466700">"Phatha amafolda"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index b3f591373..d858c472c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -69,7 +69,7 @@
     <string name="forward" msgid="6822914459902983767">"Dlulisela"</string>
     <string name="menu_compose" msgid="6274193058224230645">"Bhala"</string>
     <string name="menu_change_folders" msgid="1542713666608888717">"Shintsha amafolda"</string>
-    <string name="menu_manage_folders" msgid="7499103037978814445">"Phatha amafolda"</string>
+    <string name="menu_manage_folders" msgid="6755623004628177492">"Izilungiselelo zefolda"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Amafolda"</string>
     <string name="manage_folders_subtitle" msgid="7702199674083260433">"Ukuvumelanisa  &amp; ukuqaphelisa"</string>
     <string name="menu_folder_options" msgid="8897520487430647932">"Izilungiselelo zefolda"</string>