diff --git a/app/src/main/assets/SETUP-bg.md b/app/src/main/assets/SETUP-bg.md
new file mode 100644
index 0000000000..c154c6b025
--- /dev/null
+++ b/app/src/main/assets/SETUP-bg.md
@@ -0,0 +1,41 @@
+# Setup help
+
+Setting up FairEmail is fairly simple. You'll need to add at least one account to receive email and at least one identity if you want to send email. The quick setup will add an account and an identity in one go for most major providers.
+
+## Requirements
+
+An internet connection is required to set up accounts and identities.
+
+## Quick setup
+
+Just enter your name, email address and password and tap *Go*.
+
+This will work for most major email providers.
+
+If the quick setup doesn't work, you'll need to setup an account and an identity in another way, see below for instructions.
+
+## Set up account - to receive email
+
+To add an account, tap *Manage accounts* and tap the orange *add* button at the bottom. Select a provider from the list, enter the username, which is mostly your email address and enter your password. Tap *Check* to let FairEmail connect to the email server and fetch a list of system folders. After reviewing the system folder selection you can add the account by tapping *Save*.
+
+If your provider is not in the list of providers, select *Custom*. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right IMAP hostname, port number and protocol (SSL/TLS or STARTTLS). For more about this, please see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts).
+
+## Set up identity - to send email
+
+Similarly, to add an identity, tap *Manage identity* and tap the orange *add* button at the bottom. Enter the name you want to appear in de from address of the emails you send and select a linked account. Tap *Save* to add the identity.
+
+If the account was configured manually, you likely need to configure the identity manually too. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right SMTP hostname, port number and protocol (SSL/TLS or STARTTLS).
+
+See [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) about using aliases.
+
+## Grant permissions - to access contact information
+
+If you want to lookup email addresses, have contact photos shown, etc, you'll need to grant read contacts permission to FairEmail. Just tap *Grant permissions* and select *Allow*.
+
+## Setup battery optimizations - to continuously receive emails
+
+On recent Android versions, Android will put apps to sleep when the screen is off for some time to reduce battery usage. If you want to receive new emails without delays, you should disable battery optimizations for FairEmail. Tap *Disable battery optimizations* and follow the instructions.
+
+## Questions or problems
+
+If you have a question or problem, please [see here](https://github.com/M66B/FairEmail/blob/master/FAQ.md) or use [this contact form](https://contact.faircode.eu/?product=fairemailsupport) to ask for help (you can use the transaction number "*setup help*").
\ No newline at end of file
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
new file mode 100644
index 0000000000..70489fbc5e
--- /dev/null
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index d5c76a901c..3b0642922a 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -11,12 +11,12 @@
     <string name="channel_send">Enviar</string>
     <string name="channel_notification">Notificacions</string>
     <string name="channel_update">Actualitzacions</string>
-    <string name="channel_warning">Avisos</string>
+    <string name="channel_warning">Advertències</string>
     <string name="channel_error">Errors</string>
     <string name="channel_group_contacts">Contactes</string>
     <plurals name="page_conversation">
         <item quantity="one">Conversació</item>
-        <item quantity="other">Conversacions</item>
+        <item quantity="other">Converses</item>
     </plurals>
     <plurals name="page_message">
         <item quantity="one">Missatge</item>
@@ -81,7 +81,7 @@
     <string name="menu_privacy">Privadesa</string>
     <string name="menu_about">Quant a</string>
     <string name="menu_pro">Característiques Pro</string>
-    <string name="menu_invite">Invitació</string>
+    <string name="menu_invite">Convida</string>
     <string name="menu_rate">Puntua l\'aplicació</string>
     <string name="menu_other">Altres aplicacions</string>
     <string name="title_welcome">Benvingut/da</string>
@@ -105,7 +105,7 @@
     <string name="title_setup_quick_hint">La configuració ràpida aconseguirà informació de configuració a autoconfig.thunderbird.net</string>
     <string name="title_setup_quick_imap">Servidor IMAP per rebre missatges</string>
     <string name="title_setup_quick_smtp">Servidor SMTP per rebre missatges</string>
-    <string name="title_setup_go">Vés</string>
+    <string name="title_setup_go">Anar</string>
     <string name="title_setup_wizard">Assistent</string>
     <string name="title_setup_instructions">Instruccions per la configuració</string>
     <string name="title_setup_no_settings">No s\'ha trobat cap configuració pel domini \'%1$s\'</string>
@@ -114,19 +114,19 @@
     <string name="title_setup_manage">Gestiona</string>
     <string name="title_setup_grant">Permet</string>
     <string name="title_setup_account">Configuració dels comptes</string>
-    <string name="title_setup_account_remark">Per rebre correu-e</string>
+    <string name="title_setup_account_remark">Per rebre correu electrònic</string>
     <string name="title_setup_account_hint">Per canviar el color, llisca la carpeta de destinació cap a la dreta/esquerra, etc</string>
     <string name="title_setup_identity">Configuració d\'identitats</string>
-    <string name="title_setup_identity_remark">Per enviar correu-e</string>
+    <string name="title_setup_identity_remark">Per enviar correus electrònics</string>
     <string name="title_setup_identity_hint">Per canviar el nom, color, signatura, etc</string>
     <string name="title_setup_permissions">Concedeix permisos</string>
     <string name="title_setup_permissions_remark">Per accedir informació de contacte (opcional)</string>
     <string name="title_setup_doze">Configuració de l\'optimització de batería</string>
-    <string name="title_setup_doze_remark">Per rebre correu-e contínuament (opcional)</string>
+    <string name="title_setup_doze_remark">Per rebre correu electrònic contínuament (opcional)</string>
     <string name="title_setup_doze_instructions">En el següent diàleg, selecciona \"totes les apps\" a dalt, selecciona aquesta aplicació i polsa i confirma «no optimitzis la bateria»</string>
     <string name="title_setup_doze_battery">Ús de bateria elevat?</string>
     <string name="title_setup_data">L\'estalvi de dades està activat</string>
-    <string name="title_setup_inbox">Ves a missatges</string>
+    <string name="title_setup_inbox">Anar als missatges</string>
     <string name="title_setup_to_do">Per fer</string>
     <string name="title_setup_done">Fet</string>
     <string name="title_setup_export">Exporta la configuració</string>
@@ -141,7 +141,7 @@
     <string name="title_setup_imported">Configuració importada</string>
     <string name="title_setup_notifications">Gestiona les notificacions</string>
     <string name="title_setup_reorder_accounts">Ordre dels comptes</string>
-    <string name="title_setup_reorder_folders">Carpeta ordenada</string>
+    <string name="title_setup_reorder_folders">Ordre de les carpetes</string>
     <string name="title_reset_order">Esborra l\'ordre</string>
     <string name="title_setup_authentication">Autentificació</string>
     <string name="title_setup_biometrics">Autenticació biomètrica</string>
@@ -228,6 +228,7 @@
     <string name="title_advanced_double_tap">Toca dues vegades per marcar el missatge llegit/sense llegir</string>
     <string name="title_advanced_expand_read">Marca els missatges llegits en expandir-se</string>
     <string name="title_advanced_autoexpand">Ampliar automàticament els missatges</string>
+    <string name="title_advanced_expand_one">Expandir només un missatge alhora</string>
     <string name="title_advanced_collapse">Contraure missatges a les converses a la \"part posterior\"</string>
     <string name="title_advanced_autoclose">Tanca automàticament les converses</string>
     <string name="title_advanced_onclose">En tancar una conversa</string>
@@ -287,12 +288,12 @@
     <string name="title_advanced_subscribed_only_hint">Si ho activeu, suprimireu totes les carpetes locals sense subscripció</string>
     <string name="title_advanced_english_hint">Això reiniciarà l\'aplicació</string>
     <string name="title_advanced_experiments_hint">Llista de funcions experimentals actuals</string>
-    <string name="title_advanced_debug_hint">Habiliteu el registre addicional i mostri informació de depuració en diversos llocs</string>
+    <string name="title_advanced_debug_hint">Habiliteu el registre addicional i mostra informació de depuració en diversos llocs</string>
     <string name="title_advanced_cleanup_hint">S\'eliminaran tots els fitxers temporals</string>
     <string name="title_advanced_never_favorite">Mai preferit</string>
     <string name="title_select">Selecciona &#8230;</string>
     <string name="title_identity_name">El teu nom</string>
-    <string name="title_identity_email">La teva adreça de correu-e</string>
+    <string name="title_identity_email">La teva adreça de correu electrònic</string>
     <string name="title_identity_color_hint">Els colors identitaris tenen prioritat sobre els colors del compte</string>
     <string name="title_advanced_sender">Permet editar l\'adreça del remitent</string>
     <string name="title_identity_reply_to">Respon a l’adreça</string>
@@ -329,7 +330,7 @@
     <string name="title_keep_alive_interval">Interval d\'activitat (minuts)</string>
     <string name="title_check">Comprovar</string>
     <string name="title_no_name">Falta nom</string>
-    <string name="title_no_email">Falta l\'adreça de correu-e</string>
+    <string name="title_no_email">Falta l\'adreça de correu electrònic</string>
     <string name="title_email_invalid">L\'adreça de correu electrònic no és vàlida: \'%1$s\'</string>
     <string name="title_address_parse_error">L\'adreça \'%1$s\' és invàlida: %2$s</string>
     <string name="title_no_account">Falta compte</string>
@@ -350,6 +351,7 @@
     <string name="title_edit_html">Edita com HTML</string>
     <string name="title_last_connected">Darrera connexió: %1$s</string>
     <string name="title_pop3_support">POP3 no està suportat</string>
+    <string name="title_activesync_support">ActiveSync no està suportat</string>
     <string name="title_oauth_support">OAuth no està suportat</string>
     <string name="title_synchronize_now">Sincronitza ara</string>
     <string name="title_synchronize_all">Sincronitza tots els missatges</string>
@@ -475,7 +477,7 @@
     <string name="title_reporting_why">La notificació d’errors ajudarà a millorar FairEmail</string>
     <string name="title_compose">Redactar</string>
     <string name="title_from">De:</string>
-    <string name="title_to">A:</string>
+    <string name="title_to">Per a:</string>
     <string name="title_reply_to">Respondre a:</string>
     <string name="title_cc">CC:</string>
     <string name="title_bcc">CCO:</string>
@@ -483,10 +485,11 @@
     <string name="title_received">Rebut: </string>
     <string name="title_size">Mida:</string>
     <string name="title_subject">Assumpte:</string>
-    <string name="title_body_hint">El teu missatge</string>
+    <string name="title_body_hint">El vostre missatge</string>
     <string name="title_discard">Descartar</string>
     <string name="title_save">Desa</string>
     <string name="title_send">Enviar</string>
+    <string name="title_send_with_options">Envia &#8230;</string>
     <string name="title_send_at">Envia a les &#8230;</string>
     <string name="title_no_server">No s\'ha trobat servidor per \'%1$s\'</string>
     <string name="title_style_bold">Negreta</string>
@@ -512,6 +515,7 @@
     <string name="title_attachment_keywords">adjunt, fitxer adjunt, fitxers adjunts inclosos</string>
     <string name="title_attachment_reminder">Teníeu la intenció d’afegir un fitxer adjunt?</string>
     <string name="title_attachments_missing">No es descarreguen tots els fitxers adjunts</string>
+    <string name="title_send_dialog_hint">Aquest diàleg encara estarà disponible a través del menú de desbordament de tres punts de la barra d’acció</string>
     <string name="title_draft_deleted">Esborrany eliminat</string>
     <string name="title_draft_saved">Esborrany desat</string>
     <string name="title_ask_send_via">Enviar missatge a %1$s mitjançant %2$s?</string>
@@ -537,7 +541,7 @@
     <string name="title_sort_on_size">Mida</string>
     <string name="title_sort_on_snoozed">Posposada</string>
     <string name="title_sort_ascending">El més antic primer</string>
-    <string name="title_filter">Filtrar</string>
+    <string name="title_filter">Filtrar per</string>
     <string name="title_filter_seen">Llegir</string>
     <string name="title_filter_unflagged">Sense destacat</string>
     <string name="title_filter_snoozed">Posposada</string>
@@ -622,6 +626,7 @@
     <string name="title_legend_primary">Primari</string>
     <string name="title_legend_subscribed">Subscrit a</string>
     <string name="title_legend_rule">Té normes</string>
+    <string name="title_legend_similar">Cerca missatges similars</string>
     <string name="title_legend_notify">Notificar per a nous missatges</string>
     <string name="title_legend_sync_keep">Nombre de dies per sincronitzar/guardar missatges</string>
     <string name="title_legend_download_fetch">Nombre de missatges descarregats/capçaleres obtingudes</string>
@@ -706,6 +711,7 @@
     <string name="title_report">Informa</string>
     <string name="title_fix">Repara</string>
     <string name="title_enable">Habilita</string>
+    <string name="title_enabled">Activat</string>
     <string name="title_executing">Executant</string>
     <string name="title_completed">Acabat</string>
     <string name="title_ask_what">Pregunteu què heu de fer</string>
@@ -739,7 +745,7 @@
     <string name="title_pro_invalid">Resposta no vàlida</string>
     <string name="title_pro_support">FairEmail necessita el teu ajut. Prem per comprar característiques Pro per mantenir el projecte en marxa.</string>
     <string name="title_unexpected_error">S\'ha produït un error inesperat</string>
-    <string name="title_log">Registre</string>
+    <string name="title_log">Registres</string>
     <string name="title_auto_scroll">Desplaçament automàtic</string>
     <string name="title_debug_info">Informació de depuració</string>
     <string name="title_debug_info_remark">Per favor descriu el problema i indica quan en el que va ocorre:</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index df9c10f132..72d7c00fac 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -247,9 +247,11 @@
     <string name="title_advanced_pull_refresh">Aktualizovat tažením dolů</string>
     <string name="title_advanced_autoscroll">Posun na začátek při příjmu nových zpráv</string>
     <string name="title_advanced_swipenav">Tažením doleva/doprava přejít na předešlou/následující konverzaci</string>
+    <string name="title_advanced_reversed">Obrátit směr navigace</string>
     <string name="title_advanced_double_tap">Dvojstisk pro označení zprávy jako přečtené/nepřečtené</string>
     <string name="title_advanced_expand_read">Označit zprávy jako přečtené při rozbalení</string>
     <string name="title_advanced_autoexpand">Automaticky rozbalovat zprávy</string>
+    <string name="title_advanced_expand_one">Rozbalit vždy pouze jednu zprávu</string>
     <string name="title_advanced_collapse">Sbalit zprávy v konverzacích při pohybu zpět</string>
     <string name="title_advanced_autoclose">Automaticky zavírat konverzace</string>
     <string name="title_advanced_onclose">Při zavření konverzace</string>
@@ -258,7 +260,7 @@
     <string name="title_advanced_discard_delete">Při zahození konceptu jej permanentně smazat</string>
     <string name="title_advanced_tracking">Automaticky rozpoznat a zakázat sledovací obrázky</string>
     <string name="title_advanced_badge">Zobrazit počet nových zpráv na ikoně aplikace</string>
-    <string name="title_advanced_unseen_ignored">Nechť počet nových zpráv odpovídá počtu oznámení</string>
+    <string name="title_advanced_unseen_ignored">Nechť počet nových zpráv souhlasí s počtem oznámení</string>
     <string name="title_advanced_notify_preview">Zobrazit náhled zprávy v oznámení</string>
     <string name="title_advanced_notify_actions">Akce oznámení</string>
     <string name="title_advanced_notify_action_trash">Koš</string>
@@ -536,6 +538,7 @@
     <string name="title_attachment_keywords">příloha,přílohy,příloze,přílohu,přiložené,přiloženém,přiložený,přiložená,připojené,připojeném,připojený,připojená</string>
     <string name="title_attachment_reminder">Měl jste v úmyslu přidat přílohu?</string>
     <string name="title_attachments_missing">Nebyly staženy všechny přílohy</string>
+    <string name="title_send_dialog_hint">Tento dialog bude i nadále dostupný skrze tříbodové rozbalovací menu na panelu akcí</string>
     <string name="title_draft_deleted">Koncept zahozen</string>
     <string name="title_draft_saved">Koncept uložen</string>
     <string name="title_ask_send_via">Odeslat zprávu na %1$s přes %2$s?</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 9eecf1fa22..2243134cad 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -224,10 +224,11 @@
     <string name="title_advanced_pull_refresh">Træk ned for at opfriske</string>
     <string name="title_advanced_autoscroll">Rul til toppen, når ny besked modtages</string>
     <string name="title_advanced_swipenav">Stryg til venstre/højre for at gå til næste/forrige samtale</string>
-    <string name="title_advanced_swipe_reversed">Omvendt strygeretning</string>
+    <string name="title_advanced_reversed">Omvendt navigeringsretning</string>
     <string name="title_advanced_double_tap">Dobbelttryk for at markere besked læst/ulæst</string>
     <string name="title_advanced_expand_read">Markér beskeder Læst ved udvidelse</string>
     <string name="title_advanced_autoexpand">Auto-udvid beskeder</string>
+    <string name="title_advanced_expand_one">Udvid kun én besked ad gangen</string>
     <string name="title_advanced_collapse">Sammenfold beskeder i samtaler ved tryk på Tilbage</string>
     <string name="title_advanced_autoclose">Auto-luk samtaler</string>
     <string name="title_advanced_onclose">Ved lukning af i en samtale</string>
@@ -245,11 +246,13 @@
     <string name="title_advanced_notify_action_reply_direct">Direkte besvarelse</string>
     <string name="title_advanced_notify_action_flag">Stjerne</string>
     <string name="title_advanced_notify_action_seen">Læs</string>
+    <string name="title_advanced_notify_remove">Fjern nye beskednotifikationer ved tryk på notifikationen</string>
     <string name="title_advanced_biometrics_notify">Vis notifikationsindhold ved brug af biometrisk godkendelse</string>
     <string name="title_advanced_light">Benyt notifikations-LED</string>
     <string name="title_advanced_sound">Vælg notifikationslyd</string>
     <string name="title_advanced_badge_hint">Kun tilgængelig i understøttede launchers</string>
     <string name="title_advanced_notify_action_hint">Maksimalt tre handlinger vises</string>
+    <string name="title_advanced_notify_remove_hint">Nye beskednotifikationer fjernes altid, når de stryges væk samt ved markering af beskeder som læste</string>
     <string name="title_advanced_notify_manage_hint">Tryk på kanalnavnet \'Notifikationer\' for at opsætte standardnotifikationslyd mv.</string>
     <string name="title_advanced_double_back">Dobbelttryk \"Tilbage\"/stryg for at lukke</string>
     <string name="title_advanced_biometrics_timeout">Biometrisk godkendelse fik timeout</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 2239f146bd..4fa0ab5437 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -224,7 +224,7 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_advanced_pull_refresh">Zum Aktualisieren nach unten ziehen</string>
     <string name="title_advanced_autoscroll">Nach oben blättern, um neue Nachrichten abzurufen</string>
     <string name="title_advanced_swipenav">Wische nach links/rechts, um zum nächsten/vorherigen Gespräch zu gehen</string>
-    <string name="title_advanced_swipe_reversed">Wischbewegungsrichtungen umkehren</string>
+    <string name="title_advanced_reversed">Navigationsrichtung umkehren</string>
     <string name="title_advanced_double_tap">Doppelt antippen, um die Nachricht als gelesen bzw. ungelesen zu kennzeichnen</string>
     <string name="title_advanced_expand_read">Nachrichten beim Erweitern als gelesen markieren</string>
     <string name="title_advanced_autoexpand">Nachrichten automatisch erweitern</string>
@@ -246,11 +246,13 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_advanced_notify_action_reply_direct">Direktantwort</string>
     <string name="title_advanced_notify_action_flag">Kennzeichnen</string>
     <string name="title_advanced_notify_action_seen">Gelesen</string>
+    <string name="title_advanced_notify_remove">Neue Nachricht-Benachrichtigungen beim Tippen auf die Benachrichtigungen entfernen</string>
     <string name="title_advanced_biometrics_notify">Benachrichtigungsinhalt bei Nutzung der biometrischen Authentifizierung anzeigen</string>
     <string name="title_advanced_light">Benachrichtigungslicht verwenden</string>
     <string name="title_advanced_sound">Benachrichtigungston auswählen</string>
     <string name="title_advanced_badge_hint">Nur verfügbar auf unterstützten Launchern</string>
     <string name="title_advanced_notify_action_hint">Es werden maximal drei Aktionen angezeigt</string>
+    <string name="title_advanced_notify_remove_hint">Neue Nachrichten-Benachrichtigungen werden immer entfernt, wenn sie weggewischt werden oder Nachrichten gelesen werden</string>
     <string name="title_advanced_notify_manage_hint">„Benachrichtigungen” antippen, um den Standard-Benachrichtigungston usw. einzustellen</string>
     <string name="title_advanced_double_back">Doppelt „Zurück” drücken zum Beenden</string>
     <string name="title_advanced_biometrics_timeout">Gültigkeitsdauer der biometrischen Authentifizierung</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 35a61150b7..583a1445a5 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -225,10 +225,11 @@
     <string name="title_advanced_pull_refresh">Tire hacia abajo para actualizar</string>
     <string name="title_advanced_autoscroll">Desplazar hacia arriba al recibir nuevos mensajes</string>
     <string name="title_advanced_swipenav">Deslice a la izquierda/derecha para ir a la siguiente/anterior conversación</string>
-    <string name="title_advanced_swipe_reversed">Invertir la dirección del deslizamiento</string>
+    <string name="title_advanced_reversed">Invertir la dirección de navegación</string>
     <string name="title_advanced_double_tap">Doble toque para marcar mensaje leído/no leído</string>
     <string name="title_advanced_expand_read">Marcar mensajes leídos al expandir</string>
     <string name="title_advanced_autoexpand">Expandir mensajes automáticamente</string>
+    <string name="title_advanced_expand_one">Expandir sólo un mensaje a la vez</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_onclose">Al cerrar una conversación</string>
@@ -246,11 +247,13 @@
     <string name="title_advanced_notify_action_reply_direct">Responder</string>
     <string name="title_advanced_notify_action_flag">Destacar</string>
     <string name="title_advanced_notify_action_seen">Leer</string>
+    <string name="title_advanced_notify_remove">Eliminar notificación de nuevos mensajes al pulsar en la notificación</string>
     <string name="title_advanced_biometrics_notify">Mostrar contenido de notificación al usar autenticación biométrica</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_badge_hint">Sólo disponible en lanzadores soportados</string>
     <string name="title_advanced_notify_action_hint">Máximo 3 acciones mostradas</string>
+    <string name="title_advanced_notify_remove_hint">Las notificaciones de nuevos mensajes siempre serán eliminadas al deslizarlas y al marcar mensajes como leídos</string>
     <string name="title_advanced_notify_manage_hint">Pulse el nombre del canal \"Notificaciones\" para establecer el sonido de notificación por defecto, etc</string>
     <string name="title_advanced_double_back">Doble \'atrás\' para salir</string>
     <string name="title_advanced_biometrics_timeout">Límite de tiempo para autenticación biométrica</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 90877dcbbf..b7431d4c02 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -225,10 +225,11 @@
     <string name="title_advanced_pull_refresh">Vedä alas päivittääksesi</string>
     <string name="title_advanced_autoscroll">Vieritä ylös, kun uusi viesti saapuu</string>
     <string name="title_advanced_swipenav">Pyyhkäise vasemmalle/oikealle siirtyäksesi seuraavaan/edelliseen keskusteluun</string>
-    <string name="title_advanced_swipe_reversed">Käänteinen pyyhkäisysuunta</string>
+    <string name="title_advanced_reversed">Käänteinen navigointisuunta</string>
     <string name="title_advanced_double_tap">Tuplanäpäytys merkitsee viestin luetuksi/lukemattomaksi</string>
     <string name="title_advanced_expand_read">Merkitse viestit luetuiksi laajennettaessa</string>
     <string name="title_advanced_autoexpand">Laajenna viestit automaattisesti</string>
+    <string name="title_advanced_expand_one">Laajenna vain yksi viesti kerrallaan</string>
     <string name="title_advanced_collapse">Tiivistä viestit keskusteluissa takaisin-painikkeella</string>
     <string name="title_advanced_autoclose">Sulje keskustelut automaattisesti</string>
     <string name="title_advanced_onclose">Keskustelua suljettaessa</string>
@@ -246,11 +247,13 @@
     <string name="title_advanced_notify_action_reply_direct">Vastaus</string>
     <string name="title_advanced_notify_action_flag">Tähti</string>
     <string name="title_advanced_notify_action_seen">Luettu</string>
+    <string name="title_advanced_notify_remove">Poista ilmoitus uudesta viestistä näpäyttämällä sitä</string>
     <string name="title_advanced_biometrics_notify">Näytä ilmoituksen sisältö käytettäessä biometristä tunnistautumista</string>
     <string name="title_advanced_light">Käytä LED-ilmoitusta</string>
     <string name="title_advanced_sound">Valitse ilmoituksen ääni</string>
     <string name="title_advanced_badge_hint">Käytössä vain tuetuissa käynnistinsovelluksissa</string>
     <string name="title_advanced_notify_action_hint">Enintään kolme toimintoa näytetään</string>
+    <string name="title_advanced_notify_remove_hint">Ilmoitukset uusista viesteistä poistetaan aina pyyhkäisemällä tai merkitsemällä viestit luetuiksi</string>
     <string name="title_advanced_notify_manage_hint">Näpäytä kanavan nimeä \'Ilmoitukset\' asettaaksesi oletusilmoitusäänen yms.</string>
     <string name="title_advanced_double_back">\'Takaisin\' kaksi kertaa sulkee sovelluksen</string>
     <string name="title_advanced_biometrics_timeout">Biometrisen tunnistautumisen aikakatkaisu</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 838b9dc54a..bee483f1cd 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -199,7 +199,7 @@
     <string name="title_advanced_startup">Afficher sur l\'écran de démarrage</string>
     <string name="title_advanced_cards">Afficher sous forme de cartes</string>
     <string name="title_advanced_date_header">Grouper par date</string>
-    <string name="title_advanced_threading">Fil de conversation</string>
+    <string name="title_advanced_threading">Afficher en mode conversation</string>
     <string name="title_advanced_highlight_unread">Surligner les messages non lus</string>
     <string name="title_advanced_avatars">Afficher la photo des contacts</string>
     <string name="title_advanced_generated_icons">Afficher les icônes générées</string>
@@ -225,7 +225,7 @@
     <string name="title_advanced_pull_refresh">Tirer vers le bas pour actualiser</string>
     <string name="title_advanced_autoscroll">Faire défiler vers le haut lors de la réception de nouveaux messages</string>
     <string name="title_advanced_swipenav">Balayez vers la gauche/droite pour passer à la conversation suivante/précédente</string>
-    <string name="title_advanced_swipe_reversed">Inverser le sens de balayage</string>
+    <string name="title_advanced_reversed">Inverser les directions de navigation</string>
     <string name="title_advanced_double_tap">Appuyez deux fois pour marquer le message lu/non lu</string>
     <string name="title_advanced_expand_read">Marquer les messages comme lus à l\'ouverture</string>
     <string name="title_advanced_autoexpand">Développer automatiquement les messages</string>
@@ -247,11 +247,13 @@
     <string name="title_advanced_notify_action_reply_direct">Répondre directement</string>
     <string name="title_advanced_notify_action_flag">Suivre</string>
     <string name="title_advanced_notify_action_seen">Marquer lu</string>
+    <string name="title_advanced_notify_remove">Supprimer la notification de nouveau message en tapant sur la notification</string>
     <string name="title_advanced_biometrics_notify">Afficher le contenu de notification lors de l\'utilisation de l\'authentification biométrique</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_badge_hint">Uniquement disponible sur les lanceurs pris en charge</string>
     <string name="title_advanced_notify_action_hint">Trois actions au plus seront affichées</string>
+    <string name="title_advanced_notify_remove_hint">Les notifications de nouveau message seront toujours supprimées lors leur balayage et lors du marquage des messages comme lus</string>
     <string name="title_advanced_notify_manage_hint">Appuyez sur le nom du canal \'Notifications\' pour définir le son de notification par défaut, etc</string>
     <string name="title_advanced_double_back">Faire \"Retour\" deux fois pour quitter</string>
     <string name="title_advanced_biometrics_timeout">Délai d\'authentification biométrique</string>
@@ -707,7 +709,7 @@
     <string name="title_undo">Annuler</string>
     <string name="title_redo">Recommencer</string>
     <string name="title_add">Ajouter</string>
-    <string name="title_browse">Utiliser app</string>
+    <string name="title_browse">Utiliser appli</string>
     <string name="title_info">Info</string>
     <string name="title_report">Rapport</string>
     <string name="title_fix">Corriger</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 339c4d4b64..b162ba847e 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -238,6 +238,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_advanced_double_tap">Dvaput dodirnite da biste označili poruku pročitanu / nepročitanu</string>
     <string name="title_advanced_expand_read">Označi poruke pročitanima pri širenju</string>
     <string name="title_advanced_autoexpand">Automatski proširite poruke</string>
+    <string name="title_advanced_expand_one">Proširiti samo jednu poruku istodobno</string>
     <string name="title_advanced_collapse">Sažmi poruke u razgovorima na \"natrag\"</string>
     <string name="title_advanced_autoclose">Automatski zatvori razgovore</string>
     <string name="title_advanced_onclose">Na zatvaranje konverzacije</string>
@@ -635,6 +636,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_legend_primary">Primarno</string>
     <string name="title_legend_subscribed">Pretplaćeno na</string>
     <string name="title_legend_rule">Ima pravila</string>
+    <string name="title_legend_similar">Pretraži slične poruke</string>
     <string name="title_legend_notify">Obavijest za nove poruke</string>
     <string name="title_legend_sync_keep">Broj dana za sinkronizaciju / za čuvanje poruka</string>
     <string name="title_legend_download_fetch">Broj preuzetih poruka / preuzetih zaglavlja</string>
@@ -719,6 +721,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_report">Izvješće</string>
     <string name="title_fix">Popravi</string>
     <string name="title_enable">Omogući</string>
+    <string name="title_enabled">Omogućeno</string>
     <string name="title_executing">Izvršava</string>
     <string name="title_completed">Završeno</string>
     <string name="title_ask_what">Pitati što učiniti</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index a2065698dd..62d0aa11ca 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -224,7 +224,7 @@
     <string name="title_advanced_pull_refresh">Trascina in basso per aggiornare</string>
     <string name="title_advanced_autoscroll">Scorri verso l\'alto quando ricevi nuovi messaggi</string>
     <string name="title_advanced_swipenav">Scorri a sinistra/destra per andare alla conversazione successiva/precedente</string>
-    <string name="title_advanced_swipe_reversed">Inverti direzione scorrimento</string>
+    <string name="title_advanced_reversed">Inverti direzione di navigazione</string>
     <string name="title_advanced_double_tap">Doppio tocco per segnare il messaggio letto/non letto</string>
     <string name="title_advanced_expand_read">Segna i messaggi come letti in fase di espansione</string>
     <string name="title_advanced_autoexpand">Espandi automaticamente i messaggi</string>
@@ -246,11 +246,13 @@
     <string name="title_advanced_notify_action_reply_direct">Risposta diretta</string>
     <string name="title_advanced_notify_action_flag">Stella</string>
     <string name="title_advanced_notify_action_seen">Letto</string>
+    <string name="title_advanced_notify_remove">Rimuovi la notifica di nuovo messaggio quando si tocca la notifica</string>
     <string name="title_advanced_biometrics_notify">Mostra il contenuto delle notifiche quando si utilizza l\'autenticazione biometrica</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_badge_hint">Disponibile solo sui launcher supportati</string>
     <string name="title_advanced_notify_action_hint">Verranno mostrate al massimo tre azioni</string>
+    <string name="title_advanced_notify_remove_hint">Le notifiche di nuovo messaggio verranno sempre rimosse quando vengono eliminate via scorrimento e quando i messaggi vengono contrassegnati come letti</string>
     <string name="title_advanced_notify_manage_hint">Tocca il nome del canale \'Notifiche\' per impostare il suono di notifica predefinito, ecc</string>
     <string name="title_advanced_double_back">Doppio \'indietro\' per uscire</string>
     <string name="title_advanced_biometrics_timeout">Timeout autenticazione biometrica</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 79c0bec6dc..a91cf4305d 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -225,7 +225,7 @@
     <string name="title_advanced_pull_refresh">Omlaag schuiven om te verversen</string>
     <string name="title_advanced_autoscroll">Scroll naar boven bij het ontvangen van nieuwe berichten</string>
     <string name="title_advanced_swipenav">Veeg links/rechts om naar het volgende/vorige gesprek te gaan</string>
-    <string name="title_advanced_swipe_reversed">Keer veegrichting om</string>
+    <string name="title_advanced_reversed">Keer navigatierichting om</string>
     <string name="title_advanced_double_tap">Dubbel tik om bericht gelezen/ongelezen te markeren</string>
     <string name="title_advanced_expand_read">Markeer berichten gelezen bij uitvouwen</string>
     <string name="title_advanced_autoexpand">Berichten automatisch uitvouwen</string>
@@ -247,11 +247,13 @@
     <string name="title_advanced_notify_action_reply_direct">Direct antwoord</string>
     <string name="title_advanced_notify_action_flag">Ster</string>
     <string name="title_advanced_notify_action_seen">Gelezen</string>
+    <string name="title_advanced_notify_remove">Verwijder melding van nieuw bericht bij het tikken op melding</string>
     <string name="title_advanced_biometrics_notify">Toon notificatie inhoud bij het gebruik van biometrische verificatie</string>
     <string name="title_advanced_light">Gebruik meldingslicht</string>
     <string name="title_advanced_sound">Selecteer meldingsgeluid</string>
     <string name="title_advanced_badge_hint">Alleen beschikbaar op ondersteunde launchers</string>
     <string name="title_advanced_notify_action_hint">Er worden maximaal drie acties getoond</string>
+    <string name="title_advanced_notify_remove_hint">Meldingen van nieuwe berichten worden altijd verwijderd als ze worden weggeveegd en als berichten worden gemarkeerd als gelezen</string>
     <string name="title_advanced_notify_manage_hint">Tik op de naam van het kanaal \'Meldingen\' om het standaard meldingsgeluid in te stellen, etc</string>
     <string name="title_advanced_double_back">Dubbel \'terug\' om te sluiten</string>
     <string name="title_advanced_biometrics_timeout">Biometrische verificatie verlopen na</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 8d79bded71..7215fc363d 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -225,7 +225,6 @@
     <string name="title_advanced_pull_refresh">Dra ned for å oppdatere</string>
     <string name="title_advanced_autoscroll">Rull til toppen når du mottar nye meldinger</string>
     <string name="title_advanced_swipenav">Sveip til venstre/høyre for å gå til neste/forrige samtale</string>
-    <string name="title_advanced_swipe_reversed">Reversere sveipe retning</string>
     <string name="title_advanced_double_tap">Dobbeltklikk for å markere meldingen lest/ulest</string>
     <string name="title_advanced_expand_read">Merk meldinger som er lest når de utvides</string>
     <string name="title_advanced_autoexpand">Utvid automatisk meldinger</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 8d79bded71..7215fc363d 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -225,7 +225,6 @@
     <string name="title_advanced_pull_refresh">Dra ned for å oppdatere</string>
     <string name="title_advanced_autoscroll">Rull til toppen når du mottar nye meldinger</string>
     <string name="title_advanced_swipenav">Sveip til venstre/høyre for å gå til neste/forrige samtale</string>
-    <string name="title_advanced_swipe_reversed">Reversere sveipe retning</string>
     <string name="title_advanced_double_tap">Dobbeltklikk for å markere meldingen lest/ulest</string>
     <string name="title_advanced_expand_read">Merk meldinger som er lest når de utvides</string>
     <string name="title_advanced_autoexpand">Utvid automatisk meldinger</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index b523ebf990..1a702d6188 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -250,6 +250,7 @@
     <string name="title_advanced_double_tap">Kliknij podwójnie, aby oznaczyć odczytane/nieodczytane</string>
     <string name="title_advanced_expand_read">Oznacz wiadomości jako przeczytane przy rozwijaniu</string>
     <string name="title_advanced_autoexpand">Automatycznie rozwijaj wiadomości</string>
+    <string name="title_advanced_expand_one">Rozwiń tylko jedną wiadomość na raz</string>
     <string name="title_advanced_collapse">Zwiń wiadomości w konwersacji przy \'cofnij\'</string>
     <string name="title_advanced_autoclose">Automatycznie zamykaj konwersacje</string>
     <string name="title_advanced_onclose">Przy zamykaniu wiadomości</string>
@@ -647,6 +648,7 @@
     <string name="title_legend_primary">Podstawowe</string>
     <string name="title_legend_subscribed">Zasubskrybowano</string>
     <string name="title_legend_rule">Ma reguły</string>
+    <string name="title_legend_similar">Szukaj podobnych wiadomości</string>
     <string name="title_legend_notify">Powiadom o nowych wiadomościach</string>
     <string name="title_legend_sync_keep">Liczba dni do synchronizacji / zachowania wiadomości</string>
     <string name="title_legend_download_fetch">Liczba pobranych wiadomości / pobranych nagłówków</string>
@@ -731,6 +733,7 @@
     <string name="title_report">Raport</string>
     <string name="title_fix">Popraw</string>
     <string name="title_enable">Włącz</string>
+    <string name="title_enabled">Włączone</string>
     <string name="title_executing">Wykonywanie</string>
     <string name="title_completed">Ukończone</string>
     <string name="title_ask_what">Zapytaj co zrobić</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 9a04a0f111..c00b9ae69e 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -236,9 +236,11 @@
     <string name="title_advanced_pull_refresh">Trageți în jos pentru a actualiza</string>
     <string name="title_advanced_autoscroll">Derulează sus când se primește un mesaj nou</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_reversed">Inversează direcția de navigare</string>
     <string name="title_advanced_double_tap">Atingeți de două ori pentru a marca mesajul ca ne/citit</string>
     <string name="title_advanced_expand_read">Marchează mesajele ca citite la extindere</string>
     <string name="title_advanced_autoexpand">Extinde mesajele automat</string>
+    <string name="title_advanced_expand_one">Extinde doar câte un mesaj odată</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_onclose">La închiderea conversației</string>
@@ -256,11 +258,13 @@
     <string name="title_advanced_notify_action_reply_direct">Răspuns</string>
     <string name="title_advanced_notify_action_flag">Stea</string>
     <string name="title_advanced_notify_action_seen">Citit</string>
+    <string name="title_advanced_notify_remove">Elimina notificarea de mesaj nou dacă se atinge</string>
     <string name="title_advanced_biometrics_notify">Arată conținutul notificării atunci când se utilizează autentificarea biometrică</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_badge_hint">Disponibil doar pe lansatoarele suportate</string>
     <string name="title_advanced_notify_action_hint">Maxim trei acțiuni vor fi afișate</string>
+    <string name="title_advanced_notify_remove_hint">Notificările de mesaj nou vor fi mereu eliminate dacă sunt glisate la o parte sau când mesajele sunt marcate drept citite</string>
     <string name="title_advanced_notify_manage_hint">Atingeți numele canalului \'Notificări\' pentru a configura sunetul implicit, etc</string>
     <string name="title_advanced_double_back">Apăsați de două ori \'înapoi\' pentru a ieși</string>
     <string name="title_advanced_biometrics_timeout">Expirare autentificarea biometrică</string>
@@ -636,6 +640,7 @@
     <string name="title_legend_primary">Primar</string>
     <string name="title_legend_subscribed">Abonat la</string>
     <string name="title_legend_rule">Există reguli</string>
+    <string name="title_legend_similar">Căutare mesaje similare</string>
     <string name="title_legend_notify">Notificare la mesaje noi</string>
     <string name="title_legend_sync_keep">Numărul de zile de sincronizat / păstrat mesaje</string>
     <string name="title_legend_download_fetch">Numărul de mesaje / antete de descărcat</string>
@@ -720,6 +725,7 @@
     <string name="title_report">Raportează</string>
     <string name="title_fix">Remediere</string>
     <string name="title_enable">Activează</string>
+    <string name="title_enabled">Activat</string>
     <string name="title_executing">Se execută</string>
     <string name="title_completed">Finalizat</string>
     <string name="title_ask_what">Întreabă ce să faci</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 71b08a11d0..cdb8e7b782 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -179,6 +179,7 @@
     <string name="title_advanced_sync_subscribed">Yalnızca aboneliği olan dizinleri eşitle</string>
     <string name="title_advanced_keyboard">Öntanımlı olarak klavyeyi göster</string>
     <string name="title_advanced_suggest_local">Yerel olarak depolanmış kişileri öner</string>
+    <string name="title_advanced_suggest_sent">Daha önce gönderilmiş iletilerde bulunan adresleri öner</string>
     <string name="title_advanced_prefix_once">Önek konu sadece bir kez yanıtlarken veya yönlendirme</string>
     <string name="title_advanced_plain_only">Öntanımlı olarak yalnızca düz metin gönder</string>
     <string name="title_advanced_usenet_signature">Kullanıcı ağı imza sözleşmesi</string>
@@ -339,6 +340,7 @@
     <string name="title_edit_html">HTML olarak düzenle</string>
     <string name="title_last_connected">Son bağlantı: %1$s</string>
     <string name="title_pop3_support">POP3 desteklenmiyor</string>
+    <string name="title_activesync_support">ActiveSync desteklenmiyor</string>
     <string name="title_synchronize_now">Şimdi eşzamanla</string>
     <string name="title_synchronize_all">Tüm iletileri eşzamanla</string>
     <string name="title_synchronize_enabled">Eşzamanlama</string>
@@ -495,6 +497,7 @@
     <string name="title_send_plain_text">Yalnızca düz metin</string>
     <string name="title_from_missing">Gönderici Eksik</string>
     <string name="title_to_missing">Alıcı eksik</string>
+    <string name="title_subject_reminder">Konu boş</string>
     <string name="title_attachment_reminder">Bir ek eklemek niyetinde misiniz?</string>
     <string name="title_attachments_missing">Tüm ekler indirilmedi</string>
     <string name="title_draft_deleted">Taslak silindi</string>
@@ -604,6 +607,7 @@
     <string name="title_legend_primary">Birincil</string>
     <string name="title_legend_subscribed">Abone olundu</string>
     <string name="title_legend_rule">Kuralları var</string>
+    <string name="title_legend_similar">Benzer iletileri ara</string>
     <string name="title_legend_notify">Yeni iletileri bildir</string>
     <string name="title_legend_sync_keep">İletilerin eşzamanlanacağı / saklanacağı gün sayısı</string>
     <string name="title_legend_download_fetch">İndirilen iletilerin / alınan başlıkların sayısı</string>
@@ -661,6 +665,7 @@
     <string name="title_hint_folder_actions">Seçenekler için uzun basın</string>
     <string name="title_hint_folder_sync">Pil ve ağ kullanımını sınırlamak için, öntanımlı olarak tüm klasörler ve tüm iletilere eşzamanlama yapılmayacak</string>
     <string name="title_hint_support">Bir soru ya da bir probleminiz varsa, lütfen yardım almak için destek menüsünü kullanın</string>
+    <string name="title_hint_message_selection">Birden fazla ileti seçmeye başlamak için bir mesaja uzun basın; basılı tutarak ve yukarı veya aşağı kaydırın ve iletileri seçin</string>
     <string name="title_hint_sync">Mesajların indirilmesi, sağlayıcının hızına, internet bağlantısına ve cihazın hızına ve mesaj sayısına bağlı olarak biraz zaman alabilir. Mesajları indirirken uygulama daha yavaş yanıt verebilir.</string>
     <string name="title_hint_image_link">Görsel bağlantısı</string>
     <string name="title_hint_tracking_image">İzlenen görsel %1$sx%2$s</string>
@@ -686,6 +691,7 @@
     <string name="title_report">Rapor Et</string>
     <string name="title_fix">Düzelt</string>
     <string name="title_enable">Etkin</string>
+    <string name="title_enabled">Etkin</string>
     <string name="title_executing">Yürütülüyor</string>
     <string name="title_completed">Tamamlandı</string>
     <string name="title_ask_what">Ne yapılacağını sor</string>
@@ -698,6 +704,7 @@
     <string name="title_1day">1 gün</string>
     <string name="title_now">Şimdi</string>
     <string name="title_after">%1$s\'den sonra</string>
+    <string name="title_reset">Sıfırlama</string>
     <string name="title_icalendar_accept">Kabul</string>
     <string name="title_icalendar_decline">Reddet</string>
     <string name="title_icalendar_maybe">Olabilir</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6022c1702a..0d86dd7540 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -213,10 +213,11 @@
     <string name="title_advanced_pull_refresh">下拉刷新</string>
     <string name="title_advanced_autoscroll">在收到新消息时滚动至顶部</string>
     <string name="title_advanced_swipenav">向左/右滑动来前往下一个/上一个邮件会话</string>
-    <string name="title_advanced_swipe_reversed">反转滑动方向</string>
+    <string name="title_advanced_reversed">翻转导航方向</string>
     <string name="title_advanced_double_tap">双击标记消息已读/未读</string>
     <string name="title_advanced_expand_read">将展开的消息标记为已读</string>
     <string name="title_advanced_autoexpand">自动伸展消息</string>
+    <string name="title_advanced_expand_one">每次仅展开一个消息</string>
     <string name="title_advanced_collapse">按返回键折叠对话中的邮件</string>
     <string name="title_advanced_autoclose">自动关闭对话</string>
     <string name="title_advanced_onclose">关闭对话时</string>
@@ -234,11 +235,13 @@
     <string name="title_advanced_notify_action_reply_direct">直接回复</string>
     <string name="title_advanced_notify_action_flag">标星</string>
     <string name="title_advanced_notify_action_seen">已读</string>
+    <string name="title_advanced_notify_remove">点击通知时移除新的消息通知</string>
     <string name="title_advanced_biometrics_notify">使用生物认证时显示通知内容</string>
     <string name="title_advanced_light">使用指示灯</string>
     <string name="title_advanced_sound">选择通知提示音</string>
     <string name="title_advanced_badge_hint">仅可用于支持的启动器</string>
     <string name="title_advanced_notify_action_hint">最多显示三项操作</string>
+    <string name="title_advanced_notify_remove_hint">滑动走并标记消息已读时将总是移除新消息通知</string>
     <string name="title_advanced_notify_manage_hint">点击频道名称“通知”设置默认通知声音等</string>
     <string name="title_advanced_double_back">双击返回键退出</string>
     <string name="title_advanced_biometrics_timeout">生物认证超时</string>