From 14ec04102cb9f0a6633c78899354efa4a630c1c4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 9 May 2019 13:47:16 +0200
Subject: [PATCH] Crowdin sync

---
 app/src/main/res/values-ar-rBH/strings.xml |  2 +-
 app/src/main/res/values-ar-rEG/strings.xml |  2 +-
 app/src/main/res/values-ar-rSA/strings.xml |  2 +-
 app/src/main/res/values-ar-rYE/strings.xml |  2 +-
 app/src/main/res/values-az-rAZ/strings.xml |  2 +-
 app/src/main/res/values-cs-rCZ/strings.xml |  4 ++--
 app/src/main/res/values-da-rDK/strings.xml |  3 +--
 app/src/main/res/values-de-rDE/strings.xml | 21 ++++++++++++++++++--
 app/src/main/res/values-es-rES/strings.xml | 21 ++++++++++++++++++--
 app/src/main/res/values-fi-rFI/strings.xml |  4 ++--
 app/src/main/res/values-fr-rFR/strings.xml | 21 ++++++++++++++++++--
 app/src/main/res/values-it-rIT/strings.xml |  6 ++++--
 app/src/main/res/values-nl-rNL/strings.xml | 21 ++++++++++++++++++--
 app/src/main/res/values-nn-rNO/strings.xml | 21 ++++++++++++++++++--
 app/src/main/res/values-no-rNO/strings.xml | 21 ++++++++++++++++++--
 app/src/main/res/values-pl-rPL/strings.xml |  2 +-
 app/src/main/res/values-pt-rBR/strings.xml |  3 +--
 app/src/main/res/values-ro-rRO/strings.xml | 23 +++++++++++++++++++---
 app/src/main/res/values-ru-rRU/strings.xml |  3 +--
 app/src/main/res/values-sv-rSE/strings.xml |  2 +-
 app/src/main/res/values-tr-rTR/strings.xml |  3 +--
 app/src/main/res/values-zh-rCN/strings.xml | 20 +++++++++++++++++--
 22 files changed, 171 insertions(+), 38 deletions(-)

diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 14da092344..477bb4191e 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -87,8 +87,8 @@
     <string name="title_setup_black_theme">سمة سوداء</string>
     <string name="title_setup_system_theme">سمة النظام</string>
     <string name="title_setup_advanced">الإعدادات المتقدمة</string>
-    <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_setup_options">الخيارات</string>
+    <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_advanced">الخيارات المتقدمة</string>
     <string name="title_advanced_section_connection">اتصال</string>
     <string name="title_advanced_section_display">إظهار</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 14da092344..477bb4191e 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -87,8 +87,8 @@
     <string name="title_setup_black_theme">سمة سوداء</string>
     <string name="title_setup_system_theme">سمة النظام</string>
     <string name="title_setup_advanced">الإعدادات المتقدمة</string>
-    <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_setup_options">الخيارات</string>
+    <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_advanced">الخيارات المتقدمة</string>
     <string name="title_advanced_section_connection">اتصال</string>
     <string name="title_advanced_section_display">إظهار</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 14da092344..477bb4191e 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -87,8 +87,8 @@
     <string name="title_setup_black_theme">سمة سوداء</string>
     <string name="title_setup_system_theme">سمة النظام</string>
     <string name="title_setup_advanced">الإعدادات المتقدمة</string>
-    <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_setup_options">الخيارات</string>
+    <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_advanced">الخيارات المتقدمة</string>
     <string name="title_advanced_section_connection">اتصال</string>
     <string name="title_advanced_section_display">إظهار</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 14da092344..477bb4191e 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -87,8 +87,8 @@
     <string name="title_setup_black_theme">سمة سوداء</string>
     <string name="title_setup_system_theme">سمة النظام</string>
     <string name="title_setup_advanced">الإعدادات المتقدمة</string>
-    <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_setup_options">الخيارات</string>
+    <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_advanced">الخيارات المتقدمة</string>
     <string name="title_advanced_section_connection">اتصال</string>
     <string name="title_advanced_section_display">إظهار</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index b015461a05..ad373ac4c9 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -104,8 +104,8 @@
     <string name="title_setup_black_theme">Qara tema</string>
     <string name="title_setup_system_theme">Sistem teması</string>
     <string name="title_setup_advanced">Qabaqcıl</string>
-    <string name="title_setup_defaults">İlkin vəziyyətinə qaytar</string>
     <string name="title_setup_options">Seçimlər</string>
+    <string name="title_setup_defaults">İlkin vəziyyətinə qaytar</string>
     <string name="title_advanced">Qabaqcıl variantlar</string>
     <string name="title_advanced_section_connection">Bağlantı</string>
     <string name="title_advanced_section_display">Görüntü</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 4a6ea1a3dc..d9737660d7 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -137,8 +137,8 @@
     <string name="title_setup_black_theme">Černý motiv</string>
     <string name="title_setup_system_theme">Motiv systému</string>
     <string name="title_setup_advanced">Rozšířené</string>
-    <string name="title_setup_defaults">Obnovit výchozí nastavení</string>
     <string name="title_setup_options">Možnosti</string>
+    <string name="title_setup_defaults">Obnovit výchozí nastavení</string>
     <string name="title_advanced">Rozšířené možnosti</string>
     <string name="title_advanced_section_synchronize">Synchronizovat</string>
     <string name="title_advanced_section_connection">Připojení</string>
@@ -384,6 +384,7 @@
     <string name="title_raw_saved">Zdrojová zpráva uložena</string>
     <string name="title_attachment_saved">Příloha uložena</string>
     <string name="title_attachments_saved">Přílohy uloženy</string>
+    <string name="title_attachments_incomplete">Některé přílohy nebo obrázky nebyly staženy a nemohly být proto přidány</string>
     <string name="title_ask_delete">Trvale odstranit zprávu?</string>
     <string name="title_ask_delete_answer">Trvale odstranit šablonu odpovědi?</string>
     <string name="title_ask_delete_rule">Trvale odstranit pravidlo?</string>
@@ -415,7 +416,6 @@
     <string name="title_style_clear">Vymazat formátování</string>
     <string name="title_style_link">Vložit odkaz</string>
     <string name="title_style_image">Vložit obrázek</string>
-    <string name="title_style_toolbar">Panel formátování</string>
     <string name="title_add_attachment">Přidat přílohu</string>
     <string name="title_show_addresses">Zobrazit kopii/skrytou kopii</string>
     <string name="title_insert_contact_group">Vložit skupinu kontaktů</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 1b5f5d648d..ef8c20e186 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -121,8 +121,8 @@
     <string name="title_setup_black_theme">Sort tema</string>
     <string name="title_setup_system_theme">Systemtema</string>
     <string name="title_setup_advanced">Avanceret</string>
-    <string name="title_setup_defaults">Gendan standardværdier</string>
     <string name="title_setup_options">Indstillinger</string>
+    <string name="title_setup_defaults">Gendan standardværdier</string>
     <string name="title_advanced">Avancerede indstillinger</string>
     <string name="title_advanced_section_synchronize">Synkronisér</string>
     <string name="title_advanced_section_connection">Forbindelse</string>
@@ -399,7 +399,6 @@
     <string name="title_style_clear">Ryd formatering</string>
     <string name="title_style_link">Indsæt link</string>
     <string name="title_style_image">Indsæt billede</string>
-    <string name="title_style_toolbar">Tilpas værktøjslinje</string>
     <string name="title_add_attachment">Vedhæft fil</string>
     <string name="title_show_addresses">Vis Cc/Bcc</string>
     <string name="title_insert_contact_group">Indsæt kontaktgruppe</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 4f0460e796..30b7de9fa6 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -121,10 +121,12 @@
     <string name="title_setup_black_theme">Schwarzes Design</string>
     <string name="title_setup_system_theme">System Design</string>
     <string name="title_setup_advanced">Erweitert</string>
-    <string name="title_setup_defaults">Auf Standard zurücksetzen</string>
     <string name="title_setup_options">Optionen</string>
+    <string name="title_setup_defaults">Auf Standard zurücksetzen</string>
+    <string name="title_setup_reset_questions">Fragen zurücksetzen</string>
     <string name="title_advanced">Erweiterte Optionen</string>
     <string name="title_advanced_section_synchronize">Synchronisieren</string>
+    <string name="title_advanced_section_send">Senden</string>
     <string name="title_advanced_section_connection">Verbindung</string>
     <string name="title_advanced_section_display">Anzeige</string>
     <string name="title_advanced_section_behavior">Verhalten</string>
@@ -168,6 +170,7 @@
     <string name="title_advanced_sender">Bearbeitung der Absenderadresse erlauben</string>
     <string name="title_advanced_prefix_once">Betreff nur einmal beim Antworten oder Weiterleiten voranstellen</string>
     <string name="title_advanced_autosend">Senden von E-Mails bestätigen</string>
+    <string name="title_advanced_send_delayed">Senden von Nachrichten verzögern</string>
     <string name="title_advanced_notify_group">Neue Nachrichten-Benachrichtigungen gruppieren</string>
     <string name="title_advanced_notify_preview">Zeige die Nachrichten-Vorschau in den Benachrichtigungen</string>
     <string name="title_advanced_notify_actions">Benachrichtigungsaktionen</string>
@@ -400,9 +403,12 @@
     <string name="title_style_clear">Formatierung entfernen</string>
     <string name="title_style_link">Link einfügen</string>
     <string name="title_style_image">Bild einfügen</string>
-    <string name="title_style_toolbar">Symbolleistenstil</string>
     <string name="title_add_attachment">Anhang hinzufügen</string>
+    <string name="title_attachment_file">Anhang hinzufügen</string>
+    <string name="title_attachment_photo">Foto aufnehmen</string>
+    <string name="title_attachment_audio">Audio aufnehmen</string>
     <string name="title_show_addresses">CC/BCC anzeigen</string>
+    <string name="title_media_toolbar">Mediensymbolleiste</string>
     <string name="title_insert_contact_group">Kontaktgruppe einfügen</string>
     <string name="title_insert_template">Vorlage einfügen</string>
     <string name="title_send_plain_text">Nur Text senden</string>
@@ -413,6 +419,7 @@
     <string name="title_draft_saved">Entwurf gespeichert</string>
     <string name="title_ask_send_via">Sende E-Mail zu %1$s über %2$s?</string>
     <string name="title_queued">Nachricht wird gesendet</string>
+    <string name="title_queued_at">Nachricht wird ungefähr um %1$s gesendet</string>
     <string name="title_encrypt">Verschlüsseln</string>
     <string name="title_decrypt">Entschlüsseln</string>
     <string name="title_resync">Neu synchronisieren</string>
@@ -429,6 +436,7 @@
     <string name="title_sort_on_sender">Absender</string>
     <string name="title_sort_on_subject">Betreff</string>
     <string name="title_sort_on_size">Größe</string>
+    <string name="title_sort_on_snoozed">Zurückgestellt</string>
     <string name="title_filter">Filter</string>
     <string name="title_filter_seen">Gelesen</string>
     <string name="title_filter_snoozed">Zurückgestellt</string>
@@ -587,6 +595,15 @@
         <item>Alle zwei Stunden</item>
         <item>Alle vier Stunden</item>
     </string-array>
+    <string-array name="sendDelayedNames">
+        <item>Niemals</item>
+        <item>15 Sekunden</item>
+        <item>30 Sekunden</item>
+        <item>1 Minute</item>
+        <item>2 Minuten</item>
+        <item>5 Minuten</item>
+        <item>10 Minuten</item>
+    </string-array>
     <string-array name="startupNames">
         <item>Sammeleingang</item>
         <item>Zusammengeführte Ordner</item>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index a6b0751c60..f90de12dce 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -121,10 +121,12 @@
     <string name="title_setup_black_theme">Tema negro</string>
     <string name="title_setup_system_theme">Tema del sistema</string>
     <string name="title_setup_advanced">Avanzado</string>
-    <string name="title_setup_defaults">Restablecer ajustes por defecto</string>
     <string name="title_setup_options">Opciones</string>
+    <string name="title_setup_defaults">Restablecer ajustes por defecto</string>
+    <string name="title_setup_reset_questions">Restablecer preguntas</string>
     <string name="title_advanced">Opciones avanzadas</string>
     <string name="title_advanced_section_synchronize">Sincronizar</string>
+    <string name="title_advanced_section_send">Enviar</string>
     <string name="title_advanced_section_connection">Conexión</string>
     <string name="title_advanced_section_display">Mostrar</string>
     <string name="title_advanced_section_behavior">Comportamiento</string>
@@ -168,6 +170,7 @@
     <string name="title_advanced_sender">Permitir editar dirección del remitente</string>
     <string name="title_advanced_prefix_once">Prefijar el asunto solo una vez al responder o reenviar</string>
     <string name="title_advanced_autosend">Confirmar enviar mensajes</string>
+    <string name="title_advanced_send_delayed">Diferir envío de mensajes</string>
     <string name="title_advanced_notify_group">Agrupar notificaciones de nuevos mensajes</string>
     <string name="title_advanced_notify_preview">Mostrar vista previa del mensaje en notificaciones</string>
     <string name="title_advanced_notify_actions">Acciones de notificación</string>
@@ -368,6 +371,7 @@
     <string name="title_raw_saved">Mensaje raw guardado</string>
     <string name="title_attachment_saved">Adjunto guardado</string>
     <string name="title_attachments_saved">Adjuntos guardados</string>
+    <string name="title_attachments_incomplete">Algunos adjuntos o imágenes no fueron descargados y no pudieron añadirse</string>
     <string name="title_ask_delete">¿Eliminar mensaje permanentemente?</string>
     <string name="title_ask_delete_answer">¿Eliminar plantilla de respuesta permanentemente?</string>
     <string name="title_ask_delete_rule">¿Eliminar regla permanentemente?</string>
@@ -399,8 +403,10 @@
     <string name="title_style_clear">Borrar formato</string>
     <string name="title_style_link">Insertar enlace</string>
     <string name="title_style_image">Insertar imagen</string>
-    <string name="title_style_toolbar">Barra de herramientas de estilo</string>
     <string name="title_add_attachment">Agregar adjunto</string>
+    <string name="title_attachment_file">Adjuntar archivo</string>
+    <string name="title_attachment_photo">Tomar foto</string>
+    <string name="title_attachment_audio">Grabar audio</string>
     <string name="title_show_addresses">Mostrar CC/CCO</string>
     <string name="title_insert_contact_group">Insertar grupo de contactos</string>
     <string name="title_insert_template">Insertar plantilla</string>
@@ -412,6 +418,7 @@
     <string name="title_draft_saved">Borrador guardado</string>
     <string name="title_ask_send_via">¿Enviar mensaje a %1$s vía %2$s?</string>
     <string name="title_queued">Enviando mensaje</string>
+    <string name="title_queued_at">El mensaje será enviado alrededor de %1$s</string>
     <string name="title_encrypt">Cifrar</string>
     <string name="title_decrypt">Descifrar</string>
     <string name="title_resync">Resincronizar</string>
@@ -428,6 +435,7 @@
     <string name="title_sort_on_sender">Remitente</string>
     <string name="title_sort_on_subject">Asunto</string>
     <string name="title_sort_on_size">Tamaño</string>
+    <string name="title_sort_on_snoozed">Pospuesto</string>
     <string name="title_filter">Filtro</string>
     <string name="title_filter_seen">Leer</string>
     <string name="title_filter_snoozed">Pospuesto</string>
@@ -586,6 +594,15 @@
         <item>Cada 2 horas</item>
         <item>Cada 4 horas</item>
     </string-array>
+    <string-array name="sendDelayedNames">
+        <item>Nunca</item>
+        <item>15 segundos</item>
+        <item>30 segundos</item>
+        <item>1 minuto</item>
+        <item>2 minutos</item>
+        <item>5 minutos</item>
+        <item>10 minutos</item>
+    </string-array>
     <string-array name="startupNames">
         <item>Bandeja de entrada unificada</item>
         <item>Carpetas unificadas</item>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 10a8b701ca..dfa60a7e15 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -121,8 +121,8 @@
     <string name="title_setup_black_theme">Musta teema</string>
     <string name="title_setup_system_theme">Järjestelmän teema</string>
     <string name="title_setup_advanced">Lisäasetukset</string>
-    <string name="title_setup_defaults">Palauta oletukset</string>
     <string name="title_setup_options">Asetukset</string>
+    <string name="title_setup_defaults">Palauta oletukset</string>
     <string name="title_advanced">Lisäasetukset</string>
     <string name="title_advanced_section_synchronize">Synkronoi</string>
     <string name="title_advanced_section_connection">Yhteys</string>
@@ -368,6 +368,7 @@
     <string name="title_raw_saved">Raakaviesti tallennettu</string>
     <string name="title_attachment_saved">Liite tallennettu</string>
     <string name="title_attachments_saved">Liitteet tallennettu</string>
+    <string name="title_attachments_incomplete">Joitakin liitteitä tai kuvia ei ladattu eikä voitu lisätä</string>
     <string name="title_ask_delete">Poistetaanko viesti pysyvästi?</string>
     <string name="title_ask_delete_answer">Poistetaanko vastausmalli pysyvästi?</string>
     <string name="title_ask_delete_rule">Poistetaanko sääntö pysyvästi?</string>
@@ -399,7 +400,6 @@
     <string name="title_style_clear">Poista muotoilu</string>
     <string name="title_style_link">Lisää linkki</string>
     <string name="title_style_image">Lisää kuva</string>
-    <string name="title_style_toolbar">Tyylityökalurivi</string>
     <string name="title_add_attachment">Lisää liite</string>
     <string name="title_show_addresses">Näytä kopio/piilokopio</string>
     <string name="title_insert_contact_group">Lisää yhteystietoryhmä</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index f270c7aee9..d46f726541 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -121,10 +121,12 @@
     <string name="title_setup_black_theme">Thème noir</string>
     <string name="title_setup_system_theme">Thème système</string>
     <string name="title_setup_advanced">Avancé</string>
-    <string name="title_setup_defaults">Rétablir les paramètres par défaut</string>
     <string name="title_setup_options">Options</string>
+    <string name="title_setup_defaults">Rétablir les paramètres par défaut</string>
+    <string name="title_setup_reset_questions">Réinitialiser les questions</string>
     <string name="title_advanced">Options avancées</string>
     <string name="title_advanced_section_synchronize">Synchroniser</string>
+    <string name="title_advanced_section_send">Envoyer</string>
     <string name="title_advanced_section_connection">Connexion</string>
     <string name="title_advanced_section_display">Afficher</string>
     <string name="title_advanced_section_behavior">Comportement</string>
@@ -168,6 +170,7 @@
     <string name="title_advanced_sender">Autoriser la modification de l\'adresse de l\'expéditeur</string>
     <string name="title_advanced_prefix_once">Ne préfixer le sujet qu\'une seule fois lors de la réponse ou du transfert</string>
     <string name="title_advanced_autosend">Confirmer l\'envoi des messages</string>
+    <string name="title_advanced_send_delayed">Retarder l\'envoi des messages</string>
     <string name="title_advanced_notify_group">Grouper les notifications de nouveau message</string>
     <string name="title_advanced_notify_preview">Afficher l\'aperçu du message dans les notifications</string>
     <string name="title_advanced_notify_actions">Actions de notification</string>
@@ -400,9 +403,12 @@
     <string name="title_style_clear">Effacer la mise en forme</string>
     <string name="title_style_link">Insérer un lien</string>
     <string name="title_style_image">Insérer une image</string>
-    <string name="title_style_toolbar">Barre d\'outils de style</string>
     <string name="title_add_attachment">Ajouter une pièce jointe</string>
+    <string name="title_attachment_file">Joindre un fichier</string>
+    <string name="title_attachment_photo">Prendre une photo</string>
+    <string name="title_attachment_audio">Enregistrer un fichier audio</string>
     <string name="title_show_addresses">Afficher Cc/Cci</string>
+    <string name="title_media_toolbar">Barre d\'outils média</string>
     <string name="title_insert_contact_group">Insérer un groupe de contacts</string>
     <string name="title_insert_template">Insérer un modèle</string>
     <string name="title_send_plain_text">Envoyer en texte brut uniquement</string>
@@ -413,6 +419,7 @@
     <string name="title_draft_saved">Brouillon enregistré</string>
     <string name="title_ask_send_via">Envoyer le message à %1$s via %2$s ?</string>
     <string name="title_queued">Envoi du message</string>
+    <string name="title_queued_at">Le message sera envoyé vers %1$s</string>
     <string name="title_encrypt">Chiffrer</string>
     <string name="title_decrypt">Déchiffrer</string>
     <string name="title_resync">Resynchroniser</string>
@@ -429,6 +436,7 @@
     <string name="title_sort_on_sender">Expéditeur</string>
     <string name="title_sort_on_subject">Objet</string>
     <string name="title_sort_on_size">Taille</string>
+    <string name="title_sort_on_snoozed">Différé</string>
     <string name="title_filter">Filtrer</string>
     <string name="title_filter_seen">Lu</string>
     <string name="title_filter_snoozed">Différé</string>
@@ -587,6 +595,15 @@
         <item>Toutes les 2 heures</item>
         <item>Toutes les 4 heures</item>
     </string-array>
+    <string-array name="sendDelayedNames">
+        <item>Jamais</item>
+        <item>15 secondes</item>
+        <item>30 secondes</item>
+        <item>1 minute</item>
+        <item>2 minutes</item>
+        <item>5 minutes</item>
+        <item>10 minutes</item>
+    </string-array>
     <string-array name="startupNames">
         <item>Boîte de réception unifiée</item>
         <item>Dossiers unifiés</item>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index daf8ebf2c7..cda26c543d 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -121,8 +121,8 @@
     <string name="title_setup_black_theme">Tema nero</string>
     <string name="title_setup_system_theme">Tema di sistema</string>
     <string name="title_setup_advanced">Avanzate</string>
-    <string name="title_setup_defaults">Ripristina predefiniti</string>
     <string name="title_setup_options">Opzioni</string>
+    <string name="title_setup_defaults">Ripristina predefiniti</string>
     <string name="title_advanced">Opzioni avanzate</string>
     <string name="title_advanced_section_synchronize">Sincronizza</string>
     <string name="title_advanced_section_connection">Connessione</string>
@@ -168,6 +168,7 @@
     <string name="title_advanced_sender">Consenti la modifica dell\'indirizzo mittente</string>
     <string name="title_advanced_prefix_once">Prefissa l\'oggetto solo una volta per rispondere o inoltrare</string>
     <string name="title_advanced_autosend">Confermare l\'invio dei messaggi</string>
+    <string name="title_advanced_notify_group">Raggruppa le nuove notifiche messaggi</string>
     <string name="title_advanced_notify_preview">Mostra anteprima messaggio nelle notifiche</string>
     <string name="title_advanced_notify_actions">Azioni di notifica</string>
     <string name="title_advanced_notify_action_trash">Cestino</string>
@@ -264,6 +265,7 @@
     <string name="title_no_sync">Errori di sincronizzazione da %1$s</string>
     <string name="title_identity_required">È necessaria un\'identità per inviare messaggi</string>
     <string name="title_drafts_required">Per inviare messaggi è necessaria una cartella bozze</string>
+    <string name="title_account_setup_identity">Aggiungi un\'identità dopo aver salvato questo account</string>
     <string name="title_account_delete">Eliminare questo account permanentemente?</string>
     <string name="title_identity_delete">Eliminare questa identità permanentemente?</string>
     <string name="title_edit_html">Modifica come HTML</string>
@@ -366,6 +368,7 @@
     <string name="title_raw_saved">Messaggio non elaborato salvato</string>
     <string name="title_attachment_saved">Allegato salvato</string>
     <string name="title_attachments_saved">Allegati salvati</string>
+    <string name="title_attachments_incomplete">Alcuni allegati o immagini non sono stati scaricati e non possono essere aggiunti</string>
     <string name="title_ask_delete">Eliminare il messaggio permanentemente?</string>
     <string name="title_ask_delete_answer">Elimina definitivamente il modello di risposta?</string>
     <string name="title_ask_delete_rule">Eliminare la regola permanentemente?</string>
@@ -397,7 +400,6 @@
     <string name="title_style_clear">Cancella formattazione</string>
     <string name="title_style_link">Inserisci collegamento</string>
     <string name="title_style_image">Inserisci immagine</string>
-    <string name="title_style_toolbar">Stile Barra strumenti</string>
     <string name="title_add_attachment">Aggiungi allegato</string>
     <string name="title_show_addresses">Mostra CC/CCN</string>
     <string name="title_insert_contact_group">Inserisci gruppo di contatto</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 8d4c595a99..a8e48f2859 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -121,10 +121,12 @@
     <string name="title_setup_black_theme">Zwart thema</string>
     <string name="title_setup_system_theme">Systeem thema</string>
     <string name="title_setup_advanced">Geavanceerd</string>
-    <string name="title_setup_defaults">Verstekwaarden herstellen</string>
     <string name="title_setup_options">Opties</string>
+    <string name="title_setup_defaults">Verstekwaarden herstellen</string>
+    <string name="title_setup_reset_questions">Vragen resetten</string>
     <string name="title_advanced">Geavanceerde opties</string>
     <string name="title_advanced_section_synchronize">Synchroniseren</string>
+    <string name="title_advanced_section_send">Verzenden</string>
     <string name="title_advanced_section_connection">Verbinding</string>
     <string name="title_advanced_section_display">Weergave</string>
     <string name="title_advanced_section_behavior">Gedrag</string>
@@ -168,6 +170,7 @@
     <string name="title_advanced_sender">Bewerken verzendadres toestaan</string>
     <string name="title_advanced_prefix_once">Prefix onderwerp slechts één keer bij beantwoorden of doorsturen</string>
     <string name="title_advanced_autosend">Bevestig het verzenden van berichten</string>
+    <string name="title_advanced_send_delayed">Verzenden van berichten uitstellen</string>
     <string name="title_advanced_notify_group">Groepeer meldingen nieuwe berichten</string>
     <string name="title_advanced_notify_preview">Toon berichtvoorbeeld in meldingen</string>
     <string name="title_advanced_notify_actions">Meldingsacties</string>
@@ -400,9 +403,12 @@
     <string name="title_style_clear">Opmaak wissen</string>
     <string name="title_style_link">Link invoegen</string>
     <string name="title_style_image">Afbeelding invoegen</string>
-    <string name="title_style_toolbar">Stijl werkbalk</string>
     <string name="title_add_attachment">Bijlage toevoegen</string>
+    <string name="title_attachment_file">Bestand bijvoegen</string>
+    <string name="title_attachment_photo">Foto nemen</string>
+    <string name="title_attachment_audio">Geluid opnemen</string>
     <string name="title_show_addresses">Toon CC/BCC</string>
+    <string name="title_media_toolbar">Media werkbalk</string>
     <string name="title_insert_contact_group">Contactgroep toevoegen</string>
     <string name="title_insert_template">Sjabloon invoegen</string>
     <string name="title_send_plain_text">Verstuur alleen platte tekst</string>
@@ -413,6 +419,7 @@
     <string name="title_draft_saved">Concept opgeslagen</string>
     <string name="title_ask_send_via">Verstuur bericht naar %1$s via %2$s?</string>
     <string name="title_queued">Bericht wordt verzonden</string>
+    <string name="title_queued_at">Bericht zal rond %1$s worden verzonden</string>
     <string name="title_encrypt">Versleutelen</string>
     <string name="title_decrypt">Ontsleutelen</string>
     <string name="title_resync">Resync</string>
@@ -429,6 +436,7 @@
     <string name="title_sort_on_sender">Afzender</string>
     <string name="title_sort_on_subject">Onderwerp</string>
     <string name="title_sort_on_size">Grootte</string>
+    <string name="title_sort_on_snoozed">Gesluimerd</string>
     <string name="title_filter">Filter</string>
     <string name="title_filter_seen">Gelezen</string>
     <string name="title_filter_snoozed">Gesluimerd</string>
@@ -587,6 +595,15 @@
         <item>Elke 2 uur</item>
         <item>Elke 4 uur</item>
     </string-array>
+    <string-array name="sendDelayedNames">
+        <item>Nooit</item>
+        <item>15 seconden</item>
+        <item>30 seconden</item>
+        <item>1 minuut</item>
+        <item>2 minuten</item>
+        <item>5 minuten</item>
+        <item>10 minuten</item>
+    </string-array>
     <string-array name="startupNames">
         <item>Gecombineerd postvak in</item>
         <item>Gecombineerde postvak in mappen</item>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index b8e28a1f6c..6d393a0675 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -121,10 +121,12 @@
     <string name="title_setup_black_theme">Svart tema</string>
     <string name="title_setup_system_theme">System tema</string>
     <string name="title_setup_advanced">Avansert</string>
-    <string name="title_setup_defaults">Gjenopprett standarder</string>
     <string name="title_setup_options">Alternativer</string>
+    <string name="title_setup_defaults">Gjenopprett standarder</string>
+    <string name="title_setup_reset_questions">Tilbakestill spørsmål</string>
     <string name="title_advanced">Avanserte innstillinger</string>
     <string name="title_advanced_section_synchronize">Synkroniser</string>
+    <string name="title_advanced_section_send">Send</string>
     <string name="title_advanced_section_connection">Forbindelse</string>
     <string name="title_advanced_section_display">Vis</string>
     <string name="title_advanced_section_behavior">Oppførsel</string>
@@ -168,6 +170,7 @@
     <string name="title_advanced_sender">Tillat redigering av avsenderadresse</string>
     <string name="title_advanced_prefix_once">Prefiks emne bare en gang på svar eller videresending</string>
     <string name="title_advanced_autosend">Bekreft sending av meldinger</string>
+    <string name="title_advanced_send_delayed">Forsink sending av meldinger</string>
     <string name="title_advanced_notify_group">Grupper nye meldingsvarsler</string>
     <string name="title_advanced_notify_preview">Vis forhåndsvisning av melding i varsler</string>
     <string name="title_advanced_notify_actions">Varselshandlinger</string>
@@ -400,9 +403,12 @@
     <string name="title_style_clear">Fjern formatering</string>
     <string name="title_style_link">Sett inn lenke</string>
     <string name="title_style_image">Sett inn bilde</string>
-    <string name="title_style_toolbar">Stil verktøylinjen</string>
     <string name="title_add_attachment">Legg ved fil</string>
+    <string name="title_attachment_file">Legg ved fil</string>
+    <string name="title_attachment_photo">Ta bilde</string>
+    <string name="title_attachment_audio">Ta opp lyd</string>
     <string name="title_show_addresses">Vis Kopi/Blindkopi</string>
+    <string name="title_media_toolbar">Media verktøylinje</string>
     <string name="title_insert_contact_group">Sett inn kontaktgruppe</string>
     <string name="title_insert_template">Sett inn mal</string>
     <string name="title_send_plain_text">Send bare ren tekst</string>
@@ -413,6 +419,7 @@
     <string name="title_draft_saved">Utkast lagret</string>
     <string name="title_ask_send_via">Send meldingen til %1$s via %2$s?</string>
     <string name="title_queued">Sender melding</string>
+    <string name="title_queued_at">Melding vil bli sendt rundt %1$s</string>
     <string name="title_encrypt">Krypter</string>
     <string name="title_decrypt">Dekrypter</string>
     <string name="title_resync">Resync</string>
@@ -429,6 +436,7 @@
     <string name="title_sort_on_sender">Avsender</string>
     <string name="title_sort_on_subject">Emne</string>
     <string name="title_sort_on_size">Størrelse</string>
+    <string name="title_sort_on_snoozed">Utsatt</string>
     <string name="title_filter">Filter</string>
     <string name="title_filter_seen">Les</string>
     <string name="title_filter_snoozed">Utsatt</string>
@@ -587,6 +595,15 @@
         <item>Hver 2. time</item>
         <item>Hver 4. time</item>
     </string-array>
+    <string-array name="sendDelayedNames">
+        <item>Aldri</item>
+        <item>15 sekunder</item>
+        <item>30 sekunder</item>
+        <item>1 minutt</item>
+        <item>2 minutter</item>
+        <item>5 minutter</item>
+        <item>10 minutter</item>
+    </string-array>
     <string-array name="startupNames">
         <item>Enhetlig innboks</item>
         <item>Enhetlige mapper</item>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index b8e28a1f6c..6d393a0675 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -121,10 +121,12 @@
     <string name="title_setup_black_theme">Svart tema</string>
     <string name="title_setup_system_theme">System tema</string>
     <string name="title_setup_advanced">Avansert</string>
-    <string name="title_setup_defaults">Gjenopprett standarder</string>
     <string name="title_setup_options">Alternativer</string>
+    <string name="title_setup_defaults">Gjenopprett standarder</string>
+    <string name="title_setup_reset_questions">Tilbakestill spørsmål</string>
     <string name="title_advanced">Avanserte innstillinger</string>
     <string name="title_advanced_section_synchronize">Synkroniser</string>
+    <string name="title_advanced_section_send">Send</string>
     <string name="title_advanced_section_connection">Forbindelse</string>
     <string name="title_advanced_section_display">Vis</string>
     <string name="title_advanced_section_behavior">Oppførsel</string>
@@ -168,6 +170,7 @@
     <string name="title_advanced_sender">Tillat redigering av avsenderadresse</string>
     <string name="title_advanced_prefix_once">Prefiks emne bare en gang på svar eller videresending</string>
     <string name="title_advanced_autosend">Bekreft sending av meldinger</string>
+    <string name="title_advanced_send_delayed">Forsink sending av meldinger</string>
     <string name="title_advanced_notify_group">Grupper nye meldingsvarsler</string>
     <string name="title_advanced_notify_preview">Vis forhåndsvisning av melding i varsler</string>
     <string name="title_advanced_notify_actions">Varselshandlinger</string>
@@ -400,9 +403,12 @@
     <string name="title_style_clear">Fjern formatering</string>
     <string name="title_style_link">Sett inn lenke</string>
     <string name="title_style_image">Sett inn bilde</string>
-    <string name="title_style_toolbar">Stil verktøylinjen</string>
     <string name="title_add_attachment">Legg ved fil</string>
+    <string name="title_attachment_file">Legg ved fil</string>
+    <string name="title_attachment_photo">Ta bilde</string>
+    <string name="title_attachment_audio">Ta opp lyd</string>
     <string name="title_show_addresses">Vis Kopi/Blindkopi</string>
+    <string name="title_media_toolbar">Media verktøylinje</string>
     <string name="title_insert_contact_group">Sett inn kontaktgruppe</string>
     <string name="title_insert_template">Sett inn mal</string>
     <string name="title_send_plain_text">Send bare ren tekst</string>
@@ -413,6 +419,7 @@
     <string name="title_draft_saved">Utkast lagret</string>
     <string name="title_ask_send_via">Send meldingen til %1$s via %2$s?</string>
     <string name="title_queued">Sender melding</string>
+    <string name="title_queued_at">Melding vil bli sendt rundt %1$s</string>
     <string name="title_encrypt">Krypter</string>
     <string name="title_decrypt">Dekrypter</string>
     <string name="title_resync">Resync</string>
@@ -429,6 +436,7 @@
     <string name="title_sort_on_sender">Avsender</string>
     <string name="title_sort_on_subject">Emne</string>
     <string name="title_sort_on_size">Størrelse</string>
+    <string name="title_sort_on_snoozed">Utsatt</string>
     <string name="title_filter">Filter</string>
     <string name="title_filter_seen">Les</string>
     <string name="title_filter_snoozed">Utsatt</string>
@@ -587,6 +595,15 @@
         <item>Hver 2. time</item>
         <item>Hver 4. time</item>
     </string-array>
+    <string-array name="sendDelayedNames">
+        <item>Aldri</item>
+        <item>15 sekunder</item>
+        <item>30 sekunder</item>
+        <item>1 minutt</item>
+        <item>2 minutter</item>
+        <item>5 minutter</item>
+        <item>10 minutter</item>
+    </string-array>
     <string-array name="startupNames">
         <item>Enhetlig innboks</item>
         <item>Enhetlige mapper</item>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 0889026385..8c1b57bcfb 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -137,8 +137,8 @@
     <string name="title_setup_black_theme">Czarny motyw</string>
     <string name="title_setup_system_theme">Motyw systemu</string>
     <string name="title_setup_advanced">Zaawansowane</string>
-    <string name="title_setup_defaults">Przywróć domyślne</string>
     <string name="title_setup_options">Opcje</string>
+    <string name="title_setup_defaults">Przywróć domyślne</string>
     <string name="title_advanced">Opcje zaawansowane</string>
     <string name="title_advanced_section_synchronize">Synchronizuj</string>
     <string name="title_advanced_section_connection">Połączenie</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 80523fd395..6ab32cb571 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -121,8 +121,8 @@
     <string name="title_setup_black_theme">Tema escuro</string>
     <string name="title_setup_system_theme">Tema do sistema</string>
     <string name="title_setup_advanced">Avançado</string>
-    <string name="title_setup_defaults">Restaurar padrão</string>
     <string name="title_setup_options">Opções</string>
+    <string name="title_setup_defaults">Restaurar padrão</string>
     <string name="title_advanced">Opções avançadas</string>
     <string name="title_advanced_section_synchronize">Sincronizar</string>
     <string name="title_advanced_section_connection">Conexão</string>
@@ -397,7 +397,6 @@
     <string name="title_style_clear">Limpar formatação</string>
     <string name="title_style_link">Inserir link</string>
     <string name="title_style_image">Inserir imagem</string>
-    <string name="title_style_toolbar">Barra de estilo</string>
     <string name="title_add_attachment">Adicionar anexo</string>
     <string name="title_show_addresses">Mostrar CC/CCO</string>
     <string name="title_insert_contact_group">Inserir grupo de contato</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 3930d8f2ae..ab2e08bdf4 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -129,10 +129,12 @@
     <string name="title_setup_black_theme">Temă neagră</string>
     <string name="title_setup_system_theme">Temă de sistem</string>
     <string name="title_setup_advanced">Setări avansate</string>
-    <string name="title_setup_defaults">Restabiliți valorile implicite</string>
     <string name="title_setup_options">Opţiuni</string>
+    <string name="title_setup_defaults">Restabiliți valorile implicite</string>
+    <string name="title_setup_reset_questions">Resetare întrebări</string>
     <string name="title_advanced">Opțiuni avansate</string>
     <string name="title_advanced_section_synchronize">Sincronizare</string>
+    <string name="title_advanced_section_send">Trimite</string>
     <string name="title_advanced_section_connection">Conexiune</string>
     <string name="title_advanced_section_display">Afișare</string>
     <string name="title_advanced_section_behavior">Comportament</string>
@@ -176,6 +178,7 @@
     <string name="title_advanced_sender">Permite editarea adresei expeditorului</string>
     <string name="title_advanced_prefix_once">Adaugă prefix la subiect o singură dată pentru răspuns sau redirecționare</string>
     <string name="title_advanced_autosend">Confirmă trimiterea mesajelor</string>
+    <string name="title_advanced_send_delayed">Amână trimiterea mesajelor</string>
     <string name="title_advanced_notify_group">Grupează notificări mesaje noi</string>
     <string name="title_advanced_notify_preview">Arată previzualizare mesaj în notificare</string>
     <string name="title_advanced_notify_actions">Acțiuni la notificare</string>
@@ -376,6 +379,7 @@
     <string name="title_raw_saved">Mesaj original salvat</string>
     <string name="title_attachment_saved">Atașament salvat</string>
     <string name="title_attachments_saved">Atașamente salvate</string>
+    <string name="title_attachments_incomplete">Unele atașamente sau imagini nu au fost descărcate și nu s-au putut adăuga</string>
     <string name="title_ask_delete">Ștergeți definitiv mesajul?</string>
     <string name="title_ask_delete_answer">Se șterge permanent șablonul de răspuns?</string>
     <string name="title_ask_delete_rule">Ștergeți regula definitiv?</string>
@@ -407,8 +411,10 @@
     <string name="title_style_clear">Elimină toate formatările</string>
     <string name="title_style_link">Inserare legătură</string>
     <string name="title_style_image">Inserare imagine</string>
-    <string name="title_style_toolbar">Bara de stil</string>
     <string name="title_add_attachment">Adaugă ataşament</string>
+    <string name="title_attachment_file">Atașare fișier</string>
+    <string name="title_attachment_photo">Fă o poză</string>
+    <string name="title_attachment_audio">Înregistrare audio</string>
     <string name="title_show_addresses">Arată CC/BCC</string>
     <string name="title_insert_contact_group">Introduceți grup de contacte</string>
     <string name="title_insert_template">Introduceți șablon</string>
@@ -420,6 +426,7 @@
     <string name="title_draft_saved">Ciornă salvată</string>
     <string name="title_ask_send_via">Trimite mesajul către %1$s via %2$s?</string>
     <string name="title_queued">Expediere mesaj</string>
+    <string name="title_queued_at">Mesajul va fi trimis în aproximativ %1$s</string>
     <string name="title_encrypt">Criptare</string>
     <string name="title_decrypt">Decriptare</string>
     <string name="title_resync">Resincronizare</string>
@@ -436,7 +443,8 @@
     <string name="title_sort_on_sender">Expeditor</string>
     <string name="title_sort_on_subject">Subiect</string>
     <string name="title_sort_on_size">Mărime</string>
-    <string name="title_filter">Filtru</string>
+    <string name="title_sort_on_snoozed">Amânat</string>
+    <string name="title_filter">Filtrare</string>
     <string name="title_filter_seen">Citit</string>
     <string name="title_filter_snoozed">Amânat</string>
     <string name="title_filter_duplicates">Duplicate</string>
@@ -594,6 +602,15 @@
         <item>La fiecare 2 ore</item>
         <item>La fiecare 4 ore</item>
     </string-array>
+    <string-array name="sendDelayedNames">
+        <item>Niciodată</item>
+        <item>15 secunde</item>
+        <item>30 de secunde</item>
+        <item>1 minut</item>
+        <item>2 minute</item>
+        <item>5 minute</item>
+        <item>10 minute</item>
+    </string-array>
     <string-array name="startupNames">
         <item>Căsuță poștală comună</item>
         <item>Dosare unificate</item>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 29433da91e..c82205278f 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -137,8 +137,8 @@
     <string name="title_setup_black_theme">Чёрная тема</string>
     <string name="title_setup_system_theme">Системная тема</string>
     <string name="title_setup_advanced">Дополнительные опции</string>
-    <string name="title_setup_defaults">Восстановить настройки по умолчанию</string>
     <string name="title_setup_options">Опции</string>
+    <string name="title_setup_defaults">Восстановить настройки по умолчанию</string>
     <string name="title_advanced">Дополнительные опции</string>
     <string name="title_advanced_section_synchronize">Синхронизировать</string>
     <string name="title_advanced_section_connection">Соединение</string>
@@ -416,7 +416,6 @@
     <string name="title_style_clear">Очистить форматирование</string>
     <string name="title_style_link">Вставить ссылку</string>
     <string name="title_style_image">Вставить изображение</string>
-    <string name="title_style_toolbar">Панель стилей</string>
     <string name="title_add_attachment">Добавить вложение</string>
     <string name="title_show_addresses">Показать CC / BCC</string>
     <string name="title_insert_contact_group">Добавить группу контактов</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 06ff0f1085..8e12109faf 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -114,8 +114,8 @@
     <string name="title_setup_black_theme">Svart Tema</string>
     <string name="title_setup_system_theme">Systemtema</string>
     <string name="title_setup_advanced">Avancerat</string>
-    <string name="title_setup_defaults">Återställ standardvärden</string>
     <string name="title_setup_options">Alternativ</string>
+    <string name="title_setup_defaults">Återställ standardvärden</string>
     <string name="title_advanced">Avancerade inställningar</string>
     <string name="title_advanced_section_connection">Anslutning</string>
     <string name="title_advanced_section_display">Visning</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index c0be4fc395..450765848d 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -118,8 +118,8 @@
     <string name="title_setup_black_theme">Siyah tema</string>
     <string name="title_setup_system_theme">Sistem teması</string>
     <string name="title_setup_advanced">Gelişmiş</string>
-    <string name="title_setup_defaults">Öntanımlıları geri yükle</string>
     <string name="title_setup_options">Seçenekler</string>
+    <string name="title_setup_defaults">Öntanımlıları geri yükle</string>
     <string name="title_advanced">Gelişmiş seçenekler</string>
     <string name="title_advanced_section_synchronize">Eşzamanlama</string>
     <string name="title_advanced_section_connection">Bağlantı</string>
@@ -391,7 +391,6 @@
     <string name="title_style_clear">Biçimlendirmeyi temizle</string>
     <string name="title_style_link">Bağlantı ekle</string>
     <string name="title_style_image">Resim Ekle</string>
-    <string name="title_style_toolbar">Stil araç çubuğu</string>
     <string name="title_add_attachment">Ek ekle</string>
     <string name="title_show_addresses">CC/BCC göster</string>
     <string name="title_insert_template">Kalıp ekle</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 609bda32a2..8d5393cf99 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -113,10 +113,12 @@
     <string name="title_setup_black_theme">黑色主题</string>
     <string name="title_setup_system_theme">系统主题</string>
     <string name="title_setup_advanced">高级选项</string>
-    <string name="title_setup_defaults">恢复默认设置</string>
     <string name="title_setup_options">选项</string>
+    <string name="title_setup_defaults">恢复默认设置</string>
+    <string name="title_setup_reset_questions">重置问题</string>
     <string name="title_advanced">高级选项</string>
     <string name="title_advanced_section_synchronize">同步</string>
+    <string name="title_advanced_section_send">发送</string>
     <string name="title_advanced_section_connection">连接</string>
     <string name="title_advanced_section_display">显示</string>
     <string name="title_advanced_section_behavior">行为</string>
@@ -160,6 +162,7 @@
     <string name="title_advanced_sender">允许编辑发件人地址</string>
     <string name="title_advanced_prefix_once">答复或抄送邮件时, 主题前的Re或CC只出现一次</string>
     <string name="title_advanced_autosend">确认发送邮件</string>
+    <string name="title_advanced_send_delayed">延迟发送消息</string>
     <string name="title_advanced_notify_group">对新消息通知分组</string>
     <string name="title_advanced_notify_preview">通知中显示消息预览</string>
     <string name="title_advanced_notify_actions">通知操作</string>
@@ -392,8 +395,10 @@
     <string name="title_style_clear">清除格式</string>
     <string name="title_style_link">插入链接</string>
     <string name="title_style_image">插入图片</string>
-    <string name="title_style_toolbar">样式工具栏</string>
     <string name="title_add_attachment">添加附件</string>
+    <string name="title_attachment_file">插入附件</string>
+    <string name="title_attachment_photo">拍照</string>
+    <string name="title_attachment_audio">录音</string>
     <string name="title_show_addresses">显示抄送和密送</string>
     <string name="title_insert_contact_group">插入联系人组</string>
     <string name="title_insert_template">插入模板</string>
@@ -405,6 +410,7 @@
     <string name="title_draft_saved">草稿已保存</string>
     <string name="title_ask_send_via">要通过%2$s把消息发送给 %1$s 吗？</string>
     <string name="title_queued">正在发送邮件</string>
+    <string name="title_queued_at">消息将在 %1$s 左右发送</string>
     <string name="title_encrypt">加密</string>
     <string name="title_decrypt">解密</string>
     <string name="title_resync">重新同步</string>
@@ -421,6 +427,7 @@
     <string name="title_sort_on_sender">发件人</string>
     <string name="title_sort_on_subject">主题</string>
     <string name="title_sort_on_size">大小</string>
+    <string name="title_sort_on_snoozed">已设置待办</string>
     <string name="title_filter">筛选器</string>
     <string name="title_filter_seen">读取</string>
     <string name="title_filter_snoozed">已设置待办</string>
@@ -579,6 +586,15 @@
         <item>每 2 小时</item>
         <item>每 4 小时</item>
     </string-array>
+    <string-array name="sendDelayedNames">
+        <item>从不</item>
+        <item>15秒</item>
+        <item>30秒</item>
+        <item>1分钟</item>
+        <item>2分钟</item>
+        <item>5分钟</item>
+        <item>10分钟</item>
+    </string-array>
     <string-array name="startupNames">
         <item>聚合收件箱</item>
         <item>聚合文件夹</item>