diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index faf18f195a..ce8dd24799 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -106,12 +106,12 @@
     <string name="title_advanced_preview">عرض معاينة الرسالة</string>
     <string name="title_advanced_images">أظهر تلقائيا صور المُراسِلين المعروفين</string>
     <string name="title_advanced_actionbar">شريط إجراءات المحادثة</string>
-    <string name="title_advanced_light">استخدم الإشعار الضوئي</string>
-    <string name="title_advanced_sound">إختر نغمة التنبيه</string>
     <string name="title_advanced_pull_refresh">اسحب لأسفل للتحديث</string>
     <string name="title_advanced_automove">تأكيد نقل الرسائل</string>
     <string name="title_advanced_sender">السماح بتغيير عنوان المُرسِل</string>
     <string name="title_advanced_autosend">تأكيد إرسال الرسائل</string>
+    <string name="title_advanced_light">استخدم الإشعار الضوئي</string>
+    <string name="title_advanced_sound">إختر نغمة التنبيه</string>
     <string name="title_advanced_updates">فحص التحديثات</string>
     <string name="title_advanced_debug">وضع التصحيح</string>
     <string name="title_identity_name">إسمك</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index faf18f195a..ce8dd24799 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -106,12 +106,12 @@
     <string name="title_advanced_preview">عرض معاينة الرسالة</string>
     <string name="title_advanced_images">أظهر تلقائيا صور المُراسِلين المعروفين</string>
     <string name="title_advanced_actionbar">شريط إجراءات المحادثة</string>
-    <string name="title_advanced_light">استخدم الإشعار الضوئي</string>
-    <string name="title_advanced_sound">إختر نغمة التنبيه</string>
     <string name="title_advanced_pull_refresh">اسحب لأسفل للتحديث</string>
     <string name="title_advanced_automove">تأكيد نقل الرسائل</string>
     <string name="title_advanced_sender">السماح بتغيير عنوان المُرسِل</string>
     <string name="title_advanced_autosend">تأكيد إرسال الرسائل</string>
+    <string name="title_advanced_light">استخدم الإشعار الضوئي</string>
+    <string name="title_advanced_sound">إختر نغمة التنبيه</string>
     <string name="title_advanced_updates">فحص التحديثات</string>
     <string name="title_advanced_debug">وضع التصحيح</string>
     <string name="title_identity_name">إسمك</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index faf18f195a..ce8dd24799 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -106,12 +106,12 @@
     <string name="title_advanced_preview">عرض معاينة الرسالة</string>
     <string name="title_advanced_images">أظهر تلقائيا صور المُراسِلين المعروفين</string>
     <string name="title_advanced_actionbar">شريط إجراءات المحادثة</string>
-    <string name="title_advanced_light">استخدم الإشعار الضوئي</string>
-    <string name="title_advanced_sound">إختر نغمة التنبيه</string>
     <string name="title_advanced_pull_refresh">اسحب لأسفل للتحديث</string>
     <string name="title_advanced_automove">تأكيد نقل الرسائل</string>
     <string name="title_advanced_sender">السماح بتغيير عنوان المُرسِل</string>
     <string name="title_advanced_autosend">تأكيد إرسال الرسائل</string>
+    <string name="title_advanced_light">استخدم الإشعار الضوئي</string>
+    <string name="title_advanced_sound">إختر نغمة التنبيه</string>
     <string name="title_advanced_updates">فحص التحديثات</string>
     <string name="title_advanced_debug">وضع التصحيح</string>
     <string name="title_identity_name">إسمك</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index faf18f195a..ce8dd24799 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -106,12 +106,12 @@
     <string name="title_advanced_preview">عرض معاينة الرسالة</string>
     <string name="title_advanced_images">أظهر تلقائيا صور المُراسِلين المعروفين</string>
     <string name="title_advanced_actionbar">شريط إجراءات المحادثة</string>
-    <string name="title_advanced_light">استخدم الإشعار الضوئي</string>
-    <string name="title_advanced_sound">إختر نغمة التنبيه</string>
     <string name="title_advanced_pull_refresh">اسحب لأسفل للتحديث</string>
     <string name="title_advanced_automove">تأكيد نقل الرسائل</string>
     <string name="title_advanced_sender">السماح بتغيير عنوان المُرسِل</string>
     <string name="title_advanced_autosend">تأكيد إرسال الرسائل</string>
+    <string name="title_advanced_light">استخدم الإشعار الضوئي</string>
+    <string name="title_advanced_sound">إختر نغمة التنبيه</string>
     <string name="title_advanced_updates">فحص التحديثات</string>
     <string name="title_advanced_debug">وضع التصحيح</string>
     <string name="title_identity_name">إسمك</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 68a5796e51..15304e7a7f 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -96,16 +96,15 @@
     <string name="title_advanced_identicons">İdentikon-ları göstər</string>
     <string name="title_advanced_preview">Mesaj ilkin baxışını göstər</string>
     <string name="title_advanced_actionbar">Söhbət hərəkət sətri</string>
-    <string name="title_advanced_light">Bildiriş işığından istifadə et</string>
-    <string name="title_advanced_sound">Bildiriş səsi seç</string>
     <string name="title_advanced_pull_refresh">Təzələmək üçün aşağı çəkin</string>
+    <string name="title_advanced_collapse">\'Geri\' mövzusundakı danışıqda mesajları daralt</string>
     <string name="title_advanced_autoclose">Söhbətləri avtomatik bağla</string>
     <string name="title_advanced_autoread">Hərəkətli mesajlarda oxunan mesajları avtomatik işarələ</string>
-    <string name="title_advanced_collapse">\'Geri\' mövzusundakı danışıqda mesajları daralt</string>
     <string name="title_advanced_automove">Hərəkətli mesajları təsdiqlə</string>
-    <string name="title_advanced_confirm">Gizlilik həssaslı məlumatların sızmasına səbəb ola biləcək hərəkətləri təsdiqlə</string>
     <string name="title_advanced_sender">Göndərənin ünvanına düzəlişə icazə ver</string>
     <string name="title_advanced_autosend">Mesajların göndərilməsini təsdiqlə</string>
+    <string name="title_advanced_light">Bildiriş işığından istifadə et</string>
+    <string name="title_advanced_sound">Bildiriş səsi seç</string>
     <string name="title_advanced_updates">Yeniləmələri yoxla</string>
     <string name="title_advanced_debug">Sazlama rejimi</string>
     <string name="title_advanced_enabled_hint">Qlobal olaraq mesajların göndərilməsi və alınmasını fəallaşdır və ya ləğv et</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index e510b751e3..1a397edae5 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -115,6 +115,8 @@
     <string name="title_advanced_section_behavior">Verhalten</string>
     <string name="title_advanced_section_misc">Verschiedenes</string>
     <string name="title_advanced_enabled">Synchronisieren</string>
+    <string name="title_advanced_schedule">Zeitplan</string>
+    <string name="title_advanced_schedule_hint">Tippen Sie auf eine Zeit, um den Zeitplan zu ändern</string>
     <string name="title_advanced_metered">Getaktete Verbindungen verwenden</string>
     <string name="title_advanced_download">Automatisches Herunterladen von E-Mails und Anhängen auf getakteten Verbindungen bis zu einer Größe von</string>
     <string name="title_advanced_browse">E-Mails auf dem Server durchsuchen</string>
@@ -129,21 +131,20 @@
     <string name="title_advanced_html">Für bekannte Kontakte Mails automatisch im Original-Format anzeigen</string>
     <string name="title_advanced_images">Für bekannte Kontakte Bilder automatisch anzeigen</string>
     <string name="title_advanced_actionbar">Navigationsleiste in Konversationen</string>
-    <string name="title_advanced_notify_preview">Zeige die Nachrichten-Vorschau in den Benachrichtigungen</string>
-    <string name="title_advanced_light">Benachrichtigungslicht verwenden</string>
-    <string name="title_advanced_sound">Benachrichtigungston auswählen</string>
     <string name="title_advanced_pull_refresh">Zum Aktualisieren nach unten ziehen</string>
+    <string name="title_advanced_swipenav">Wische nach links/rechts, um zum nächsten/vorherigen Gespräch zu gehen</string>
     <string name="title_advanced_autoexpand">Nachrichten automatisch erweitern</string>
+    <string name="title_advanced_collapse">\'Zurück\' klappt die Konversationsansicht zusammen</string>
     <string name="title_advanced_autoclose">Konversationen automatisch schließen</string>
-    <string name="title_advanced_swipenav">Wische nach links/rechts, um zum nächsten/vorherigen Gespräch zu gehen</string>
     <string name="title_advanced_autonext">Automatisch beim Schließen einer Konversation zur nächsten Konversation wechseln</string>
     <string name="title_advanced_autoread">Nachrichten beim Verschieben automatisch als gelesen markieren</string>
-    <string name="title_advanced_collapse">\'Zurück\' klappt die Konversationsansicht zusammen</string>
     <string name="title_advanced_automove">Verschieben von Nachrichten bestätigen</string>
-    <string name="title_advanced_confirm">Aktionen bestätigen, die datenschutzrelevante Information preisgeben können</string>
     <string name="title_advanced_autoresize">Bildgröße automatisch für das Anzeigen auf Displays ändern</string>
     <string name="title_advanced_sender">Bearbeitung der Absenderadresse erlauben</string>
     <string name="title_advanced_autosend">Senden von E-Mails bestätigen</string>
+    <string name="title_advanced_notify_preview">Zeige die Nachrichten-Vorschau in den Benachrichtigungen</string>
+    <string name="title_advanced_light">Benachrichtigungslicht verwenden</string>
+    <string name="title_advanced_sound">Benachrichtigungston auswählen</string>
     <string name="title_advanced_updates">Nach Aktualisierungen suchen</string>
     <string name="title_advanced_debug">Debugmodus</string>
     <string name="title_advanced_enabled_hint">Vollständiges de-/aktivieren der Empfangs- und Versandfunktion von E-Mails</string>
@@ -154,6 +155,7 @@
     <string name="title_advanced_name_email_hint">Wenn deaktiviert, werden nur Namen angezeigt, sofern verfügbar</string>
     <string name="title_advanced_preview_hint">Nur verfügbar, wenn der E-Mail-Text heruntergeladen wurde</string>
     <string name="title_advanced_autoexpand_hint">Eine (ungelesene) Nachricht wird automatisch geöffnet</string>
+    <string name="title_advanced_autocollapse_hint">Mehrere erweiterte Nachrichten werden immer auf \'zurück\' geschlossen</string>
     <string name="title_advanced_autoclose_hint">Automatisches Schließen des Unterhaltungsthreads, wenn alle E-Mails archiviert, gesendet oder gelöscht wurden</string>
     <string name="title_advanced_sender_hint">Die meisten Anbieter erlauben keine veränderten Absenderadressen</string>
     <string name="title_select">Wählen Sie &#8230;</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b2d29afe6b..fad8056584 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -129,21 +129,20 @@
     <string name="title_advanced_html">Mostrar mensaje original automáticamente para contactos conocidos</string>
     <string name="title_advanced_images">Mostrar imágenes automáticamente para contactos conocidos</string>
     <string name="title_advanced_actionbar">Barra de acciones de conversación</string>
-    <string name="title_advanced_notify_preview">Mostrar vista previa del mensaje en notificaciones</string>
-    <string name="title_advanced_light">Usar luz de notificación</string>
-    <string name="title_advanced_sound">Seleccionar sonido de notificación</string>
     <string name="title_advanced_pull_refresh">Tire hacia abajo para actualizar</string>
+    <string name="title_advanced_swipenav">Deslice a la izquierda/derecha para ir a la siguiente/anterior conversación</string>
     <string name="title_advanced_autoexpand">Expandir mensajes automáticamente</string>
+    <string name="title_advanced_collapse">Contraer mensajes en conversaciones al ir \'atrás\'</string>
     <string name="title_advanced_autoclose">Cerrar conversaciones automáticamente</string>
-    <string name="title_advanced_swipenav">Deslice a la izquierda/derecha para ir a la siguiente/anterior conversación</string>
     <string name="title_advanced_autonext">Al cerrar una conversación, ir automáticamente a la siguiente</string>
     <string name="title_advanced_autoread">Marcar mensaje como leído automáticamente al moverlo</string>
-    <string name="title_advanced_collapse">Contraer mensajes en conversaciones al ir \'atrás\'</string>
     <string name="title_advanced_automove">Confirmar mover mensajes</string>
-    <string name="title_advanced_confirm">Confirmar acciones que podrían filtrar información privada sensible</string>
     <string name="title_advanced_autoresize">Redimensionar imágenes automáticamente para mostrar en pantallas</string>
     <string name="title_advanced_sender">Permitir editar dirección del remitente</string>
     <string name="title_advanced_autosend">Confirmar enviar mensajes</string>
+    <string name="title_advanced_notify_preview">Mostrar vista previa del mensaje en notificaciones</string>
+    <string name="title_advanced_light">Usar luz de notificación</string>
+    <string name="title_advanced_sound">Seleccionar sonido de notificación</string>
     <string name="title_advanced_updates">Buscar actualizaciones</string>
     <string name="title_advanced_debug">Modo de depuración</string>
     <string name="title_advanced_enabled_hint">Desactivar o activar globalmente la recepción y envío de mensajes</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 92474b96d3..f17ff971a2 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -99,20 +99,19 @@
     <string name="title_advanced_html">نمایش خودکار پیام‌های مخاطبین شناخته شده به صورت اصلی</string>
     <string name="title_advanced_images">نمایش خودکار تصاویر برای مخاطبین شناخته شده</string>
     <string name="title_advanced_actionbar">نوار اکشن بار مکالمه</string>
-    <string name="title_advanced_light">استفاده از چراغ اعلان‌ها</string>
-    <string name="title_advanced_sound">انتخاب صدای اعلان‌ها</string>
     <string name="title_advanced_pull_refresh">برای بروزرسانی به پایین بکشید</string>
+    <string name="title_advanced_swipenav">کشیدن به چپ/راست برای رفتن به مکالمه بعدی/قبلی</string>
     <string name="title_advanced_autoexpand">بسط دادن خودکار پیام‌ها</string>
+    <string name="title_advanced_collapse">جمع شدن پیام‌ها در مکالمات در برگشت</string>
     <string name="title_advanced_autoclose">بستن خودکار مکالمات</string>
-    <string name="title_advanced_swipenav">کشیدن به چپ/راست برای رفتن به مکالمه بعدی/قبلی</string>
     <string name="title_advanced_autonext">رفتن به مکالمه بعدی به صورت خودکار پس از بستن مکالمه</string>
     <string name="title_advanced_autoread">به طور خودکار پیام‌های انتقال یافته به عنوان خوانده شده علامت گذاری شود</string>
-    <string name="title_advanced_collapse">جمع شدن پیام‌ها در مکالمات در برگشت</string>
     <string name="title_advanced_automove">تایید انتقال پیام‌ها</string>
-    <string name="title_advanced_confirm">تایید اقداماتی که ممکن است باعث درز اطلاعات حساس شوند</string>
     <string name="title_advanced_autoresize">تغییر اندازه تصاویر به صورت خودکار برای نمایش در صفحه نمایش</string>
     <string name="title_advanced_sender">اجازه ویرایش آدرس فرستنده</string>
     <string name="title_advanced_autosend">تایید ارسال پیام‌ها</string>
+    <string name="title_advanced_light">استفاده از چراغ اعلان‌ها</string>
+    <string name="title_advanced_sound">انتخاب صدای اعلان‌ها</string>
     <string name="title_advanced_updates">بررسی بروزرسانی ها</string>
     <string name="title_advanced_debug">حالت عیب‌یابی</string>
     <string name="title_advanced_enabled_hint">فعال یا غیرفعال سازی جهانی دریافت و ارسال پیام‌ها</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 921b76a052..a4016c005d 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -115,6 +115,8 @@
     <string name="title_advanced_section_behavior">Comportement</string>
     <string name="title_advanced_section_misc">Divers</string>
     <string name="title_advanced_enabled">Synchroniser</string>
+    <string name="title_advanced_schedule">Planifier</string>
+    <string name="title_advanced_schedule_hint">Appuyez sur une heure pour changer la planification</string>
     <string name="title_advanced_metered">Utiliser des connexions limitées</string>
     <string name="title_advanced_download">Télécharger automatiquement les messages et les pièces jointes avec une connexion limitée jusqu\'à</string>
     <string name="title_advanced_browse">Lire directement les messages sur le serveur</string>
@@ -129,21 +131,20 @@
     <string name="title_advanced_html">Afficher automatiquement le message initial pour les contacts connus</string>
     <string name="title_advanced_images">Afficher automatiquement les images des contacts connus</string>
     <string name="title_advanced_actionbar">Barre d\'action de conversation</string>
-    <string name="title_advanced_notify_preview">Afficher l\'aperçu du message dans les notifications</string>
-    <string name="title_advanced_light">Utiliser le voyant de notification</string>
-    <string name="title_advanced_sound">Sélectionner le son pour les notifications</string>
     <string name="title_advanced_pull_refresh">Tirer vers le bas pour actualiser</string>
+    <string name="title_advanced_swipenav">Balayez vers la gauche/droite pour passer à la conversation suivante/précédente</string>
     <string name="title_advanced_autoexpand">Développer automatiquement les messages</string>
+    <string name="title_advanced_collapse">Replier les messages dans les conversations en appuyant sur « Retour »</string>
     <string name="title_advanced_autoclose">Fermer automatiquement les conversations</string>
-    <string name="title_advanced_swipenav">Balayez vers la gauche/droite pour passer à la conversation suivante/précédente</string>
     <string name="title_advanced_autonext">Lors de la fermeture d\'une conversation, aller automatiquement sur la suivante</string>
     <string name="title_advanced_autoread">Marquer automatiquement le message comme lu lors de son déplacement</string>
-    <string name="title_advanced_collapse">Replier les messages dans les conversations en appuyant sur « Retour »</string>
     <string name="title_advanced_automove">Confirmer le déplacement des messages</string>
-    <string name="title_advanced_confirm">Confirmer les actions qui peuvent entraîner une fuite d\'informations sensibles privées</string>
     <string name="title_advanced_autoresize">Redimensionner automatiquement les images pour l\'affichage sur écrans</string>
     <string name="title_advanced_sender">Autoriser la modification de l\'adresse de l\'expéditeur</string>
     <string name="title_advanced_autosend">Confirmer l\'envoi des messages</string>
+    <string name="title_advanced_notify_preview">Afficher l\'aperçu du message dans les notifications</string>
+    <string name="title_advanced_light">Utiliser le voyant de notification</string>
+    <string name="title_advanced_sound">Sélectionner le son pour les notifications</string>
     <string name="title_advanced_updates">Vérifier les mises à jour</string>
     <string name="title_advanced_debug">Débogage</string>
     <string name="title_advanced_enabled_hint">Désactiver ou activer globalement la réception et l\'envoi de messages</string>
@@ -154,6 +155,7 @@
     <string name="title_advanced_name_email_hint">Si désactivé, seuls les noms seront affichés si disponibles</string>
     <string name="title_advanced_preview_hint">Disponible uniquement lorsque le texte du message a été téléchargé</string>
     <string name="title_advanced_autoexpand_hint">Ouvrir automatiquement le message lorsqu’il n’y a qu’un seul message ou seulement un message non lu dans une conversation</string>
+    <string name="title_advanced_autocollapse_hint">Les messages étendus multiples seront toujours fermés par \'retour\'</string>
     <string name="title_advanced_autoclose_hint">Fermer automatiquement les fils de conversation quand tous les messages sont archivés, envoyés ou mis à la corbeille</string>
     <string name="title_advanced_sender_hint">La plupart des fournisseurs n\'autorisent pas les adresses d\'expéditeur modifiées</string>
     <string name="title_select">Sélectionner &#8230;</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 72f7a870db..5f8b2155ac 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -129,21 +129,20 @@
     <string name="title_advanced_html">Mostra automaticamente il messaggio originale per i contatti conosciuti</string>
     <string name="title_advanced_images">Mostra automaticamente le immagini per i contatti conosciuti</string>
     <string name="title_advanced_actionbar">Barra di azione di conversazione</string>
-    <string name="title_advanced_notify_preview">Mostra anteprima messaggio nelle notifiche</string>
-    <string name="title_advanced_light">Usa il led di notifica</string>
-    <string name="title_advanced_sound">Seleziona il suono di notifica</string>
     <string name="title_advanced_pull_refresh">Trascina in basso per aggiornare</string>
+    <string name="title_advanced_swipenav">Scorri a sinistra/destra per andare alla conversazione successiva/precedente</string>
     <string name="title_advanced_autoexpand">Espandi automaticamente i messaggi</string>
+    <string name="title_advanced_collapse">Raggruppa i messaggi in conversazioni premendo \'indietro\'</string>
     <string name="title_advanced_autoclose">Chiudi automaticamente le conversazioni</string>
-    <string name="title_advanced_swipenav">Scorri a sinistra/destra per andare alla conversazione successiva/precedente</string>
     <string name="title_advanced_autonext">Passa automaticamente alla conversazione successiva nella conversazione stretta</string>
     <string name="title_advanced_autoread">Contrassegna automaticamente il messaggio come letto sul messaggio in movimento</string>
-    <string name="title_advanced_collapse">Raggruppa i messaggi in conversazioni premendo \'indietro\'</string>
     <string name="title_advanced_automove">Conferma i messaggi in movimento</string>
-    <string name="title_advanced_confirm">Conferma le azioni che potrebbero rivelare informazioni personali sensibili</string>
     <string name="title_advanced_autoresize">Ridimensiona automaticamente le immagini per la visualizzazione su schermi</string>
     <string name="title_advanced_sender">Consenti la modifica dell\'indirizzo mittente</string>
     <string name="title_advanced_autosend">Confermare l\'invio dei messaggi</string>
+    <string name="title_advanced_notify_preview">Mostra anteprima messaggio nelle notifiche</string>
+    <string name="title_advanced_light">Usa il led di notifica</string>
+    <string name="title_advanced_sound">Seleziona il suono di notifica</string>
     <string name="title_advanced_updates">Controlla aggiornamenti</string>
     <string name="title_advanced_debug">Debug</string>
     <string name="title_advanced_enabled_hint">Attiva o disattiva a livello globale la ricezione e l\'invio dei messaggi</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index ba2ec0ac6a..a3746e3c90 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -115,6 +115,8 @@
     <string name="title_advanced_section_behavior">Gedrag</string>
     <string name="title_advanced_section_misc">Diversen</string>
     <string name="title_advanced_enabled">Synchroniseren</string>
+    <string name="title_advanced_schedule">Schema</string>
+    <string name="title_advanced_schedule_hint">Tik op een tijd om het schema te wijzigen</string>
     <string name="title_advanced_metered">Gemeten verbindingen gebruiken</string>
     <string name="title_advanced_download">Automatisch downloaden van berichten en bijlagen op een gemeten verbinding tot</string>
     <string name="title_advanced_browse">Blader door berichten op de server</string>
@@ -129,21 +131,20 @@
     <string name="title_advanced_html">Automatisch originele bericht weergeven voor bekende contacten</string>
     <string name="title_advanced_images">Automatisch afbeeldingen weergeven voor bekende contacten</string>
     <string name="title_advanced_actionbar">Actiebalk gesprek</string>
-    <string name="title_advanced_notify_preview">Toon berichtvoorbeeld in meldingen</string>
-    <string name="title_advanced_light">Gebruik meldingslicht</string>
-    <string name="title_advanced_sound">Selecteer meldingsgeluid</string>
     <string name="title_advanced_pull_refresh">Omlaag schuiven om te verversen</string>
+    <string name="title_advanced_swipenav">Veeg links/rechts om naar het volgende/vorige gesprek te gaan</string>
     <string name="title_advanced_autoexpand">Berichten automatisch uitvouwen</string>
+    <string name="title_advanced_collapse">Berichten in gesprekken samenvouwen bij \'terug\'</string>
     <string name="title_advanced_autoclose">Gesprekken automatisch sluiten</string>
-    <string name="title_advanced_swipenav">Veeg links/rechts om naar het volgende/vorige gesprek te gaan</string>
     <string name="title_advanced_autonext">Automatisch naar het volgende gesprek gaan bij het sluiten van een gesprek</string>
     <string name="title_advanced_autoread">Markeer berichten automatisch als gelezen bij het verplaatsen van berichten</string>
-    <string name="title_advanced_collapse">Berichten in gesprekken samenvouwen bij \'terug\'</string>
     <string name="title_advanced_automove">Bevestig het verplaatsen van berichten</string>
-    <string name="title_advanced_confirm">Bevestigen van acties die privacy gevoelige informatie kunnen lekken</string>
     <string name="title_advanced_autoresize">Wijzig afbeeldingen automatisch van formaat voor weergave op schermen</string>
     <string name="title_advanced_sender">Bewerken verzendadres toestaan</string>
     <string name="title_advanced_autosend">Bevestig het verzenden van berichten</string>
+    <string name="title_advanced_notify_preview">Toon berichtvoorbeeld in meldingen</string>
+    <string name="title_advanced_light">Gebruik meldingslicht</string>
+    <string name="title_advanced_sound">Selecteer meldingsgeluid</string>
     <string name="title_advanced_updates">Controleren op updates</string>
     <string name="title_advanced_debug">Foutopsporing modus</string>
     <string name="title_advanced_enabled_hint">Globaal in- of uitschakelen van het ontvangen en verzenden van berichten</string>
@@ -154,6 +155,7 @@
     <string name="title_advanced_name_email_hint">Indien uitgeschakeld, worden alleen namen weergegeven als deze beschikbaar zijn</string>
     <string name="title_advanced_preview_hint">Alleen beschikbaar wanneer de berichttekst werd gedownload</string>
     <string name="title_advanced_autoexpand_hint">Bericht automatisch openen als een er slechts één bericht of slechts één ongelezen bericht in een gesprek is</string>
+    <string name="title_advanced_autocollapse_hint">Meerdere uitgeklapte berichten worden altijd gesloten op \'terug\'</string>
     <string name="title_advanced_autoclose_hint">Gesprekken automatisch sluiten wanneer alle berichten zijn gearchiveerd, verzonden of weggegooid</string>
     <string name="title_advanced_sender_hint">De meeste providers staan gemodificeerde verzendadressen niet toe</string>
     <string name="title_select">Selecteer &#8230;</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 5dcfce2a5c..c36db80472 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -143,12 +143,11 @@
     <string name="title_advanced_addresses">Domyślnie pokazuj szczegóły adresu</string>
     <string name="title_advanced_html">Automatycznie pokaż oryginalną wiadomość dla znanych kontaktów</string>
     <string name="title_advanced_images">Automatycznie pokaż obrazki dla znanych kontaktów</string>
-    <string name="title_advanced_light">Użyj diody powiadomień</string>
-    <string name="title_advanced_sound">Wybierz dźwięk powiadomienia</string>
     <string name="title_advanced_pull_refresh">Pociągnij w dół, aby odświeżyć</string>
     <string name="title_advanced_autoclose">Automatycznie zamykaj konwersacje</string>
-    <string name="title_advanced_confirm">Potwierdź działania, które mogą spowodować wyciek wrażliwych informacji</string>
     <string name="title_advanced_sender">Zezwól na edycję adresu nadawcy</string>
+    <string name="title_advanced_light">Użyj diody powiadomień</string>
+    <string name="title_advanced_sound">Wybierz dźwięk powiadomienia</string>
     <string name="title_advanced_updates">Sprawdź aktualizacje</string>
     <string name="title_advanced_debug">Debuguj</string>
     <string name="title_advanced_metered_hint">Połączeniu taryfowe to głównie połączenia komórkowe lub płatne hotspoty Wi-Fi</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e329dd6b90..857d7c0e59 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -129,21 +129,20 @@
     <string name="title_advanced_html">Mostrar automaticamente a mensagem original para contatos conhecidos</string>
     <string name="title_advanced_images">Mostrar automaticamente imagens para contatos conhecidos</string>
     <string name="title_advanced_actionbar">Barra de ação de conversa</string>
-    <string name="title_advanced_notify_preview">Mostrar pré-visualização de mensagem nas notificações</string>
-    <string name="title_advanced_light">Usar luz de notificação</string>
-    <string name="title_advanced_sound">Selecionar som de notificação</string>
     <string name="title_advanced_pull_refresh">Puxe para baixo para atualizar</string>
+    <string name="title_advanced_swipenav">Deslize para a esquerda/direita para ir para próxima/anterior conversa</string>
     <string name="title_advanced_autoexpand">Expandir mensagens automaticamente</string>
+    <string name="title_advanced_collapse">Recolher mensagens em conversas ao \'voltar\'</string>
     <string name="title_advanced_autoclose">Fechar conversas automaticamente</string>
-    <string name="title_advanced_swipenav">Deslize para a esquerda/direita para ir para próxima/anterior conversa</string>
     <string name="title_advanced_autonext">Ir para a próxima conversa automaticamente ao fechar a conversa</string>
     <string name="title_advanced_autoread">Marcar mensagens como lidas automaticamente ao movê-las</string>
-    <string name="title_advanced_collapse">Recolher mensagens em conversas ao \'voltar\'</string>
     <string name="title_advanced_automove">Confirmar ao mover mensagens</string>
-    <string name="title_advanced_confirm">Confirme as ações que podem vazar informações confidenciais</string>
     <string name="title_advanced_autoresize">Redimensionar as imagens automaticamente para exibir em telas</string>
     <string name="title_advanced_sender">Permitir editar o endereço do remetente</string>
     <string name="title_advanced_autosend">Confirmar o envio de mensagens</string>
+    <string name="title_advanced_notify_preview">Mostrar pré-visualização de mensagem nas notificações</string>
+    <string name="title_advanced_light">Usar luz de notificação</string>
+    <string name="title_advanced_sound">Selecionar som de notificação</string>
     <string name="title_advanced_updates">Procurar por atualizações</string>
     <string name="title_advanced_debug">Modo de depuração</string>
     <string name="title_advanced_enabled_hint">Desative ou habilite o recebimento e envio de mensagens globalmente</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index edf061e1fe..73a519d24a 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -123,6 +123,8 @@
     <string name="title_advanced_section_behavior">Comportament</string>
     <string name="title_advanced_section_misc">Diverse</string>
     <string name="title_advanced_enabled">Sincronizare</string>
+    <string name="title_advanced_schedule">Programat</string>
+    <string name="title_advanced_schedule_hint">Atingeți data pentru a schimba programarea</string>
     <string name="title_advanced_metered">Folosește conexiuni contorizate</string>
     <string name="title_advanced_download">Descarcă automat mesajele și atașamentele, folosind o conexiune contorizată, până în</string>
     <string name="title_advanced_browse">Răsfoiește mesajele de pe server</string>
@@ -137,21 +139,20 @@
     <string name="title_advanced_html">Arată în mod automat imaginile originale pentru contactele cunoscute</string>
     <string name="title_advanced_images">Arată în mod automat imaginile pentru contactele cunoscute</string>
     <string name="title_advanced_actionbar">Bara de acțiuni corversație</string>
-    <string name="title_advanced_notify_preview">Arată previzualizare mesaj în notificare</string>
-    <string name="title_advanced_light">Folosire LED de notificare</string>
-    <string name="title_advanced_sound">Selectare sunet de notificare</string>
     <string name="title_advanced_pull_refresh">Trageți în jos pentru a actualiza</string>
+    <string name="title_advanced_swipenav">Glisați stânga/dreapta pentru a merge la conversația următoare/anterioară</string>
     <string name="title_advanced_autoexpand">Extinde mesajele automat</string>
+    <string name="title_advanced_collapse">Pliază mesajele din discuție când se apasă \'înapoi\'</string>
     <string name="title_advanced_autoclose">Închide automat conversațiile</string>
-    <string name="title_advanced_swipenav">Glisați stânga/dreapta pentru a merge la conversația următoare/anterioară</string>
     <string name="title_advanced_autonext">Se trece la următoarea conversație când este închisă cea curentă</string>
     <string name="title_advanced_autoread">Marchează automat mesajele mutate ca citite</string>
-    <string name="title_advanced_collapse">Pliază mesajele din discuție când se apasă \'înapoi\'</string>
     <string name="title_advanced_automove">Confirmă mutarea mesajelor</string>
-    <string name="title_advanced_confirm">Confirmarea operațiilor care ar putea divulga informații confidențiale</string>
     <string name="title_advanced_autoresize">Se reduce automat mărimea imaginilor pentru a fi afișate pe ecran</string>
     <string name="title_advanced_sender">Permite editarea adresei expeditorului</string>
     <string name="title_advanced_autosend">Confirmă trimiterea mesajelor</string>
+    <string name="title_advanced_notify_preview">Arată previzualizare mesaj în notificare</string>
+    <string name="title_advanced_light">Folosire LED de notificare</string>
+    <string name="title_advanced_sound">Selectare sunet de notificare</string>
     <string name="title_advanced_updates">Verificare actualizări aplicație</string>
     <string name="title_advanced_debug">Depanare</string>
     <string name="title_advanced_enabled_hint">Control global pentru recepția și trimiterea mesajelor</string>
@@ -162,6 +163,7 @@
     <string name="title_advanced_name_email_hint">Dacă este dezactivată, doar numele va fi afișat atunci când este disponibil</string>
     <string name="title_advanced_preview_hint">Disponibil doar atunci când a fost descarcat textul mesajului</string>
     <string name="title_advanced_autoexpand_hint">Atunci când este doar un mesaj sau doar un mesaj necitit într-o conversație</string>
+    <string name="title_advanced_autocollapse_hint">Mesajele multiple vor fi mereu plate când se apasă \'înapoi\'</string>
     <string name="title_advanced_autoclose_hint">Atunci când toate mesajele sunt arhivate, trimise sau mutate la gunoi</string>
     <string name="title_advanced_sender_hint">Majoritatea furnizorilor nu permit modificarea adresei expeditorului</string>
     <string name="title_select">Selectaţi &#8230;</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 5208b3add3..1a12fcfced 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -131,6 +131,8 @@
     <string name="title_advanced_section_behavior">Режимы</string>
     <string name="title_advanced_section_misc">Разное</string>
     <string name="title_advanced_enabled">Cинхронизировать</string>
+    <string name="title_advanced_schedule">Расписание</string>
+    <string name="title_advanced_schedule_hint">Нажмите на время, чтобы изменить расписание</string>
     <string name="title_advanced_metered">Использовать лимитированные подключения</string>
     <string name="title_advanced_download">Автоматически загружать сообщения и вложения для лимитного подключения до</string>
     <string name="title_advanced_browse">Просмотр сообщений на сервере</string>
@@ -145,21 +147,20 @@
     <string name="title_advanced_html">Автоматически показывать исходное сообщение для известных контактов</string>
     <string name="title_advanced_images">Автоматически показывать изображения для известных контактов</string>
     <string name="title_advanced_actionbar">Панель управления диалогами</string>
-    <string name="title_advanced_notify_preview">Предпросмотр сообщений в уведомлениях</string>
-    <string name="title_advanced_light">Использовать индикатор уведомлений</string>
-    <string name="title_advanced_sound">Выбрать звук уведомления</string>
     <string name="title_advanced_pull_refresh">Потяните вниз, для обновления</string>
+    <string name="title_advanced_swipenav">Свайп влево/вправо, чтобы перейти к следующему/предыдущему диплогу</string>
     <string name="title_advanced_autoexpand">Автоматически разворачивать сообщения</string>
+    <string name="title_advanced_collapse">Сворачивать сообщения в диалоге при нажатии кнопки \'назад\'</string>
     <string name="title_advanced_autoclose">Автоматически закрывать диалоги</string>
-    <string name="title_advanced_swipenav">Свайп влево/вправо, чтобы перейти к следующему/предыдущему диплогу</string>
     <string name="title_advanced_autonext">При закрытии диалога, автоматически открыть следующий</string>
     <string name="title_advanced_autoread">Автоматически помечать сообщения прочитанными при перемещении</string>
-    <string name="title_advanced_collapse">Сворачивать сообщения в диалоге при нажатии кнопки \'назад\'</string>
     <string name="title_advanced_automove">Подтверждать перемещение сообщений</string>
-    <string name="title_advanced_confirm">Подтвердить действия, которое может привести к утечке конфиденциальной информации</string>
     <string name="title_advanced_autoresize">Автоматически масштабировать изображения к размеру экрана</string>
     <string name="title_advanced_sender">Разрешить редактирование адреса отправителя</string>
     <string name="title_advanced_autosend">Подтверждать отправку сообщений</string>
+    <string name="title_advanced_notify_preview">Предпросмотр сообщений в уведомлениях</string>
+    <string name="title_advanced_light">Использовать индикатор уведомлений</string>
+    <string name="title_advanced_sound">Выбрать звук уведомления</string>
     <string name="title_advanced_updates">Проверить наличие обновлений</string>
     <string name="title_advanced_debug">Режим отладки</string>
     <string name="title_advanced_enabled_hint">Глобальное отключение или включение полученых и отправленных сообщений</string>
@@ -170,6 +171,7 @@
     <string name="title_advanced_name_email_hint">Если отключено, будут показаны только имена (при наличии)</string>
     <string name="title_advanced_preview_hint">Доступно только когда был загружен текст сообщения</string>
     <string name="title_advanced_autoexpand_hint">Автоматически открывать сообщение, когда оно только одно или только одно непрочитанное сообщение в диалоге</string>
+    <string name="title_advanced_autocollapse_hint">Несколько развёрнутых сообщений всегда будут закрыты по кнопке \'назад\'</string>
     <string name="title_advanced_autoclose_hint">Автоматически закрывать диалог, если все сообщения удалены, отправлены или помещены в архив</string>
     <string name="title_advanced_sender_hint">Большинство провайдеров не разрешают изменять адреса отправителей</string>
     <string name="title_select">Выбор &#8230;</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 9e9a4e8cf0..c35574c568 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -129,21 +129,20 @@
     <string name="title_advanced_html">Visa automatiskt originalmeddelande för kända kontakter</string>
     <string name="title_advanced_images">Visa bilder automatiskt för kända kontakter</string>
     <string name="title_advanced_actionbar">Konversationens åtgärdsfält</string>
-    <string name="title_advanced_notify_preview">Visa meddelandeförhandsvisning i aviseringar</string>
-    <string name="title_advanced_light">Använda aviseringslampan</string>
-    <string name="title_advanced_sound">Välj aviseringsljud</string>
     <string name="title_advanced_pull_refresh">Dra ner för att uppdatera</string>
+    <string name="title_advanced_swipenav">Svep vänster/höger för att gå till nästa/föregående konversation</string>
     <string name="title_advanced_autoexpand">Utöka meddelanden automatiskt</string>
+    <string name="title_advanced_collapse">Kollapsa meddelanden i konversationer på \"tillbaka\"</string>
     <string name="title_advanced_autoclose">Stäng konversationer automatiskt</string>
-    <string name="title_advanced_swipenav">Svep vänster/höger för att gå till nästa/föregående konversation</string>
     <string name="title_advanced_autonext">Gå automatiskt till nästa konversation vid stängning av konversation</string>
     <string name="title_advanced_autoread">Märk automatiskt meddelanden som lästa vid flyttning av meddelanden</string>
-    <string name="title_advanced_collapse">Kollapsa meddelanden i konversationer på \"tillbaka\"</string>
     <string name="title_advanced_automove">Bekräfta flyttning av meddelanden</string>
-    <string name="title_advanced_confirm">Bekräfta åtgärder som kan läcka känslig information</string>
     <string name="title_advanced_autoresize">Ändra storlek automatiskt på bilder för visning på skärmar</string>
     <string name="title_advanced_sender">Tillåt avsändaradress redigering</string>
     <string name="title_advanced_autosend">Bekräfta sändning av meddelanden</string>
+    <string name="title_advanced_notify_preview">Visa meddelandeförhandsvisning i aviseringar</string>
+    <string name="title_advanced_light">Använda aviseringslampan</string>
+    <string name="title_advanced_sound">Välj aviseringsljud</string>
     <string name="title_advanced_updates">Sök efter uppdateringar</string>
     <string name="title_advanced_debug">Felsökningsläge</string>
     <string name="title_advanced_enabled_hint">Inaktivera eller aktivera mottagning och sändning av meddelanden globalt</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 436683d3e9..d02775e884 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -127,20 +127,19 @@
     <string name="title_advanced_html">Bilinen kişilerden gelen özgün iletileri otomatik olarak göster</string>
     <string name="title_advanced_images">Bilinen kişiler için görselleri otomatik olarak göster</string>
     <string name="title_advanced_actionbar">İletişim etkinlik çubuğu</string>
-    <string name="title_advanced_light">Bildirim ışığını kullan</string>
-    <string name="title_advanced_sound">Bildirim sesini seçin</string>
     <string name="title_advanced_pull_refresh">Yenilemek için aşağıya çekin</string>
+    <string name="title_advanced_swipenav">Sonraki / önceki sohbete gitmek için sola / sağa kaydırın</string>
     <string name="title_advanced_autoexpand">İletileri otomatik olarak aç </string>
+    <string name="title_advanced_collapse">Konuşmalardaki mesajları \'geri\' seçeneğinde daralt</string>
     <string name="title_advanced_autoclose">İletişimleri otomatik olarak kapat</string>
-    <string name="title_advanced_swipenav">Sonraki / önceki sohbete gitmek için sola / sağa kaydırın</string>
     <string name="title_advanced_autonext">Sohbet kapatıldığında otomatik olarak sonraki sohbete git</string>
     <string name="title_advanced_autoread">İleti taşındığında otomatik olarak okundu diye işaretle</string>
-    <string name="title_advanced_collapse">Konuşmalardaki mesajları \'geri\' seçeneğinde daralt</string>
     <string name="title_advanced_automove">İletileri taşımayı onaylayın</string>
-    <string name="title_advanced_confirm">Gizliliği duyarlı bilgileri sızdırabilecek eylemleri onaylayın</string>
     <string name="title_advanced_autoresize">Ekranda görüntülemek için görselleri otomatik olarak yeniden boyutlandır</string>
     <string name="title_advanced_sender">Gönderici adresini düzenlemeye izin ver</string>
     <string name="title_advanced_autosend">İleti göndermeyi onayla</string>
+    <string name="title_advanced_light">Bildirim ışığını kullan</string>
+    <string name="title_advanced_sound">Bildirim sesini seçin</string>
     <string name="title_advanced_updates">Güncellemelere bak</string>
     <string name="title_advanced_debug">Hata ayıklama</string>
     <string name="title_advanced_enabled_hint">İletileri alma ve göndermeyi toptan devre dışı bırakın veya etkinleştirin</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 49c6588e75..957e64f82c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -121,21 +121,20 @@
     <string name="title_advanced_html">自动显示已知联系人的原始消息</string>
     <string name="title_advanced_images">自动显示来自已知联系人邮件中的图片</string>
     <string name="title_advanced_actionbar">对话操作栏</string>
-    <string name="title_advanced_notify_preview">通知中显示消息预览</string>
-    <string name="title_advanced_light">使用指示灯</string>
-    <string name="title_advanced_sound">选择通知提示音</string>
     <string name="title_advanced_pull_refresh">下拉刷新</string>
+    <string name="title_advanced_swipenav">向左/右滑动来前往下一个/上一个邮件会话</string>
     <string name="title_advanced_autoexpand">自动伸展消息</string>
+    <string name="title_advanced_collapse">按返回键折叠对话中的邮件</string>
     <string name="title_advanced_autoclose">自动关闭对话</string>
-    <string name="title_advanced_swipenav">向左/右滑动来前往下一个/上一个邮件会话</string>
     <string name="title_advanced_autonext">关闭对话时自动转到下一个对话</string>
     <string name="title_advanced_autoread">将移动的邮件自动标记为已读</string>
-    <string name="title_advanced_collapse">按返回键折叠对话中的邮件</string>
     <string name="title_advanced_automove">确认移动邮件</string>
-    <string name="title_advanced_confirm">确认执行可能泄露隐私敏感信息的操作</string>
     <string name="title_advanced_autoresize">自动调整屏幕显示的图像大小</string>
     <string name="title_advanced_sender">允许编辑发件人地址</string>
     <string name="title_advanced_autosend">确认发送邮件</string>
+    <string name="title_advanced_notify_preview">通知中显示消息预览</string>
+    <string name="title_advanced_light">使用指示灯</string>
+    <string name="title_advanced_sound">选择通知提示音</string>
     <string name="title_advanced_updates">检查更新</string>
     <string name="title_advanced_debug">调试模式</string>
     <string name="title_advanced_enabled_hint">全局禁用或启用邮件的接收和发送</string>