diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 892bbab1a6..1243b177a1 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Kimliklər</string>
     <string name="title_edit_account">Hesaba düzəliş et</string>
     <string name="title_edit_identity">Kimliyə düzəliş et</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Yeni qovluq</string>
+    <string name="title_new_folder">Yeni qovluq</string>
     <string name="title_edit_folder">Qovluğa düzəliş et</string>
     <string name="title_disable_gmail">Gmail tətbiqini sıradan çıxart</string>
     <string name="title_setup">Ayarlar</string>
@@ -348,6 +348,8 @@
     <string name="title_advanced_when">Nə vaxt</string>
     <string name="title_advanced_optimize">Avto-optimallaşdırma</string>
     <string name="title_advanced_always">Bu hesablar üçün mesajları həmişə al</string>
+    <string name="title_advanced_poll_metered">Ölçülmüş şəbəkədə olarkən yeni mesajları müntəzəm yoxla</string>
+    <string name="title_advanced_poll_unmetered">Ölçülməyən şəbəkədə olarkən yeni mesajları müntəzəm yoxla</string>
     <string name="title_advanced_schedule">Cədvəl</string>
     <string name="title_advanced_schedule_workdays">İş günləri</string>
     <string name="title_advanced_schedule_weekend">Həftəsonu</string>
@@ -1234,7 +1236,7 @@
     <string name="title_move">Köçürt</string>
     <string name="title_copy_btn">Kopyala</string>
     <string name="title_keywords_btn">Açar sözlər</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etiketlər (yalnız Gmail)</string>
+    <string name="title_labels_btn">Etiketlər (yalnız Gmail)</string>
     <string name="title_unsubscribe">Abunəlikdən çıx</string>
     <string name="title_message_rule">Qayda yarat</string>
     <string name="title_no_junk">Spam deyil</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 821116e49d..a3fa335112 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -112,7 +112,7 @@
     <string name="title_junk_clear">Изчистване</string>
     <string name="title_junk_clear_hint">Ще се изтрият всички правила за блокиране на подател</string>
     <string name="title_notification_sending">Изпращане на съобщения</string>
-    <string name="title_notification_waiting">Изчаква се подходяща връзка</string>
+    <string name="title_notification_waiting">Чака се подходяща връзка</string>
     <string name="title_notification_idle">Празен</string>
     <string name="title_notification_failed">%1$s се провали</string>
     <string name="title_notification_alert">Предупреждение на сървъра: \'%1$s\'</string>
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Самоличности</string>
     <string name="title_edit_account">Редактиране на акаунта</string>
     <string name="title_edit_identity">Редактиране на самоличността</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Нова папка</string>
+    <string name="title_new_folder">Нова папка</string>
     <string name="title_edit_folder">Редактиране на папка</string>
     <string name="title_disable_gmail">Изключване на приложението Gmail</string>
     <string name="title_setup">Настройки</string>
@@ -347,6 +347,8 @@
     <string name="title_advanced_when">Кога</string>
     <string name="title_advanced_optimize">Автоматично оптимизиране</string>
     <string name="title_advanced_always">Винаги да се получават известия за тези акаунти</string>
+    <string name="title_advanced_poll_metered">Периодична проверка за нови съобщения при връзка с мрежа с измерено потребление</string>
+    <string name="title_advanced_poll_unmetered">Периодична проверка за нови съобщения при връзка с мрежа с безмерено потребление</string>
     <string name="title_advanced_schedule">График</string>
     <string name="title_advanced_schedule_workdays">Работни дни</string>
     <string name="title_advanced_schedule_weekend">Уикенд</string>
@@ -805,7 +807,7 @@
     <string name="title_advanced_attach_new_hint">В противен случай добавете споделени адреси или файлове към текущата чернова на съобщението</string>
     <string name="title_advanced_usenet_hint">Вмъкнете \'-\' между текста и подписа</string>
     <string name="title_advanced_remove_signature_hint">Това може да доведе до премахване на премалко или премного текст</string>
-    <string name="title_advanced_metered_hint">Измерваните връзки обикновено са мобилен интернет или платени Wi-Fi точки</string>
+    <string name="title_advanced_metered_hint">Връзките на мрежи с измерено потребление обикновено са мобилен интернет или платени Wi-Fi точки за достъп</string>
     <string name="title_advanced_metered_warning">Деактивирането на тази опция ще деактивира получаването и изпращането на съобщения през мобилния интернет</string>
     <string name="title_advanced_rlah_hint">Ако не се допуска роуминг в рамките на ЕС</string>
     <string name="title_advanced_usage_hint">Това ще увеличи употребата на батерията, данните и мястото в хранилището</string>
@@ -1110,6 +1112,7 @@
     <string name="title_poll_folder">Проверявайте периодично, вместо непрекъснато синхронизиране</string>
     <string name="title_poll_folder_remark">Повечето имейл сървъри позволяват push известия само за шепа папки!</string>
     <string name="title_download_folder">Автоматично изтегляне на текста на съобщението и прикачените файлове</string>
+    <string name="title_count_unread">Добавяне на броя непрочетени съобщения към акаунта</string>
     <string name="title_notify_folder">Уведомяване при нови съобщения</string>
     <string name="title_auto_classify_source">Класифициране на новите съобщения в тази папка</string>
     <string name="title_auto_classify_target">Автоматично преместване на класифицираните съобщения в тази папка</string>
@@ -1232,7 +1235,7 @@
     <string name="title_move">Премести</string>
     <string name="title_copy_btn">Копиране</string>
     <string name="title_keywords_btn">Ключови думи</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Етикети (само за Gmail)</string>
+    <string name="title_labels_btn">Етикети (само за Gmail)</string>
     <string name="title_unsubscribe">Отписване</string>
     <string name="title_message_rule">Създай правило</string>
     <string name="title_no_junk">Не е спам</string>
diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index ba782d53f3..f5e812fbe2 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -162,7 +162,7 @@
     <string name="title_list_identities">Identiteti</string>
     <string name="title_edit_account">Uredi račun</string>
     <string name="title_edit_identity">Uredi identitet</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Novi folder</string>
+    <string name="title_new_folder">Novi folder</string>
     <string name="title_edit_folder">Uredi folder</string>
     <string name="title_disable_gmail">Onemogući Gmail aplikaciju</string>
     <string name="title_setup">Postavke</string>
@@ -1248,7 +1248,7 @@
     <string name="title_move">Premjesti</string>
     <string name="title_copy_btn">Kopiraj</string>
     <string name="title_keywords_btn">Ključne riječi</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Oznake (samo za Gmail)</string>
+    <string name="title_labels_btn">Oznake (samo za Gmail)</string>
     <string name="title_unsubscribe">Otkaži pretplatu</string>
     <string name="title_message_rule">Kreiraj pravilo</string>
     <string name="title_no_junk">Nije spam</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 4a1e62f39e..2749133cef 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -176,7 +176,7 @@
     <string name="title_list_identities">Identity</string>
     <string name="title_edit_account">Upravit účet</string>
     <string name="title_edit_identity">Upravit identitu</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nová složka</string>
+    <string name="title_new_folder">Nová složka</string>
     <string name="title_edit_folder">Upravit složku</string>
     <string name="title_disable_gmail">Zakázat aplikaci Gmail</string>
     <string name="title_setup">Nastavení</string>
@@ -376,6 +376,8 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_advanced_when">Kdy</string>
     <string name="title_advanced_optimize">Automaticky optimalizovat</string>
     <string name="title_advanced_always">Neustále přijímat zprávy pro tyto účty</string>
+    <string name="title_advanced_poll_metered">Pravidelně ověřovat nové zprávy v měřené síti</string>
+    <string name="title_advanced_poll_unmetered">Pravidelně kontrolovat nové zprávy na neměřené síti</string>
     <string name="title_advanced_schedule">Plán</string>
     <string name="title_advanced_schedule_workdays">Pracovní dny</string>
     <string name="title_advanced_schedule_weekend">Víkend</string>
@@ -1139,6 +1141,7 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_poll_folder">Kontrolovat pravidelně namísto průběžné synchronizace</string>
     <string name="title_poll_folder_remark">Většina e-mailových serverů povoluje okamžité zprávy pouze pro některé složky!</string>
     <string name="title_download_folder">Automaticky stahovat obsah a přílohy zpráv</string>
+    <string name="title_count_unread">Přidat do účtu počet nepřečtených zpráv</string>
     <string name="title_notify_folder">Oznamovat nové zprávy</string>
     <string name="title_auto_classify_source">Klasifikovat nové zprávy v této složce</string>
     <string name="title_auto_classify_target">Automaticky přesunout klasifikované zprávy do této složky</string>
@@ -1261,7 +1264,7 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_move">Přesunout</string>
     <string name="title_copy_btn">Kopírovat</string>
     <string name="title_keywords_btn">Klíčová slova</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Štítky (pouze Gmail)</string>
+    <string name="title_labels_btn">Štítky (pouze Gmail)</string>
     <string name="title_unsubscribe">Odhlásit odběr</string>
     <string name="title_message_rule">Vytvořit pravidlo</string>
     <string name="title_no_junk">Není spam</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 238e2281fb..710afb2832 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Identiteter</string>
     <string name="title_edit_account">Redigér konto</string>
     <string name="title_edit_identity">Redigér identitet</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Ny mappe</string>
+    <string name="title_new_folder">Ny mappe</string>
     <string name="title_edit_folder">Redigér mappe</string>
     <string name="title_disable_gmail">Deaktivér Gmail-app</string>
     <string name="title_setup">Indstillinger</string>
@@ -348,6 +348,8 @@
     <string name="title_advanced_when">Når</string>
     <string name="title_advanced_optimize">Optimér automatisk</string>
     <string name="title_advanced_always">Modtag altid beskeder til disse konti</string>
+    <string name="title_advanced_poll_metered">Tjek periodisk for nye beskeder, mens forbundet til forbrugsafregnet netværk</string>
+    <string name="title_advanced_poll_unmetered">Tjek periodisk for nye beskeder, mens forbundet til ikke-forbrugsafregnet netværk</string>
     <string name="title_advanced_schedule">Planlægning</string>
     <string name="title_advanced_schedule_workdays">Hverdage</string>
     <string name="title_advanced_schedule_weekend">Weekend</string>
@@ -1112,6 +1114,7 @@
     <string name="title_poll_folder">Tjek periodisk i stedet for kontinuerlig synkronisering</string>
     <string name="title_poll_folder_remark">De fleste e-mailservere tillader kun push-beskeder for en håndfuld mapper!</string>
     <string name="title_download_folder">Auto-download beskedtekst og vedhæftninger</string>
+    <string name="title_count_unread">Føj antallet af ulæste beskeder til kontoen</string>
     <string name="title_notify_folder">Notificér ved nye beskeder</string>
     <string name="title_auto_classify_source">\'Klassificér nye bskeder\' in denne mappe</string>
     <string name="title_auto_classify_target">Flyt automatisk klassificerede beskeder til denne mappe</string>
@@ -1235,7 +1238,7 @@
     <string name="title_move">Flyt</string>
     <string name="title_copy_btn">Kopiér</string>
     <string name="title_keywords_btn">Nøgleord</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etiketter (kun Gmail)</string>
+    <string name="title_labels_btn">Etiketter (kun Gmail)</string>
     <string name="title_unsubscribe">Afmeld</string>
     <string name="title_message_rule">Opret regel</string>
     <string name="title_no_junk">Ikke spam</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index f4718e034d..e4f9f0339f 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -149,7 +149,7 @@
     <string name="title_list_identities">Identitäten</string>
     <string name="title_edit_account">Konto bearbeiten</string>
     <string name="title_edit_identity">Identität bearbeiten</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Neuer Ordner</string>
+    <string name="title_new_folder">Neuer Ordner</string>
     <string name="title_edit_folder">Ordner bearbeiten</string>
     <string name="title_disable_gmail">Gmail-App deaktivieren</string>
     <string name="title_setup">Einstellungen</string>
@@ -349,6 +349,8 @@
     <string name="title_advanced_when">Wann</string>
     <string name="title_advanced_optimize">Automatisch optimieren</string>
     <string name="title_advanced_always">Nachrichten für diese Konten immer empfangen</string>
+    <string name="title_advanced_poll_metered">Regelmäßig auf neue Nachrichten prüfen, während ein getaktetes Netzwerk verwendet wird</string>
+    <string name="title_advanced_poll_unmetered">Regelmäßig auf neue Nachrichten prüfen, während ein nicht getaktetes Netzwerk verwendet wird</string>
     <string name="title_advanced_schedule">Zeitplan</string>
     <string name="title_advanced_schedule_workdays">Werktage</string>
     <string name="title_advanced_schedule_weekend">Wochenende</string>
@@ -972,7 +974,7 @@
     </string>
     <string name="title_keep_poll_interval">Abrufintervall (Minuten)</string>
     <string name="title_keep_alive_interval">Aktivitätsintervall (Minuten)</string>
-    <string name="title_keep_alive_noop">IMAP IDLE periodisch neu starten</string>
+    <string name="title_keep_alive_noop">IMAP IDLE regelmäßig neu starten</string>
     <string name="title_server_time">Empfangszeit verwenden (Server)</string>
     <string name="title_received_header">Received-Kopfzeile verwenden</string>
     <string name="title_date_header">Date-Kopfzeile verwenden (Sendezeit)</string>
@@ -1110,9 +1112,10 @@
     <string name="title_unified_inbox_add">Zum Sammeleingang hinzufügen</string>
     <string name="title_unified_inbox_delete">Aus Sammeleingang löschen</string>
     <string name="title_synchronize_folder">Synchronisieren (E-Mails empfangen)</string>
-    <string name="title_poll_folder">Periodisch prüfen statt fortlaufend synchronisieren</string>
+    <string name="title_poll_folder">Regelmäßig prüfen statt fortlaufend synchronisieren</string>
     <string name="title_poll_folder_remark">Die meisten E-Mail-Server erlauben Push-Nachrichten nur für einige wenige Ordner!</string>
     <string name="title_download_folder">Automatisch den Nachrichtentext und Anhänge herunterladen</string>
+    <string name="title_count_unread">Anzahl ungelesener Nachrichten zum Konto hinzufügen</string>
     <string name="title_notify_folder">Eingangsbenachrichtigung</string>
     <string name="title_auto_classify_source">Neue Nachrichten in diesem Ordner klassifizieren</string>
     <string name="title_auto_classify_target">Für diesen Ordner klassifizierte Nachrichten automatisch in diesen Ordner verschieben</string>
@@ -1121,8 +1124,8 @@
     <string name="title_keep_days">Nachrichten aufbewahren (Tage)</string>
     <string name="title_keep_days_remark">Alte Nachrichten werden vom Gerät entfernt, aber auf dem Server belassen</string>
     <string name="title_keep_all">Alle E-Mails aufbewahren</string>
-    <string name="title_poll_system">Systemordner so einstellen, dass periodisch nach neuen Nachrichten gesucht wird</string>
-    <string name="title_poll_user">Benutzerordner so einstellen, dass periodisch nach neuen Nachrichten gesucht wird</string>
+    <string name="title_poll_system">Systemordner so einstellen, dass regelmäßig auf neue Nachrichten geprüft wird</string>
+    <string name="title_poll_user">Benutzerordner so einstellen, dass regelmäßig auf neue Nachrichten geprüft wird</string>
     <string name="title_auto_trash">Alte Nachrichten automatisch in den Papierkorb verschieben</string>
     <string name="title_auto_delete">Automatisch alte Nachrichten dauerhaft löschen</string>
     <string name="title_auto_delete_hint">Alte Nachrichten sind Nachrichten, die nicht mehr auf dem Gerät vorgehalten werden</string>
@@ -1236,7 +1239,7 @@
     <string name="title_move">Verschieben</string>
     <string name="title_copy_btn">Kopieren</string>
     <string name="title_keywords_btn">Schlagwörter</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Labels (nur für Gmail)</string>
+    <string name="title_labels_btn">Labels (nur für Gmail)</string>
     <string name="title_unsubscribe">Abbestellen</string>
     <string name="title_message_rule">Regel erstellen</string>
     <string name="title_no_junk">Kein Spam</string>
@@ -1745,7 +1748,7 @@
     <string name="title_legend_download_off">Nachrichteninhalt bei Bedarf herunterladen</string>
     <string name="title_legend_synchronize_on">Synchronisation aktiviert</string>
     <string name="title_legend_synchronize_off">Synchronisation deaktiviert</string>
-    <string name="title_legend_synchronize_poll">Periodisch synchronisieren</string>
+    <string name="title_legend_synchronize_poll">Regelmäßig synchronisieren</string>
     <string name="title_legend_disconnected">Nicht verbunden</string>
     <string name="title_legend_connecting">Verbindungsvorgang</string>
     <string name="title_legend_connected">Verbunden</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index e9b71452cb..9db474b00a 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Ταυτότητες</string>
     <string name="title_edit_account">Επεξεργασία λογαριασμού</string>
     <string name="title_edit_identity">Επεξεργασία ταυτότητας</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Νέος φάκελος</string>
+    <string name="title_new_folder">Νέος φάκελος</string>
     <string name="title_edit_folder">Επεξεργασία φακέλου</string>
     <string name="title_disable_gmail">Απενεργοποίηση της εφαρμογής Gmail</string>
     <string name="title_setup">Ρυθμίσεις</string>
@@ -347,6 +347,8 @@
     <string name="title_advanced_when">Πότε</string>
     <string name="title_advanced_optimize">Αυτόματη βελτιστοποίηση</string>
     <string name="title_advanced_always">Να λαμβάνονται πάντα τα μηνύματα για αυτούς τους λογαριασμούς</string>
+    <string name="title_advanced_poll_metered">Περιοδικός έλεγχος για νέα μηνύματα κατά τη χρήση δικτύου με ογκοχρέωση</string>
+    <string name="title_advanced_poll_unmetered">Περιοδικός έλεγχος για νέα μηνύματα κατά τη χρήση δικτύου χωρίς ογκοχρέωση</string>
     <string name="title_advanced_schedule">Χρονοδιάγραμμα</string>
     <string name="title_advanced_schedule_workdays">Εργάσιμες ημέρες</string>
     <string name="title_advanced_schedule_weekend">Σαββατοκύριακο</string>
@@ -1229,7 +1231,7 @@
     <string name="title_move">Μετακίνηση</string>
     <string name="title_copy_btn">Αντιγραφή</string>
     <string name="title_keywords_btn">Λέξεις-κλειδιά</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Ετικέτες (μόνο στο Gmail)</string>
+    <string name="title_labels_btn">Ετικέτες (μόνο στο Gmail)</string>
     <string name="title_unsubscribe">Κατάργηση συνδρομής</string>
     <string name="title_message_rule">Δημιουργία κανόνα</string>
     <string name="title_no_junk">Όχι ανεπιθύμητο</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 3fe44ca946..7581022016 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Identidades</string>
     <string name="title_edit_account">Editar cuenta</string>
     <string name="title_edit_identity">Editar identidad</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nueva carpeta</string>
+    <string name="title_new_folder">Nueva carpeta</string>
     <string name="title_edit_folder">Editar carpeta</string>
     <string name="title_disable_gmail">Desactivar aplicación de Gmail</string>
     <string name="title_setup">Ajustes</string>
@@ -347,6 +347,8 @@
     <string name="title_advanced_when">Cuando</string>
     <string name="title_advanced_optimize">Optimizar automáticamente</string>
     <string name="title_advanced_always">Siempre recibir mensajes para estas cuentas</string>
+    <string name="title_advanced_poll_metered">Comprobar periódicamente si hay nuevos mensajes en una red medida</string>
+    <string name="title_advanced_poll_unmetered">Comprobar periódicamente si hay nuevos mensajes en una red no medida</string>
     <string name="title_advanced_schedule">Programar</string>
     <string name="title_advanced_schedule_workdays">Días hábiles</string>
     <string name="title_advanced_schedule_weekend">Fin de semana</string>
@@ -1110,6 +1112,7 @@
     <string name="title_poll_folder">Comprobar periódicamente en lugar de sincronizar continuamente</string>
     <string name="title_poll_folder_remark">¡La mayoría de los servidores de correo electrónico sólo permiten mensajes push para un puñado de carpetas!</string>
     <string name="title_download_folder">Descargar mensajes de texto y archivos adjuntos automáticamente</string>
+    <string name="title_count_unread">Sumar el número de mensajes no leídos a la cuenta</string>
     <string name="title_notify_folder">Notificar nuevos mensajes</string>
     <string name="title_auto_classify_source">Clasificar mensajes nuevos en esta carpeta</string>
     <string name="title_auto_classify_target">Mover automáticamente los mensajes clasificados a esta carpeta</string>
@@ -1232,7 +1235,7 @@
     <string name="title_move">Mover</string>
     <string name="title_copy_btn">Copiar</string>
     <string name="title_keywords_btn">Palabras clave</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etiquetas (sólo Gmail)</string>
+    <string name="title_labels_btn">Etiquetas (sólo Gmail)</string>
     <string name="title_unsubscribe">Darse de baja</string>
     <string name="title_message_rule">Crear regla</string>
     <string name="title_no_junk">No es Spam</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 798b459bc9..eb4d619ce2 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -132,7 +132,7 @@
     <string name="title_list_identities">هویت‌ها</string>
     <string name="title_edit_account">ویرایش حساب</string>
     <string name="title_edit_identity">ویرایش هویت</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">پوشه جدید</string>
+    <string name="title_new_folder">پوشه جدید</string>
     <string name="title_edit_folder">ويرايش پوشه</string>
     <string name="title_disable_gmail">برنامه جیمیل را غیرفعال کن</string>
     <string name="title_setup">تنظیمات</string>
@@ -310,6 +310,8 @@
     <string name="title_advanced_when">هنگامی که</string>
     <string name="title_advanced_optimize">خودکار بهینه‌سازی کن</string>
     <string name="title_advanced_always">همیشه پیام‌ها را برای این حساب‌ها دریافت کن</string>
+    <string name="title_advanced_poll_metered">چک کردن متناوب برای پیام‌های جدید در زمان انصال به اینترنت با حجم محدود</string>
+    <string name="title_advanced_poll_unmetered">چک کردن متناوب برای پیام‌های جدید در زمان انصال به اینترنت با حجم نامحدود</string>
     <string name="title_advanced_schedule">زمان بندی</string>
     <string name="title_advanced_schedule_workdays">روزهای کاری</string>
     <string name="title_advanced_schedule_weekend">روزهای تعطیل</string>
@@ -752,6 +754,7 @@
     <string name="title_synchronize_folder">همگام سازی (دریافت پیام‌ها)</string>
     <string name="title_poll_folder">بررسی دوره‌ای به جای همگام سازی پیوسته</string>
     <string name="title_download_folder">دریافت خودکار متن پیام و پیوست</string>
+    <string name="title_count_unread">تعداد پیام‌های خوانده نشده را به حساب اضافه کن</string>
     <string name="title_notify_folder">آگاه‌سازی از پیام‌های جدید</string>
     <string name="title_sync_days">همگام سازی پیام‌ها (روزها)</string>
     <string name="title_sync_days_remark">افزایش مقدار این باعث افزایش مصرف باتری می‌شود</string>
@@ -844,7 +847,7 @@
     <string name="title_spam">هرزنامه</string>
     <string name="title_move">انتقال</string>
     <string name="title_copy_btn">روگرفت</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">برچسب (فقط جیمیل)</string>
+    <string name="title_labels_btn">برچسب (فقط جیمیل)</string>
     <string name="title_unsubscribe">لغو اشتراک</string>
     <string name="title_message_rule">ساخت قانون</string>
     <string name="title_no_junk">هرزنامه نیست</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index d117d838a5..abca7d6ee3 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Identités</string>
     <string name="title_edit_account">Modifier le compte</string>
     <string name="title_edit_identity">Modifier l’identité</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nouveau dossier</string>
+    <string name="title_new_folder">Nouveau dossier</string>
     <string name="title_edit_folder">Modifier le dossier</string>
     <string name="title_disable_gmail">Désactiver l\'application Gmail</string>
     <string name="title_setup">Paramètres</string>
@@ -348,6 +348,8 @@
     <string name="title_advanced_when">Quand</string>
     <string name="title_advanced_optimize">Optimiser automatiquement</string>
     <string name="title_advanced_always">Recevoir les messages en continu pour ces comptes</string>
+    <string name="title_advanced_poll_metered">Vérifier périodiquement la présence de nouveaux messages sur un réseau limité</string>
+    <string name="title_advanced_poll_unmetered">Vérifier périodiquement la présence de nouveaux messages sur un réseau non limité</string>
     <string name="title_advanced_schedule">Planification</string>
     <string name="title_advanced_schedule_workdays">Jours ouvrés</string>
     <string name="title_advanced_schedule_weekend">Fin de semaine</string>
@@ -1112,6 +1114,7 @@
     <string name="title_poll_folder">Vérifier périodiquement au lieu de synchroniser en continu</string>
     <string name="title_poll_folder_remark">La plupart des serveurs de messagerie autorisent les messages poussés pour un petit nombre de dossiers seulement!</string>
     <string name="title_download_folder">Télécharger automatiquement le texte des messages et les pièces-jointes</string>
+    <string name="title_count_unread">Ajouter le nombre de messages non lus au compte</string>
     <string name="title_notify_folder">Notification pour les nouveaux messages</string>
     <string name="title_auto_classify_source">Classer les nouveaux messages de ce dossier</string>
     <string name="title_auto_classify_target">Déplacer automatiquement les messages à classer vers ce dossier</string>
@@ -1235,7 +1238,7 @@
     <string name="title_move">Déplacer</string>
     <string name="title_copy_btn">Copier</string>
     <string name="title_keywords_btn">Mots-clés</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Libellés (Gmail uniquement)</string>
+    <string name="title_labels_btn">Libellés (Gmail uniquement)</string>
     <string name="title_unsubscribe">Se désabonner</string>
     <string name="title_message_rule">Créer une règle</string>
     <string name="title_no_junk">Non indésirable</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index ce8ff2e8b8..3740a2cc89 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Identités</string>
     <string name="title_edit_account">Modifier le compte</string>
     <string name="title_edit_identity">Modifier l’identité</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nouveau dossier</string>
+    <string name="title_new_folder">Nouveau dossier</string>
     <string name="title_edit_folder">Modifier le dossier</string>
     <string name="title_disable_gmail">Désactiver l\'application Gmail</string>
     <string name="title_setup">Paramètres</string>
@@ -348,6 +348,8 @@
     <string name="title_advanced_when">Quand</string>
     <string name="title_advanced_optimize">Optimiser automatiquement</string>
     <string name="title_advanced_always">Recevoir les messages en continu pour ces comptes</string>
+    <string name="title_advanced_poll_metered">Vérifier périodiquement la présence de nouveaux messages sur un réseau limité</string>
+    <string name="title_advanced_poll_unmetered">Vérifier périodiquement la présence de nouveaux messages sur un réseau non limité</string>
     <string name="title_advanced_schedule">Planification</string>
     <string name="title_advanced_schedule_workdays">Jours ouvrés</string>
     <string name="title_advanced_schedule_weekend">Week-end</string>
@@ -1112,6 +1114,7 @@
     <string name="title_poll_folder">Vérifier périodiquement au lieu de synchroniser en continu</string>
     <string name="title_poll_folder_remark">La plupart des serveurs de messagerie autorisent les messages push pour un petit nombre de dossiers seulement !</string>
     <string name="title_download_folder">Télécharger automatiquement le texte des messages et les pièces jointes</string>
+    <string name="title_count_unread">Ajouter le nombre de messages non lus au compte</string>
     <string name="title_notify_folder">Notification pour les nouveaux messages</string>
     <string name="title_auto_classify_source">Classer les nouveaux messages de ce dossier</string>
     <string name="title_auto_classify_target">Déplacer automatiquement les messages à classer dans ce dossier</string>
@@ -1235,7 +1238,7 @@
     <string name="title_move">Déplacer</string>
     <string name="title_copy_btn">Copier</string>
     <string name="title_keywords_btn">Mots-clés</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Libellés (Gmail uniquement)</string>
+    <string name="title_labels_btn">Libellés (Gmail uniquement)</string>
     <string name="title_unsubscribe">Se désabonner</string>
     <string name="title_message_rule">Créer une règle</string>
     <string name="title_no_junk">Non indésirable</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 35ab4538e0..445577759e 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -146,7 +146,7 @@ It blokkearjen fan in ôfstjoerderdomein makket gebrûk fan filterregels, wat in
     <string name="title_list_identities">Identiteiten</string>
     <string name="title_edit_account">Account bewurkje</string>
     <string name="title_edit_identity">Identiteit bewurkje</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nije map</string>
+    <string name="title_new_folder">Nije map</string>
     <string name="title_edit_folder">Map bewurkje</string>
     <string name="title_disable_gmail">Gmail-app útskeakelje</string>
     <string name="title_setup">Ynstellingen</string>
@@ -346,6 +346,8 @@ It blokkearjen fan in ôfstjoerderdomein makket gebrûk fan filterregels, wat in
     <string name="title_advanced_when">Wannear</string>
     <string name="title_advanced_optimize">Automatysk optimalisearje</string>
     <string name="title_advanced_always">Untfang altyd berjochten foar dizze accounts</string>
+    <string name="title_advanced_poll_metered">Kontrolearje periodyk op nije berjochten op in gegevensbeheind netwurk</string>
+    <string name="title_advanced_poll_unmetered">Kontrolearje periodyk op nije berjochten op in foar gegevens ûnbeheind netwurk</string>
     <string name="title_advanced_schedule">Skema</string>
     <string name="title_advanced_schedule_workdays">Wurkdagen</string>
     <string name="title_advanced_schedule_weekend">Wykein</string>
@@ -1107,6 +1109,7 @@ https://en.wikipedia.org/wiki/ASCII</string>
     <string name="title_poll_folder">Kontrolearje periodyk yn stee fan trochgeande syngronisaasje</string>
     <string name="title_poll_folder_remark">De measte e-mailservers stean push-berjochten allinnich foar in hantsjefol mappen ta!</string>
     <string name="title_download_folder">Berjochtteksten en bylagen automatysk downloade</string>
+    <string name="title_count_unread">Oantal net lêzen berjochten oan de account tafoegje</string>
     <string name="title_notify_folder">Melding by nije berjochten</string>
     <string name="title_auto_classify_source">Klassifisearje nije berjochten yn dizze map</string>
     <string name="title_auto_classify_target">Ferpleats klassifisearre berjochten automatysk nei dizze map</string>
@@ -1229,7 +1232,7 @@ https://en.wikipedia.org/wiki/ASCII</string>
     <string name="title_move">Ferpleatse</string>
     <string name="title_copy_btn">Kopiearje</string>
     <string name="title_keywords_btn">Kaaiwurden</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Labels (allinnich foar Gmail)</string>
+    <string name="title_labels_btn">Labels (allinnich foar Gmail)</string>
     <string name="title_unsubscribe">Ofmelde</string>
     <string name="title_message_rule">Regel meitsje</string>
     <string name="title_no_junk">Net net-winske</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index cd3ef76585..d2ca2d7449 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -147,7 +147,7 @@
     <string name="title_list_identities">Azonosítók</string>
     <string name="title_edit_account">Fiók szerkesztése</string>
     <string name="title_edit_identity">Azonosító szerkesztése</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Új mappa</string>
+    <string name="title_new_folder">Új mappa</string>
     <string name="title_edit_folder">Könyvtár szerkesztése</string>
     <string name="title_disable_gmail">Gmail alkalmazás letiltása</string>
     <string name="title_setup">Beállítások</string>
@@ -346,6 +346,8 @@
     <string name="title_advanced_when">Mikor</string>
     <string name="title_advanced_optimize">Automatikus optimizálás</string>
     <string name="title_advanced_always">Mindig fogadjon értesítéseket e fiókokhoz</string>
+    <string name="title_advanced_poll_metered">Új üzenetek rendszeres ellenőrzése fizetős hálózaton</string>
+    <string name="title_advanced_poll_unmetered">Új üzenetek rendszeres ellenőrzése nem fizetős hálózaton</string>
     <string name="title_advanced_schedule">Ütemezés</string>
     <string name="title_advanced_schedule_workdays">Munkanapok</string>
     <string name="title_advanced_schedule_weekend">Hétvége</string>
@@ -1107,6 +1109,7 @@
     <string name="title_poll_folder">Időszakos ellenőrzés a folyamatos szinkronizálás helyett</string>
     <string name="title_poll_folder_remark">A legtöbb email szerver leküldéses üzeneteket csak néhány mappához engedélyez!</string>
     <string name="title_download_folder">Üzenetek szövegének és mellékleteinek automatikus letöltése</string>
+    <string name="title_count_unread">Az olvasatlan üzenetek számának kijelzése a fióknál</string>
     <string name="title_notify_folder">Értesítés új üzenet érkezésekor</string>
     <string name="title_auto_classify_source">E mappa üzeneteinek mappázása</string>
     <string name="title_auto_classify_target">Mappázott üzenetek automatikus mozgatása ebbe a mappába</string>
@@ -1229,7 +1232,7 @@
     <string name="title_move">Áthelyezés</string>
     <string name="title_copy_btn">Másolás</string>
     <string name="title_keywords_btn">Kulcsszavak</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Címkék (csak Gmail)</string>
+    <string name="title_labels_btn">Címkék (csak Gmail)</string>
     <string name="title_unsubscribe">Leiratkozás</string>
     <string name="title_message_rule">Szabály létrehozása</string>
     <string name="title_no_junk">Nem levélszemét</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index dafb0e44ef..e018431f4f 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Identità</string>
     <string name="title_edit_account">Modifica profilo</string>
     <string name="title_edit_identity">Modifica identità</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nuova cartella</string>
+    <string name="title_new_folder">Nuova cartella</string>
     <string name="title_edit_folder">Modifica cartella</string>
     <string name="title_disable_gmail">Disabilita l\'app di Gmail</string>
     <string name="title_setup">Impostazioni</string>
@@ -348,6 +348,8 @@
     <string name="title_advanced_when">Quando</string>
     <string name="title_advanced_optimize">Ottimizza automaticamente</string>
     <string name="title_advanced_always">Ricevi sempre i messaggi per questi profili</string>
+    <string name="title_advanced_poll_metered">Controlla periodicamente la presenza di nuovi messaggi su una rete a consumo</string>
+    <string name="title_advanced_poll_unmetered">Controlla periodicamente la presenza di nuovi messaggi su una rete non a consumo</string>
     <string name="title_advanced_schedule">Pianificazione</string>
     <string name="title_advanced_schedule_workdays">Giorni feriali</string>
     <string name="title_advanced_schedule_weekend">Fine settimana</string>
@@ -1112,6 +1114,7 @@
     <string name="title_poll_folder">Controlla periodicamente invece di sincronizzare continuamente</string>
     <string name="title_poll_folder_remark">Gran parte dei server email consentono i messaggi push solo per alcune cartelle!</string>
     <string name="title_download_folder">Scarica automaticamente testi e allegati dei messaggi</string>
+    <string name="title_count_unread">Aggiungi il numero di messaggi non letti al profilo</string>
     <string name="title_notify_folder">Notifica i nuovi messaggi</string>
     <string name="title_auto_classify_source">Classifica i nuovi messaggi in questa cartella</string>
     <string name="title_auto_classify_target">Sposta automaticamente i messaggi classificati in questa cartella</string>
@@ -1235,7 +1238,7 @@
     <string name="title_move">Sposta</string>
     <string name="title_copy_btn">Copia</string>
     <string name="title_keywords_btn">Parole chiave</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etichette (solo Gmail)</string>
+    <string name="title_labels_btn">Etichette (solo Gmail)</string>
     <string name="title_unsubscribe">Disiscriviti</string>
     <string name="title_message_rule">Crea una regola</string>
     <string name="title_no_junk">Non spam</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index a316f7324f..92e50b917c 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -176,7 +176,7 @@
     <string name="title_list_identities">זהויות</string>
     <string name="title_edit_account">עריכת חשבון</string>
     <string name="title_edit_identity">עריכת זהות</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">תיקייה חדשה</string>
+    <string name="title_new_folder">תיקייה חדשה</string>
     <string name="title_edit_folder">עריכת תיקייה</string>
     <string name="title_disable_gmail">השבתת יישומון Gmail</string>
     <string name="title_setup">הגדרות</string>
@@ -1262,7 +1262,7 @@
     <string name="title_move">העברה</string>
     <string name="title_copy_btn">העתקה</string>
     <string name="title_keywords_btn">מילות מפתח</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">תוויות (Gmail בלבד)</string>
+    <string name="title_labels_btn">תוויות (Gmail בלבד)</string>
     <string name="title_unsubscribe">ביטול מינוי</string>
     <string name="title_message_rule">יצירת כלל</string>
     <string name="title_no_junk">לא ספאם</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index dcd9ebd654..2b87570739 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -134,7 +134,7 @@
     <string name="title_list_identities">ユーザー ID</string>
     <string name="title_edit_account">アカウントを編集</string>
     <string name="title_edit_identity">ユーザー ID を編集</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">新しいフォルダー</string>
+    <string name="title_new_folder">新しいフォルダー</string>
     <string name="title_edit_folder">フォルダーを編集</string>
     <string name="title_disable_gmail">Gmail アプリを無効にする</string>
     <string name="title_setup">設定</string>
@@ -334,6 +334,8 @@
     <string name="title_advanced_when">同期</string>
     <string name="title_advanced_optimize">自動最適化</string>
     <string name="title_advanced_always">これらのアカウントのメッセージを常に受信</string>
+    <string name="title_advanced_poll_metered">従量課金制接続で新着メッセージを定期的に確認する</string>
+    <string name="title_advanced_poll_unmetered">定額制接続で新着メッセージを定期的に確認する</string>
     <string name="title_advanced_schedule">スケジュール</string>
     <string name="title_advanced_schedule_workdays">平日</string>
     <string name="title_advanced_schedule_weekend">週末</string>
@@ -1097,6 +1099,7 @@
     <string name="title_poll_folder">継続的な同期の代わりに定期的に確認する</string>
     <string name="title_poll_folder_remark">ほとんどのメールサーバーでは、一部のフォルダーに対してのみプッシュメッセージを許可しています</string>
     <string name="title_download_folder">本文と添付ファイルを自動でダウンロードする</string>
+    <string name="title_count_unread">未読メッセージ数をアカウントに追加する</string>
     <string name="title_notify_folder">新着メッセージを通知する</string>
     <string name="title_auto_classify_source">このフォルダーに新着メッセージを分類</string>
     <string name="title_auto_classify_target">このフォルダーに分類されたメッセージを自動で移動</string>
@@ -1220,7 +1223,7 @@
     <string name="title_move">移動</string>
     <string name="title_copy_btn">コピー</string>
     <string name="title_keywords_btn">キーワード</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">ラベル (Gmail のみ)</string>
+    <string name="title_labels_btn">ラベル (Gmail のみ)</string>
     <string name="title_unsubscribe">購読解除</string>
     <string name="title_message_rule">ルールを作成</string>
     <string name="title_no_junk">迷惑メールでないと報告</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 4c9fcce6ba..dafa261823 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -147,7 +147,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_list_identities">Identiteiten</string>
     <string name="title_edit_account">Bewerk account</string>
     <string name="title_edit_identity">Bewerk identiteit</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nieuwe map</string>
+    <string name="title_new_folder">Nieuwe map</string>
     <string name="title_edit_folder">Bewerk map</string>
     <string name="title_disable_gmail">Gmail app uitschakelen</string>
     <string name="title_setup">Instellingen</string>
@@ -346,6 +346,8 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_when">Wanneer</string>
     <string name="title_advanced_optimize">Automatisch optimaliseren</string>
     <string name="title_advanced_always">Ontvang altijd berichten voor deze accounts</string>
+    <string name="title_advanced_poll_metered">Periodiek controleren op nieuwe berichten op een gemeten netwerk</string>
+    <string name="title_advanced_poll_unmetered">Periodiek controleren op nieuwe berichten op een ongemeten netwerk</string>
     <string name="title_advanced_schedule">Schema</string>
     <string name="title_advanced_schedule_workdays">Werkdagen</string>
     <string name="title_advanced_schedule_weekend">Weekeinde</string>
@@ -1106,6 +1108,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_poll_folder">Controleer periodiek in plaats van continu synchroniseren</string>
     <string name="title_poll_folder_remark">De meeste e-mailservers staan push-berichten slechts voor een handvol mappen toe!</string>
     <string name="title_download_folder">Berichtteksten en bijlagen automatisch downloaden</string>
+    <string name="title_count_unread">Aantal ongelezen berichten aan de account toevoegen</string>
     <string name="title_notify_folder">Melding bij nieuwe berichten</string>
     <string name="title_auto_classify_source">Classificeer nieuwe berichten in deze map</string>
     <string name="title_auto_classify_target">Verplaats automatisch geclassificeerde berichten naar deze map</string>
@@ -1228,7 +1231,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_move">Verplaatsen</string>
     <string name="title_copy_btn">Kopiëren</string>
     <string name="title_keywords_btn">Sleutelwoorden</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Labels (alleen voor Gmail)</string>
+    <string name="title_labels_btn">Labels (alleen voor Gmail)</string>
     <string name="title_unsubscribe">Uitschrijven</string>
     <string name="title_message_rule">Maak regel</string>
     <string name="title_no_junk">Geen spam</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 9caefac6dd..e5d6639a6e 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -176,7 +176,7 @@
     <string name="title_list_identities">Tożsamości</string>
     <string name="title_edit_account">Edytuj konto</string>
     <string name="title_edit_identity">Edytuj tożsamość</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nowy folder</string>
+    <string name="title_new_folder">Nowy folder</string>
     <string name="title_edit_folder">Edytuj folder</string>
     <string name="title_disable_gmail">Wyłącz aplikację Gmail</string>
     <string name="title_setup">Ustawienia</string>
@@ -375,6 +375,8 @@
     <string name="title_advanced_when">Kiedy</string>
     <string name="title_advanced_optimize">Optymalizuj automatycznie</string>
     <string name="title_advanced_always">Zawsze odbieraj wiadomości z tych kont</string>
+    <string name="title_advanced_poll_metered">Okresowo sprawdzaj nowe wiadomości, gdy sieć jest mierzona</string>
+    <string name="title_advanced_poll_unmetered">Okresowo sprawdzaj nowe wiadomości, gdy sieć nie jest mierzona</string>
     <string name="title_advanced_schedule">Harmonogram</string>
     <string name="title_advanced_schedule_workdays">Dni pracujące</string>
     <string name="title_advanced_schedule_weekend">Weekend</string>
@@ -1137,6 +1139,7 @@
     <string name="title_poll_folder">Sprawdzaj cyklicznie zamiast ciągłej synchronizacji</string>
     <string name="title_poll_folder_remark">Większość serwerów e-mail pozwala na wysyłanie wiadomości tylko dla kilku folderów!</string>
     <string name="title_download_folder">Automatycznie pobieraj treści wiadomości i załączniki</string>
+    <string name="title_count_unread">Dodaj liczbę nieprzeczytanych wiadomości do konta</string>
     <string name="title_notify_folder">Powiadom o nowych wiadomościach</string>
     <string name="title_auto_classify_source">Klasyfikuj nowe wiadomości w tym folderze</string>
     <string name="title_auto_classify_target">Automatycznie przenoś wiadomości zaklasyfikowane do tego folderu</string>
@@ -1259,7 +1262,7 @@
     <string name="title_move">Przenieś</string>
     <string name="title_copy_btn">Kopiuj</string>
     <string name="title_keywords_btn">Słowa kluczowe</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etykiety (tylko Gmail)</string>
+    <string name="title_labels_btn">Etykiety (tylko Gmail)</string>
     <string name="title_unsubscribe">Anuluj subskrypcję</string>
     <string name="title_message_rule">Utwórz regułę</string>
     <string name="title_no_junk">To nie jest spam</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 888c2b0c56..ae3ee85bc0 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Identidades</string>
     <string name="title_edit_account">Editar conta</string>
     <string name="title_edit_identity">Editar identidade</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nova pasta</string>
+    <string name="title_new_folder">Nova pasta</string>
     <string name="title_edit_folder">Editar pasta</string>
     <string name="title_disable_gmail">Desabilitar o app Gmail</string>
     <string name="title_setup">Configurações</string>
@@ -347,6 +347,8 @@
     <string name="title_advanced_when">Quando</string>
     <string name="title_advanced_optimize">Otimizar automaticamente</string>
     <string name="title_advanced_always">Sempre receber mensagens para estas contas</string>
+    <string name="title_advanced_poll_metered">Verificar periodicamente novas mensagens enquanto estiver em uma rede limitada</string>
+    <string name="title_advanced_poll_unmetered">Verificar periodicamente novas mensagens enquanto estiver em uma rede ilimitada</string>
     <string name="title_advanced_schedule">Programar</string>
     <string name="title_advanced_schedule_workdays">Dias úteis</string>
     <string name="title_advanced_schedule_weekend">Fim de Semana</string>
@@ -1110,6 +1112,7 @@
     <string name="title_poll_folder">Verificar periodicamente ao invés da sincronização contínua</string>
     <string name="title_poll_folder_remark">A maioria dos servidores de e-mail permite notificações push apenas para certa quantidade de pastas!</string>
     <string name="title_download_folder">Baixar automaticamente textos e anexos de mensagem</string>
+    <string name="title_count_unread">Adicione o número de mensagens não lidas à conta</string>
     <string name="title_notify_folder">Notificar novas mensagens</string>
     <string name="title_auto_classify_source">Classificar novas mensagens nesta pasta</string>
     <string name="title_auto_classify_target">Automaticamente mover mensagens classificadas para esta pasta</string>
@@ -1232,7 +1235,7 @@
     <string name="title_move">Mover</string>
     <string name="title_copy_btn">Copiar</string>
     <string name="title_keywords_btn">Palavras-chave</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Rótulos (Gmail somente)</string>
+    <string name="title_labels_btn">Rótulos (Gmail somente)</string>
     <string name="title_unsubscribe">Desinscrever</string>
     <string name="title_message_rule">Criar regra</string>
     <string name="title_no_junk">Não é spam</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 87d759d9f7..a12089de7b 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Identidades</string>
     <string name="title_edit_account">Editar conta</string>
     <string name="title_edit_identity">Editar identidade</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nova pasta</string>
+    <string name="title_new_folder">Nova pasta</string>
     <string name="title_edit_folder">Editar pasta</string>
     <string name="title_disable_gmail">Desactivar a aplicação Gmail</string>
     <string name="title_setup">Definições</string>
@@ -349,6 +349,8 @@
     <string name="title_advanced_when">Quando</string>
     <string name="title_advanced_optimize">Optimizar automaticamente</string>
     <string name="title_advanced_always">Receber sempre mensagens para estas contas</string>
+    <string name="title_advanced_poll_metered">Periodicamente verificar novas mensagens enquanto estiver numa ligação limitada</string>
+    <string name="title_advanced_poll_unmetered">Periodicamente verificar novas mensagens enquanto estiver numa ligação ilimitada</string>
     <string name="title_advanced_schedule">Agendamento</string>
     <string name="title_advanced_schedule_workdays">Dias úteis</string>
     <string name="title_advanced_schedule_weekend">Fim de semana</string>
@@ -1112,6 +1114,7 @@ Portanto, este problema só pode ser resolvido pelo seu provedor de e-mail - a i
     <string name="title_poll_folder">Verificar periodicamente em vez da sincronização contínua</string>
     <string name="title_poll_folder_remark">A maioria dos servidores de e-mail apenas permite mensagens push em determinadas pastas!</string>
     <string name="title_download_folder">Transferir automaticamente todos os textos e anexos das mensagens</string>
+    <string name="title_count_unread">Adicionar o número de mensagens não lidas à conta</string>
     <string name="title_notify_folder">Notificação de novas mensagens</string>
     <string name="title_auto_classify_source">Classificar novas mensagens nesta pasta</string>
     <string name="title_auto_classify_target">Mover automaticamente as mensagens classificadas para esta pasta</string>
@@ -1235,7 +1238,7 @@ Portanto, este problema só pode ser resolvido pelo seu provedor de e-mail - a i
     <string name="title_move">Mover</string>
     <string name="title_copy_btn">Copiar</string>
     <string name="title_keywords_btn">Palavras-chave</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etiquetas (só no Gmail)</string>
+    <string name="title_labels_btn">Etiquetas (só no Gmail)</string>
     <string name="title_unsubscribe">Cancelar Subscrição</string>
     <string name="title_message_rule">Criar regra</string>
     <string name="title_no_junk">Não é spam</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 3f2a10c3de..d21817cfd3 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -162,7 +162,7 @@
     <string name="title_list_identities">Identități</string>
     <string name="title_edit_account">Editare cont</string>
     <string name="title_edit_identity">Editare identitate</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Dosar nou</string>
+    <string name="title_new_folder">Dosar nou</string>
     <string name="title_edit_folder">Editare dosar</string>
     <string name="title_disable_gmail">Dezactivați aplicația Gmail</string>
     <string name="title_setup">Setări</string>
@@ -1246,7 +1246,7 @@
     <string name="title_move">Mută</string>
     <string name="title_copy_btn">Copiere</string>
     <string name="title_keywords_btn">Cuvinte cheie</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etichete (doar Gmail)</string>
+    <string name="title_labels_btn">Etichete (doar Gmail)</string>
     <string name="title_unsubscribe">Dezabonare</string>
     <string name="title_message_rule">Creare regulă</string>
     <string name="title_no_junk">Nu este spam</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 19bfbfb3c9..37722aa4b9 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -176,7 +176,7 @@
     <string name="title_list_identities">Идентификаторы</string>
     <string name="title_edit_account">Изменить учётную запись</string>
     <string name="title_edit_identity">Изменить идентификатор</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Новая папка</string>
+    <string name="title_new_folder">Новая папка</string>
     <string name="title_edit_folder">Изменить папку</string>
     <string name="title_disable_gmail">Отключить приложение Gmail</string>
     <string name="title_setup">Настройки</string>
@@ -375,6 +375,8 @@
     <string name="title_advanced_when">Когда</string>
     <string name="title_advanced_optimize">Автоматическая оптимизация</string>
     <string name="title_advanced_always">Непрерывно получать сообщения с этих учётных записей</string>
+    <string name="title_advanced_poll_metered">Периодически проверять новые сообщения при лимитированном подключении</string>
+    <string name="title_advanced_poll_unmetered">Периодически проверять новые сообщения при безлимитном подключении</string>
     <string name="title_advanced_schedule">Расписание</string>
     <string name="title_advanced_schedule_workdays">Будни</string>
     <string name="title_advanced_schedule_weekend">Выходные</string>
@@ -1139,6 +1141,7 @@
     <string name="title_poll_folder">Периодическая проверка вместо непрерывной синхронизации</string>
     <string name="title_poll_folder_remark">Большинство почтовых серверов позволяют отправлять сообщения только для некоторых папок!</string>
     <string name="title_download_folder">Автоматически загружать текст сообщений и вложения</string>
+    <string name="title_count_unread">Добавлять количество непрочитанных сообщений к учётной записи</string>
     <string name="title_notify_folder">Уведомлять о новых сообщениях</string>
     <string name="title_auto_classify_source">Классифицировать новые сообщения в этой папке</string>
     <string name="title_auto_classify_target">Автоматически перемещать классифицированные сообщения в эту папку</string>
@@ -1262,7 +1265,7 @@
     <string name="title_move">Переместить</string>
     <string name="title_copy_btn">Копировать</string>
     <string name="title_keywords_btn">Ключевые слова</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Метки (только Gmail)</string>
+    <string name="title_labels_btn">Метки (только Gmail)</string>
     <string name="title_unsubscribe">Отписаться</string>
     <string name="title_message_rule">Создать правило</string>
     <string name="title_no_junk">Не спам</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 3eb061debc..9496f9b5df 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -148,7 +148,7 @@
     <string name="title_list_identities">Identiteter</string>
     <string name="title_edit_account">Redigera konto</string>
     <string name="title_edit_identity">Redigera identitet</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Ny mapp</string>
+    <string name="title_new_folder">Ny mapp</string>
     <string name="title_edit_folder">Redigera mapp</string>
     <string name="title_disable_gmail">Inaktivera Gmail-app</string>
     <string name="title_setup">Inställningar</string>
@@ -344,6 +344,8 @@
     <string name="title_advanced_when">När</string>
     <string name="title_advanced_optimize">Optimera automatiskt</string>
     <string name="title_advanced_always">Ta alltid emot meddelanden för dessa konton</string>
+    <string name="title_advanced_poll_metered">Sök regelbundet efter nya meddelanden när du befinner dig på ett nätverk med begränsad datamängd</string>
+    <string name="title_advanced_poll_unmetered">Kontrollera regelbundet nya meddelanden när du är på ett nätverk med obegränsad datamängd</string>
     <string name="title_advanced_schedule">Schema</string>
     <string name="title_advanced_schedule_workdays">Vardagar</string>
     <string name="title_advanced_schedule_weekend">Helg</string>
@@ -1104,6 +1106,7 @@
     <string name="title_poll_folder">Kontrollera regelbundet istället för kontinuerlig synkronisering</string>
     <string name="title_poll_folder_remark">De flesta e-postservrar tillåter endast push-meddelanden för en handfull mappar!</string>
     <string name="title_download_folder">Hämta automatiskt meddelandetexter och bilagor</string>
+    <string name="title_count_unread">Lägg till antalet olästa meddelanden till kontot</string>
     <string name="title_notify_folder">Notifiera för nya meddelanden</string>
     <string name="title_auto_classify_source">Klassificera nya meddelanden i denna mapp</string>
     <string name="title_auto_classify_target">Flytta automatiskt klassificerade meddelanden till denna mapp</string>
@@ -1226,7 +1229,7 @@
     <string name="title_move">Flytta</string>
     <string name="title_copy_btn">Kopiera</string>
     <string name="title_keywords_btn">Nyckelord</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etiketter (endast Gmail)</string>
+    <string name="title_labels_btn">Etiketter (endast Gmail)</string>
     <string name="title_unsubscribe">Avbryt prenumeration</string>
     <string name="title_message_rule">Skapa regel</string>
     <string name="title_no_junk">Inte skräppost</string>
diff --git a/app/src/main/res/values-szl-rPL/strings.xml b/app/src/main/res/values-szl-rPL/strings.xml
index 9caefac6dd..e5d6639a6e 100644
--- a/app/src/main/res/values-szl-rPL/strings.xml
+++ b/app/src/main/res/values-szl-rPL/strings.xml
@@ -176,7 +176,7 @@
     <string name="title_list_identities">Tożsamości</string>
     <string name="title_edit_account">Edytuj konto</string>
     <string name="title_edit_identity">Edytuj tożsamość</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Nowy folder</string>
+    <string name="title_new_folder">Nowy folder</string>
     <string name="title_edit_folder">Edytuj folder</string>
     <string name="title_disable_gmail">Wyłącz aplikację Gmail</string>
     <string name="title_setup">Ustawienia</string>
@@ -375,6 +375,8 @@
     <string name="title_advanced_when">Kiedy</string>
     <string name="title_advanced_optimize">Optymalizuj automatycznie</string>
     <string name="title_advanced_always">Zawsze odbieraj wiadomości z tych kont</string>
+    <string name="title_advanced_poll_metered">Okresowo sprawdzaj nowe wiadomości, gdy sieć jest mierzona</string>
+    <string name="title_advanced_poll_unmetered">Okresowo sprawdzaj nowe wiadomości, gdy sieć nie jest mierzona</string>
     <string name="title_advanced_schedule">Harmonogram</string>
     <string name="title_advanced_schedule_workdays">Dni pracujące</string>
     <string name="title_advanced_schedule_weekend">Weekend</string>
@@ -1137,6 +1139,7 @@
     <string name="title_poll_folder">Sprawdzaj cyklicznie zamiast ciągłej synchronizacji</string>
     <string name="title_poll_folder_remark">Większość serwerów e-mail pozwala na wysyłanie wiadomości tylko dla kilku folderów!</string>
     <string name="title_download_folder">Automatycznie pobieraj treści wiadomości i załączniki</string>
+    <string name="title_count_unread">Dodaj liczbę nieprzeczytanych wiadomości do konta</string>
     <string name="title_notify_folder">Powiadom o nowych wiadomościach</string>
     <string name="title_auto_classify_source">Klasyfikuj nowe wiadomości w tym folderze</string>
     <string name="title_auto_classify_target">Automatycznie przenoś wiadomości zaklasyfikowane do tego folderu</string>
@@ -1259,7 +1262,7 @@
     <string name="title_move">Przenieś</string>
     <string name="title_copy_btn">Kopiuj</string>
     <string name="title_keywords_btn">Słowa kluczowe</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etykiety (tylko Gmail)</string>
+    <string name="title_labels_btn">Etykiety (tylko Gmail)</string>
     <string name="title_unsubscribe">Anuluj subskrypcję</string>
     <string name="title_message_rule">Utwórz regułę</string>
     <string name="title_no_junk">To nie jest spam</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 5112b48ec4..9f1151ebd3 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -147,7 +147,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_list_identities">Kimlikler</string>
     <string name="title_edit_account">Hesabı Düzenle</string>
     <string name="title_edit_identity">Kimliği düzenle</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Yeni klasör</string>
+    <string name="title_new_folder">Yeni klasör</string>
     <string name="title_edit_folder">Klasörü düzenle</string>
     <string name="title_disable_gmail">Gmail \'i devre dışı bırak</string>
     <string name="title_setup">Ayarlar</string>
@@ -346,6 +346,8 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_advanced_when">Ne zaman</string>
     <string name="title_advanced_optimize">Otomatik olarak optimize et</string>
     <string name="title_advanced_always">Bu hesaplardan mesajları her zaman al</string>
+    <string name="title_advanced_poll_metered">Ölçülü bir ağdayken periyodik olarak yeni mesajları kontrol edin</string>
+    <string name="title_advanced_poll_unmetered">Ölçülmeyen bir ağdayken periyodik olarak yeni mesajları kontrol edin</string>
     <string name="title_advanced_schedule">Program</string>
     <string name="title_advanced_schedule_workdays">İş günleri</string>
     <string name="title_advanced_schedule_weekend">Haftasonu</string>
@@ -1107,6 +1109,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_poll_folder">Sürekli senkronizasyon yerine belirli aralıklarla kontrol et</string>
     <string name="title_poll_folder_remark">Çoğu e-posta sunucusu push mesajlarına yalnızca birkaç klasör için izin verir!</string>
     <string name="title_download_folder">İleti metinlerini ve eklerini otomatik olarak indir</string>
+    <string name="title_count_unread">Okunmamış mesaj sayısını hesaba ekleyin</string>
     <string name="title_notify_folder">Yeni iletileri bildir</string>
     <string name="title_auto_classify_source">Bu klasördeki yeni iletileri sınıflandır</string>
     <string name="title_auto_classify_target">Sınıflandırılmış iletileri otomatik olarak bu klasöre taşı</string>
@@ -1228,7 +1231,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_move">Taşı</string>
     <string name="title_copy_btn">Kopyala</string>
     <string name="title_keywords_btn">Anahtar Sözcükler/Kelimeler</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Etiketler (yalnızca Gmail)</string>
+    <string name="title_labels_btn">Etiketler (yalnızca Gmail)</string>
     <string name="title_unsubscribe">Abonelikten çık</string>
     <string name="title_message_rule">Kural oluştur</string>
     <string name="title_no_junk">Spam değil</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 3e080ceae6..51c7315961 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -177,7 +177,7 @@
     <string name="title_list_identities">Профілі</string>
     <string name="title_edit_account">Редагувати обліковий запис</string>
     <string name="title_edit_identity">Редагувати профіль</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">Нова тека</string>
+    <string name="title_new_folder">Нова тека</string>
     <string name="title_edit_folder">Редагувати теку</string>
     <string name="title_disable_gmail">Вимкнути додаток Gmail</string>
     <string name="title_setup">Налаштування</string>
@@ -376,6 +376,8 @@
     <string name="title_advanced_when">Коли</string>
     <string name="title_advanced_optimize">Автоматично оптимізувати</string>
     <string name="title_advanced_always">Завжди отримувати повідомлення для цих облікових записів</string>
+    <string name="title_advanced_poll_metered">Періодично перевіряти наявність нових повідомлень при підключенні до лімітованої мережі</string>
+    <string name="title_advanced_poll_unmetered">Періодично перевіряти наявність нових повідомлень при підключенні до безлімітної мережі</string>
     <string name="title_advanced_schedule">Розклад</string>
     <string name="title_advanced_schedule_workdays">Робочі дні</string>
     <string name="title_advanced_schedule_weekend">Вихідні</string>
@@ -458,7 +460,7 @@
     <string name="title_advanced_lookup_mx">Перевіряти адреси електронної пошти одержувача перед надсиланням</string>
     <string name="title_advanced_metered">Використовувати лімітовані підключення</string>
     <string name="title_advanced_download">Автоматично завантажувати повідомлення і вкладення при лімітованому з\'єднанні обсягом до</string>
-    <string name="title_advanced_download_limited">Застосовувати це також до нелімітованих підключень</string>
+    <string name="title_advanced_download_limited">Застосовувати це також до безлімітних підключень</string>
     <string name="title_advanced_roaming">Завантажувати повідомлення та вкладення у роумінгу</string>
     <string name="title_advanced_rlah">В роумінгу як вдома</string>
     <string name="title_advanced_download_headers">Завантажувати всі заголовки повідомлень</string>
@@ -1002,7 +1004,7 @@
     <string name="title_received_header">Використовувати заголовок «Received»</string>
     <string name="title_date_header">Використовувати заголовок «Date» (час відправлення)</string>
     <string name="title_date_remark">Зміни будуть застосовані тільки до нових повідомлень</string>
-    <string name="title_unmetered_only">Підключатися тільки через нелімітовані мережі</string>
+    <string name="title_unmetered_only">Підключатися тільки через безлімітні мережі</string>
     <string name="title_ignore_schedule">Синхронізувати також і за межами розкладу</string>
     <string name="title_related_identity">Додати пов\'язаний профіль (сервер SMTP)</string>
     <string name="title_check">Перевірити</string>
@@ -1138,6 +1140,7 @@
     <string name="title_poll_folder">Перевіряти періодично замість неперервної синхронізації</string>
     <string name="title_poll_folder_remark">Більшість серверів електронної пошти дозволяють push повідомлення тільки для невеликої кількості тек!</string>
     <string name="title_download_folder">Автоматично завантажувати тексти та вкладення</string>
+    <string name="title_count_unread">Додати до облікового запису кількість непрочитаних повідомлень</string>
     <string name="title_notify_folder">Сповіщати про нові повідомлення</string>
     <string name="title_auto_classify_source">Класифікувати нові повідомлення в цій теці</string>
     <string name="title_auto_classify_target">Автоматично переміщати класифіковані повідомлення в цю теку</string>
@@ -1261,7 +1264,7 @@
     <string name="title_move">Перемістити</string>
     <string name="title_copy_btn">Копіювати</string>
     <string name="title_keywords_btn">Ключові слова</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">Мітки (тільки для Gmail)</string>
+    <string name="title_labels_btn">Мітки (тільки для Gmail)</string>
     <string name="title_unsubscribe">Відписатися</string>
     <string name="title_message_rule">Створити правило</string>
     <string name="title_no_junk">Не спам</string>
@@ -1842,8 +1845,8 @@
     <string name="title_legend_italic">Зробити текст курсивом</string>
     <string name="title_legend_underline">Підкреслити текст</string>
     <string name="title_legend_text_style">Встановити стиль тексту</string>
-    <string name="title_legend_metered">Підключення з тарифікацією</string>
-    <string name="title_legend_unmetered">Підключення нетарифіковане</string>
+    <string name="title_legend_metered">Підключення лімітоване</string>
+    <string name="title_legend_unmetered">Підключення безлімітне</string>
     <string name="title_legend_roaming">Роумінг</string>
     <string name="title_legend_expander">Розкривач</string>
     <string name="title_legend_avatar">Аватар</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 33363c3427..ff4afbfd85 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -134,7 +134,7 @@
     <string name="title_list_identities">身份</string>
     <string name="title_edit_account">编辑账户</string>
     <string name="title_edit_identity">编辑身份</string>
-    <string name="title_new_folder" comment="title_new_folder&#10;Title for new folder dialog screen">新建文件夹</string>
+    <string name="title_new_folder">新建文件夹</string>
     <string name="title_edit_folder">编辑文件夹</string>
     <string name="title_disable_gmail">禁用 Gmail 应用</string>
     <string name="title_setup">设置</string>
@@ -333,6 +333,8 @@
     <string name="title_advanced_when">何时</string>
     <string name="title_advanced_optimize">自动优化</string>
     <string name="title_advanced_always">总是接收这些账户的消息</string>
+    <string name="title_advanced_poll_metered">在按流量计费网络上定期检查新消息</string>
+    <string name="title_advanced_poll_unmetered">在不按流量计费网络上定期检查新消息</string>
     <string name="title_advanced_schedule">计划任务</string>
     <string name="title_advanced_schedule_workdays">工作日</string>
     <string name="title_advanced_schedule_weekend">周末</string>
@@ -1095,6 +1097,7 @@
     <string name="title_poll_folder">用定期检索代替持续同步(即推送)</string>
     <string name="title_poll_folder_remark">大多数电子邮件服务器仅允许少数文件夹推送消息！</string>
     <string name="title_download_folder">自动下载邮件文本和附件</string>
+    <string name="title_count_unread">添加未读消息数量到账户</string>
     <string name="title_notify_folder">通知新邮件</string>
     <string name="title_auto_classify_source">对此文件夹中的新消息进行分类</string>
     <string name="title_auto_classify_target">自动将分类的邮件移动到此文件夹</string>
@@ -1216,7 +1219,7 @@
     <string name="title_move">移动</string>
     <string name="title_copy_btn">复制</string>
     <string name="title_keywords_btn">关键词</string>
-    <string name="title_labels_btn" comment="title_labels_btn&#10;Title for option to disable Gmail labels button">标签 (仅 Gmail)</string>
+    <string name="title_labels_btn">标签 (仅 Gmail)</string>
     <string name="title_unsubscribe">取消订阅</string>
     <string name="title_message_rule">创建规则</string>
     <string name="title_no_junk">不是垃圾邮件</string>