diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 2d4ba115cd..eb7adbbd9a 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -424,6 +424,8 @@
     <string name="title_advanced_discard_delete">Qaralamanı ləğv edəndə, onu birdəfəlik sil</string>
     <string name="title_advanced_reply_move">Bir mesaja cavab verəndə, cavabı eyni qovluqda saxla</string>
     <string name="title_advanced_reply_move_inbox">Həmçinin gələn qutusundakı mesajlar üçün</string>
+    <string name="title_advanced_send_retry_max">Maksimum göndərmə cəhdi</string>
+    <string name="title_advanced_send_retry_hint">Bağlantı dəyişəndə yenidən göndərməyə çalışılacaq</string>
     <string name="title_advanced_auto_link">Bağlantıları avtomatik yarat</string>
     <string name="title_advanced_plain_only">İlkin olaraq yalnız düz mətn göndər</string>
     <string name="title_advanced_plain_only_reply">Yalnız düz mətn mesajına cavab verərkən avtomatik olaraq yalnız düz mətn</string>
@@ -1171,6 +1173,7 @@
     <string name="title_subject_forward_alt">Ynlndr: %1$s</string>
     <string name="title_seen">Oxundu kimi işarələ</string>
     <string name="title_unseen">Oxunmadı kimi işarələ</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Oxundu/oxunmadı işarələ</string>
     <string name="title_toggle_seen">Oxumanı aç/bağla</string>
     <string name="title_hide">Gizlət</string>
     <string name="title_unhide">Göstər</string>
@@ -1588,6 +1591,7 @@
     <string name="title_sort_on_time">Vaxt</string>
     <string name="title_sort_on_unread">Oxunmadı</string>
     <string name="title_sort_on_starred">Ulduzlu</string>
+    <string name="title_sort_on_unread_starred">Oxunmamış, ulduzlu</string>
     <string name="title_sort_on_starred_unread">Ulduzlu, oxunmamış</string>
     <string name="title_sort_on_priority">Əhəmiyyət</string>
     <string name="title_sort_on_sender">Göndərən</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 9530aea493..342d4d670c 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -452,8 +452,8 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_advanced_discard_delete">Při zahození konceptu jej natrvalo smazat</string>
     <string name="title_advanced_reply_move">Při odpovědi na zprávu uložit odpověď do stejné složky</string>
     <string name="title_advanced_reply_move_inbox">Také pro zprávy v Doručených</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Maximální počet pokusů o odeslání</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">Odesílání se bude opakovat při změně konektivity</string>
+    <string name="title_advanced_send_retry_max">Maximální počet pokusů o odeslání</string>
+    <string name="title_advanced_send_retry_hint">Odesílání se bude opakovat při změně konektivity</string>
     <string name="title_advanced_auto_link">Automaticky vytvářet odkazy</string>
     <string name="title_advanced_plain_only">Automaticky odeslat pouze prostý text</string>
     <string name="title_advanced_plain_only_reply">Automaticky použít prostý text pouze při odpovědi na zprávu v režimu vynucení prostého textu</string>
@@ -1200,6 +1200,7 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_subject_forward_alt">Fwd: %1$s</string>
     <string name="title_seen">Označit přečtené</string>
     <string name="title_unseen">Označit nepřečtené</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Přečtené/nepřečtené</string>
     <string name="title_toggle_seen">Označit ne/přečteno</string>
     <string name="title_hide">Skrýt</string>
     <string name="title_unhide">Zobrazit</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 3f8c4aaa61..564868f375 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -424,8 +424,8 @@
     <string name="title_advanced_discard_delete">Ved kassering af udkast, slet dette permanent</string>
     <string name="title_advanced_reply_move">Ved beskedbesvarelse, gem svaret i pågældende mappe</string>
     <string name="title_advanced_reply_move_inbox">Også for beskeder i indbakken</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Maks. afsendelsesforsøg</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">Afsendelse forsøges igen ved forbindelsesændringer</string>
+    <string name="title_advanced_send_retry_max">Maks. afsendelsesforsøg</string>
+    <string name="title_advanced_send_retry_hint">Afsendelse forsøges igen ved forbindelsesændringer</string>
     <string name="title_advanced_auto_link">Opret links automatisk</string>
     <string name="title_advanced_plain_only">Send kun simpel tekst som standard</string>
     <string name="title_advanced_plain_only_reply">Brug automatisk ren tekst ved besvarelse af en ren tekst besked</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 95d487d976..f10457e8a1 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -425,8 +425,8 @@
     <string name="title_advanced_discard_delete">Entwürfe beim Verwerfen dauerhaft löschen</string>
     <string name="title_advanced_reply_move">Beim Antworten auf eine Nachricht die Antwort im selben Ordner speichern</string>
     <string name="title_advanced_reply_move_inbox">Auch für Nachrichten im Posteingang</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Maximale Sendeversuche</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">Bei Verbindungsänderungen wird der Sendeversuch wiederholt</string>
+    <string name="title_advanced_send_retry_max">Maximale Sendeversuche</string>
+    <string name="title_advanced_send_retry_hint">Bei Verbindungsänderungen wird der Sendeversuch wiederholt</string>
     <string name="title_advanced_auto_link">Links automatisch erstellen</string>
     <string name="title_advanced_plain_only">Standardmäßig nur einfachen Text senden</string>
     <string name="title_advanced_plain_only_reply">Beim Antworten auf eine Nachricht im einfachen Text automatisch einfachen Text verwenden</string>
@@ -444,8 +444,8 @@
     <string name="title_advanced_download_headers">Alle Kopfzeilen der Nachricht herunterladen</string>
     <string name="title_advanced_download_eml">Rohnachrichtendateien herunterladen</string>
     <string name="title_advanced_download_plain">Standardmäßig nur Abschnitte im einfachen Text herunterladen (falls verfügbar)</string>
-    <string name="title_advanced_validated">Erfordert eine validierte (geprüfte) Verbindung</string>
-    <string name="title_advanced_validated_captive">Erfordert eine geprüfte Captive-Portal-Verbindung</string>
+    <string name="title_advanced_validated">Validierte (geprüfte) Verbindung voraussetzen</string>
+    <string name="title_advanced_validated_captive">Validierte Captive-Portal-Verbindung voraussetzen</string>
     <string name="title_advanced_vpn_only">Nur über ein VPN verbinden</string>
     <string name="title_advanced_timeout">Zeitüberschreitung der Verbindung (Sekunden)</string>
     <string name="title_advanced_prefer_ip4">IPv4 gegenüber IPv6 bevorzugen</string>
@@ -601,7 +601,7 @@
     <string name="title_advanced_pull_refresh">Zum Aktualisieren nach unten ziehen</string>
     <string name="title_advanced_pull_all">Alle Ordner synchronisieren</string>
     <string name="title_advanced_autoscroll">Beim Empfang neuer Nachrichten nach oben scrollen</string>
-    <string name="title_advanced_double_tap">Doppelt antippen, um eine Nachricht als gelesen bzw. ungelesen zu kennzeichnen</string>
+    <string name="title_advanced_double_tap">Nachricht durch Doppeltippen als gelesen/ungelesen markieren</string>
     <string name="title_advanced_swipenav">Nach links/rechts wischen, um nächste/vorige Unterhaltung anzuzeigen</string>
     <string name="title_advanced_volumenav">Lautstärke hoch/runter, um zur nächsten/vorherigen Unterhaltung zu wechseln</string>
     <string name="title_advanced_up_down">Pfeile nach oben/unten verwenden, um zur nächsten/vorherigen Unterhaltung zu wechseln</string>
@@ -806,7 +806,7 @@
     <string name="title_advanced_check_tls_hint">Dies zeigt ein grünes Schild, sofern eine Nachricht von allen Servern sicher übermittelt wurde</string>
     <string name="title_advanced_check_reply_hint">Überprüft, ob die Domain des Absenders und die Antwort-An-Adresse identisch sind</string>
     <string name="title_advanced_lookup_mx_hint">Überprüft, ob DNS-MX-Einträge vorhanden sind</string>
-    <string name="title_advanced_sync_delay_hint">Dadurch wird die Synchronisierung von Nachrichten verlangsamt</string>
+    <string name="title_advanced_sync_delay_hint">Dadurch wird die Synchronisation von Nachrichten verlangsamt</string>
     <string name="title_advanced_folder_nav_hint">Dadurch kehren Sie von einer Nachrichtenliste immer zur Ordnerliste des zugehörigen Kontos zurück</string>
     <string name="title_advanced_pull_all_hint">Beim Herunterziehen der Ordner- oder Kontenliste</string>
     <string name="title_advanced_suggest_names_hint">Wenn deaktiviert, werden nur E-Mail-Adressen bei der Auswahl von Kontakten verwendet</string>
@@ -867,7 +867,7 @@
     <string name="title_advanced_internal_hint">Beim Senden an eine andere Domain wird ein Warnhinweis ausgegeben</string>
     <string name="title_advanced_uri">Die Details des ausgewählten Kontakts werden für vCard-Anhänge verwendet</string>
     <string name="title_advanced_e2e_encryption">Optionen für Ende-zu-Ende-Verschlüsselung</string>
-    <string name="title_advanced_display_harmful_hint">Deaktivieren dieser Option kann für Ihre Privatsphäre schädlich sein</string>
+    <string name="title_advanced_display_harmful_hint">Das Deaktivieren dieser Option könnte Ihre Privatsphäre beeinträchtigen</string>
     <string name="title_advanced_display_hidden_hint">Das kann zu merkwürdigem Aussehen und doppelten Texten führen</string>
     <string name="title_advanced_display_pin_hint">Eine PIN hat Vorrang vor der biometrischen Authentifizierung</string>
     <string name="title_advanced_user_agent_hint">Einige Server akzeptieren keine allgemeine User-Agent-Zeichenkette</string>
@@ -1175,6 +1175,7 @@
     <string name="title_subject_forward_alt">Wg: %1$s</string>
     <string name="title_seen">Als gelesen kennzeichnen</string>
     <string name="title_unseen">Als ungelesen kennzeichnen</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Als gelesen/ungelesen markieren</string>
     <string name="title_toggle_seen">Gelesen/Ungelesen</string>
     <string name="title_hide">Ausblenden</string>
     <string name="title_unhide">Anzeigen</string>
@@ -2052,7 +2053,7 @@
     <string name="title_compat_dark">Google hat den dunklen Modus für Android-Versionen vor der Version 10 entfernt</string>
     <!-- Thunderbird -->
     <string name="title_keyword_label1">Wichtig</string>
-    <string name="title_keyword_label2">Arbeit</string>
+    <string name="title_keyword_label2">Dienstlich</string>
     <string name="title_keyword_label3">Persönlich</string>
     <string name="title_keyword_label4">Zu erledigen</string>
     <string name="title_keyword_label5">Später</string>
@@ -2262,7 +2263,7 @@
     <string-array name="contactGroupTypes">
         <item>Beliebig(e)</item>
         <item>Privat</item>
-        <item>Geschäftlich</item>
+        <item>Dienstlich</item>
         <item>Andere</item>
         <item>Mobil</item>
     </string-array>
diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml
index 7b3be2ecd4..9e8b07c63d 100644
--- a/app/src/main/res/values-et-rEE/strings.xml
+++ b/app/src/main/res/values-et-rEE/strings.xml
@@ -416,6 +416,8 @@
     <string name="title_advanced_discard_delete">Mustandist loobumisel kustuta mustand jäädavalt</string>
     <string name="title_advanced_reply_move">Sõnumile vastamisel salvesta vastus samasse kausta</string>
     <string name="title_advanced_reply_move_inbox">Ka sisendkasti sõnumite puhul</string>
+    <string name="title_advanced_send_retry_max">Maksimum saatmiskatseid</string>
+    <string name="title_advanced_send_retry_hint">Saatmist üritatakse uuesti ühenduse muutumisel</string>
     <string name="title_advanced_auto_link">Loo lingid automaatselt</string>
     <string name="title_advanced_plain_only">Saada vaikimisi vaid lihttekst</string>
     <string name="title_advanced_plain_only_reply">Vaid lihttekstis sõnumile vastamisel automaatselt vaid lihttekst</string>
@@ -478,6 +480,7 @@
     <string name="title_advanced_nav_message_count">Näita navigeerimismenüüs seadmes talletatud sõnumite arvu</string>
     <string name="title_advanced_nav_unseen_drafts">Näita navigatsioonimenüüs lugemata mustandite arvu</string>
     <string name="title_advanced_nav_pinned_count">Näita lugemata sõnumite arvu kinnitatud navigatsioonimenüüs</string>
+    <string name="title_advanced_show_unexposed">Näita tärni uute lugemata kirjadega kontode/kaustade puhul</string>
     <string name="title_advanced_startup">Näita avaekraanil</string>
     <string name="title_advanced_cards">Kasuta tabeli stiili asemel kaardistiili</string>
     <string name="title_advanced_category">Konto kategooriat saab häälestada peamise seadete ekraani täpsemate võimaluste kaudu</string>
@@ -812,6 +815,7 @@
     <string name="title_advanced_rlah_hint">Eeldusel, et rändlus ei toimu ELis</string>
     <string name="title_advanced_usage_hint">See suurendab aku, andmekasutuse ja talletusruumi kasutust</string>
     <string name="title_advanced_plain_hint">Selle lubamine vähendab andmekasutust, kuid sõnumeid näidatakse vorminduseta</string>
+    <string name="title_advanced_plain_remark">Lihtteksti osa ei sisalda alati kogu sõnumit!</string>
     <string name="title_advanced_tcp_keep_alive_hint">Selle lubamine võib põhjustada mõnedes seadmetes ühenduse probleeme ning suurendada aku kasutust</string>
     <string name="title_advanced_validate_hint">Selle tulemusel võivad sõnumid olla mittesünkroonitud, näiteks VPNi kasutamisel, kuid ka muudes olukordades</string>
     <string name="title_advanced_timeout_hint">Lugemise/kirjutamise ajapiir määratakse kaks korda suuremana ühenduse ajapiirist. Suurem väärtus põhjustab suuremat aku kasutust.</string>
@@ -855,12 +859,26 @@
     <string name="title_advanced_e2e_encryption">Otspunktkrüpteerimise valikud</string>
     <string name="title_advanced_display_harmful_hint">Selle valiku keelamine võib olla ohtlik sinu privaatsusele</string>
     <string name="title_advanced_display_hidden_hint">Tulemuseks võib olla veider välimus ja topelt tekst</string>
+    <string name="title_advanced_display_pin_hint">PIN-kood on ülimuslik biomeetrilise autentimise suhtes</string>
+    <string name="title_advanced_user_agent_hint">Mõned serverid ei aktsepteeri üldist kasutajaagendi stringi</string>
+    <string name="title_advanced_safe_browsing_hint">Google server teab, milliseid aadresse otsitakse</string>
+    <string name="title_advanced_badge_hint">Saadaval vaid toetatud käivitajates</string>
+    <string name="title_advanced_notify_action_hint">Näidatakse kuni kolm tegevust</string>
     <string name="title_advanced_notify_car_hint">Ühendatud tähendab, et midagi projitseeritakse, näiteks liikumiseks kaarti</string>
+    <string name="title_advanced_notify_remove_hint">Uute sõnumite teated eemaldatakse alati, kui neid libistatakse eemale või kui sõnumeid märgitakse loetuks</string>
     <string name="title_advanced_notify_manage_hint">Toksa kanali nimel, et määrata kanali omadusi</string>
     <string name="title_advanced_notify_manage_default_hint">Et määrata vaikeheli jm.</string>
     <string name="title_advanced_notify_manage_service_hint">Monitoorimise teavituse keelamiseks</string>
     <string name="title_advanced_notify_separate_hint">Kuidas ma häälestan teavitusi kontode, kaustade ja saatjate jaoks?</string>
+    <string name="title_advanced_notify_preview_all_hint">Kandeseadmete jaoks, mis suudavad näidata kogu teksti (kuni 5000 märki)</string>
+    <string name="title_advanced_notify_preview_only_hint">See viivitab teadete näitamist, kuni sõnumi tekst on alla laaditud</string>
+    <string name="title_advanced_wearable_hint">Teavitus saadetakse kandeseadmesse üksnes peale sõnumi teksti alla laadimist</string>
+    <string name="title_advanced_messaging_hint">See on vajalik Android Auto toe jaoks</string>
+    <string name="title_advanced_move_hint">Sihtkausta saab häälestada konto seadetes</string>
+    <string name="title_advanced_notify_sensitive_hint">Vajab Androidi seadetes tundlike teadete keelamist</string>
+    <string name="title_advanced_notify_no_grouping">Androidi see versioon ei toeta teadete rühmitamist</string>
     <string name="title_advanced_notify_no_channels">See Androidi versioon ei toeta teavituskanaleid</string>
+    <string name="title_advanced_fts_hint">Selle lubamine parandab otsimise jõudlust, kuid suurendab ka aku ja talletusruumi kasutust</string>
     <string name="title_advanced_english_hint">See taaskäivitab äpi</string>
     <string name="title_advanced_experiments_hint">Hetke eksperimentaalsete oskuste loetelu</string>
     <string name="title_advanced_protocol_hint">See suurendab oluliselt aku ja talletusruumi kasutust!</string>
@@ -1038,6 +1056,8 @@
     <string name="title_edit_contact">Muuda kontakti</string>
     <string name="title_delete_contact">Kustuta kontakt?</string>
     <string name="title_contact_email">E-post</string>
+    <string name="title_contact_name">Nimi</string>
+    <string name="title_contact_group">Rühm</string>
     <string name="title_create_sub_folder">Loo alamkaust</string>
     <string name="title_empty_trash_ask">Kustuta jäädavalt kõik prügikastisõnumid?</string>
     <string name="title_empty_spam_ask">Kustuta jäädavalt kõik spämmsõnumid?</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 972c3651eb..0820e21add 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -374,8 +374,8 @@
     <string name="title_advanced_signature_forward">هنگام هدایت کردن از امضا استفاده کن</string>
     <string name="title_advanced_discard_delete">هنگام دورانداختن پیش‌نویس، پیش‌نویس را برای همیشه حذف کن</string>
     <string name="title_advanced_reply_move_inbox">همچنین برای پیام‌های درون صندوق ورودی</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">حداکثر تلاش ارسال</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">پس از تغییرات ارتباطی، مجددا برای ارسال تلاش خواهد شد</string>
+    <string name="title_advanced_send_retry_max">حداکثر تلاش ارسال</string>
+    <string name="title_advanced_send_retry_hint">پس از تغییرات ارتباطی، مجددا برای ارسال تلاش خواهد شد</string>
     <string name="title_advanced_auto_link">ایجاد خودکار لینک</string>
     <string name="title_advanced_plain_only">فقط متن ساده را به صورت پیش‌فرض بفرست</string>
     <string name="title_advanced_flow">\'قالب جریان\' برای متن ساده</string>
@@ -806,6 +806,7 @@
     <string name="title_subject_forward_alt">هدایت: %1$s</string>
     <string name="title_seen">علامت زدن به عنوان خوانده شده</string>
     <string name="title_unseen">علامت زدن به عنوان خوانده نشده</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">علامت‌گذاری به‌عنوان خوانده شده/خوانده نشده</string>
     <string name="title_hide">پنهان کردن</string>
     <string name="title_unhide">نمایش</string>
     <string name="title_flag">افزودن ستاره</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 9961550ffd..9badedf513 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -424,8 +424,8 @@
     <string name="title_advanced_discard_delete">Lors de l’abandon d’un brouillon, le supprimer définitivement</string>
     <string name="title_advanced_reply_move">Lors de la réponse à un message, enregistrer la réponse dans le même dossier</string>
     <string name="title_advanced_reply_move_inbox">Également pour les messages dans la boîte de réception</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Nombre maximum de tentatives d\'envoi</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">L\'envoi sera tenté de nouveau en cas de changement de connectivité</string>
+    <string name="title_advanced_send_retry_max">Nombre maximum de tentatives d\'envoi</string>
+    <string name="title_advanced_send_retry_hint">L\'envoi sera tenté de nouveau en cas de changement de connectivité</string>
     <string name="title_advanced_auto_link">Créer automatiquement des liens</string>
     <string name="title_advanced_plain_only">Envoyer uniquement le texte brut par défaut</string>
     <string name="title_advanced_plain_only_reply">Texte brut automatique uniquement lors de la réponse à un message en texte brut seul</string>
@@ -1174,6 +1174,7 @@
     <string name="title_subject_forward_alt">Tr: %1$s</string>
     <string name="title_seen">Marquer comme lu</string>
     <string name="title_unseen">Marquer comme non lu</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Marquer lu/non lu</string>
     <string name="title_toggle_seen">Marquer lu/non lu</string>
     <string name="title_hide">Masquer</string>
     <string name="title_unhide">Afficher</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 20c267ba8a..e29b258b60 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -424,8 +424,8 @@
     <string name="title_advanced_discard_delete">Lors de l’abandon d’un brouillon, le supprimer définitivement</string>
     <string name="title_advanced_reply_move">Lors de la réponse à un message, enregistrer la réponse dans le même dossier</string>
     <string name="title_advanced_reply_move_inbox">Également pour les messages dans la boîte de réception</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Nombre maximum de tentatives d\'envoi</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">L\'envoi sera tenté de nouveau en cas de changement de connectivité</string>
+    <string name="title_advanced_send_retry_max">Nombre maximum de tentatives d\'envoi</string>
+    <string name="title_advanced_send_retry_hint">L\'envoi sera tenté de nouveau en cas de changement de connectivité</string>
     <string name="title_advanced_auto_link">Créer automatiquement des liens</string>
     <string name="title_advanced_plain_only">Envoyer uniquement le texte brut par défaut</string>
     <string name="title_advanced_plain_only_reply">Texte brut automatique uniquement en réponse à un message en texte brut exclusivement</string>
@@ -1174,6 +1174,7 @@
     <string name="title_subject_forward_alt">Tr: %1$s</string>
     <string name="title_seen">Marquer comme lu</string>
     <string name="title_unseen">Marquer comme non lu</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Marquer lu/non lu</string>
     <string name="title_toggle_seen">Marquer lu/non lu</string>
     <string name="title_hide">Masquer</string>
     <string name="title_unhide">Afficher</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 204f8ea1c9..bc994d90ae 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -422,6 +422,8 @@ It blokkearjen fan in ôfstjoerderdomein makket gebrûk fan filterregels, wat in
     <string name="title_advanced_discard_delete">By fuortsmiten fan in konsept, it konsept definityf fuotsmite</string>
     <string name="title_advanced_reply_move">Bewarje, by it beäntwurdzjen fan in berjocht, it antwurd yn deselde map</string>
     <string name="title_advanced_reply_move_inbox">Ek foar berjochten yn Postfek YN</string>
+    <string name="title_advanced_send_retry_max">Maksimaal tal ferstjoerbesykjen</string>
+    <string name="title_advanced_send_retry_hint">Ferstjoeren sil opnij probearre wurde by wizigingen yn de ferbining</string>
     <string name="title_advanced_auto_link">Automatysk keppelingen meitsje</string>
     <string name="title_advanced_plain_only">Ferstjoer standert platte tekst</string>
     <string name="title_advanced_plain_only_reply">Automatysk allinnich platte tekst by beäntwurdzjen fan in berjocht mei allinnich platte tekst</string>
@@ -1166,6 +1168,7 @@ https://en.wikipedia.org/wiki/ASCII</string>
     <string name="title_subject_forward_alt">Fwd: %1$s</string>
     <string name="title_seen">As lêzen markearje</string>
     <string name="title_unseen">As net lêzen markearje</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Markearje as lêzen/net-lêzen</string>
     <string name="title_toggle_seen">Lêzen/Net-lêzen</string>
     <string name="title_hide">Ferstopje</string>
     <string name="title_unhide">Toane</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index d2fc5ec55b..f73cda3223 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -408,8 +408,8 @@ Kata sandi diperlukan untuk mengimpor kembali pengaturan, harap jangan sampai lu
     <string name="title_advanced_discard_delete">Hapus draf secara permanen ketika membuangnya</string>
     <string name="title_advanced_reply_move">Pada saat membalas pesan, simpan balasan dalam folder yang sama</string>
     <string name="title_advanced_reply_move_inbox">Juga untuk pesan dalam kotak masuk</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Upaya pengiriman maksimum</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">Pengiriman akan dicoba kembali saat terjadi perubahan konektivitas</string>
+    <string name="title_advanced_send_retry_max">Upaya pengiriman maksimum</string>
+    <string name="title_advanced_send_retry_hint">Pengiriman akan dicoba kembali saat terjadi perubahan konektivitas</string>
     <string name="title_advanced_auto_link">Secara otomatis membuat tautan</string>
     <string name="title_advanced_plain_only">Kirim teks biasa hanya secara bawaan</string>
     <string name="title_advanced_plain_only_reply">Teks biasa secara otomatis hanya saat membalas pesan hanya teks biasa</string>
@@ -1151,6 +1151,7 @@ Kunci dan sertifikat umumnya dapat ditemukan di menu Lanjutan - Enkripsi dan kre
     <string name="title_subject_forward_alt">Fwd: %1$s</string>
     <string name="title_seen">Tandai sudah dibaca</string>
     <string name="title_unseen">Tandai belum dibaca</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Tandai telah/belum dibaca</string>
     <string name="title_toggle_seen">Alihkan ke mode baca</string>
     <string name="title_hide">Sembunyikan</string>
     <string name="title_unhide">Tampilkan</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 52f7cce656..7c84f93e11 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -424,8 +424,8 @@
     <string name="title_advanced_discard_delete">Scartando la bozza, eliminala permanentemente</string>
     <string name="title_advanced_reply_move">Alla risposta a un messaggio, salvala nella stessa cartella</string>
     <string name="title_advanced_reply_move_inbox">Anche per i messaggi nella posta in arrivo</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Numero massimo di tentativi di invio</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">L\'invio sarà riprovato sulle modifiche di connettività</string>
+    <string name="title_advanced_send_retry_max">Tentativi di invio massimi</string>
+    <string name="title_advanced_send_retry_hint">Ritenta l\'invio al cambiare della connettività</string>
     <string name="title_advanced_auto_link">Crea automaticamente i link</string>
     <string name="title_advanced_plain_only">Invia testo semplice di default</string>
     <string name="title_advanced_plain_only_reply">Testo semplice automatico soltanto alla risposta a un messaggio di solo testo semplice</string>
@@ -488,7 +488,7 @@
     <string name="title_advanced_nav_message_count">Mostra il numero di messaggi memorizzati localmente nel menu di navigazione</string>
     <string name="title_advanced_nav_unseen_drafts">Mostra il numero di bozze non lette nel menu di navigazione</string>
     <string name="title_advanced_nav_pinned_count">Mostra il numero di messaggi non letti nel menu di navigazione fissato</string>
-    <string name="title_advanced_show_unexposed">Mostra una stella per profili/cartelle con messaggi non letti ricevuti recentemente</string>
+    <string name="title_advanced_show_unexposed">Mostra una stella per i profili/le cartelle con messaggi non letti appena ricevuti</string>
     <string name="title_advanced_startup">Mostra sulla schermata iniziale</string>
     <string name="title_advanced_cards">Usa stile della carta invece dello stile tabulare</string>
     <string name="title_advanced_category">La categoria del profilo è configurabile nelle opzioni avanzate del profilo tramite la schermata delle impostazioni principali</string>
@@ -498,7 +498,7 @@
     <string name="title_advanced_cards_shadow_border">Mostra bordo</string>
     <string name="title_advanced_cards_shadow_highlight">Usa il colore d\'evidenziazione invece del colore secondario</string>
     <string name="title_advanced_tabular_dividers">Usa le linee divisorie usando lo stile tabulare</string>
-    <string name="title_advanced_tabular_unread_bg">Mostra un colore di sfondo grigio per i messaggi non letti usando lo stile tabulare</string>
+    <string name="title_advanced_tabular_unread_bg">Utilizza un colore di sfondo grigio per i messaggi non letti, utilizzando lo stile a tabella</string>
     <string name="title_advanced_date_header">Raggruppa per data</string>
     <string name="title_advanced_date_week">Raggruppa per settimana invece che per giorno</string>
     <string name="title_advanced_date_fixed">Mostra l\'intestazione a data fissa in cima</string>
@@ -824,7 +824,7 @@
     <string name="title_advanced_rlah_hint">Presumi che non ci sia roaming nell\'UE</string>
     <string name="title_advanced_usage_hint">Questo aumenterà l\'uso di batteria, dati e spazio d\'archiviazione</string>
     <string name="title_advanced_plain_hint">Abilitarlo limiterà l\'uso dei dati, ma i messaggi saranno mostrati senza stilizzazione</string>
-    <string name="title_advanced_plain_remark">La parte testo semplice non contiene sempre il messaggio completo!</string>
+    <string name="title_advanced_plain_remark">La parte in testo semplice non contiene sempre il messaggio completo!</string>
     <string name="title_advanced_tcp_keep_alive_hint">Abilitarlo può causare problemi di connessione su alcuni dispositivi e può aumentare l\'uso della batteria</string>
     <string name="title_advanced_validate_hint">Questo può risultare nel non sincronizzare i messaggi, ad esempio usando una VPN, ma anche altre situazioni</string>
     <string name="title_advanced_timeout_hint">Il timeout di lettura/scrittura sarà impostato al doppio del timeout di connessione. Valori superiori risulteranno in un maggiore uso della batteria.</string>
@@ -1174,6 +1174,7 @@
     <string name="title_subject_forward_alt">Fwd: %1$s</string>
     <string name="title_seen">Segna come letto</string>
     <string name="title_unseen">Segna come non letto</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Segna letto/non letto</string>
     <string name="title_toggle_seen">Attiva/disattiva lettura</string>
     <string name="title_hide">Nascondi</string>
     <string name="title_unhide">Mostra</string>
@@ -1591,8 +1592,8 @@
     <string name="title_sort_on_time">Ora</string>
     <string name="title_sort_on_unread">Non letti</string>
     <string name="title_sort_on_starred">Stellati</string>
-    <string name="title_sort_on_unread_starred">Non letti, stellati</string>
-    <string name="title_sort_on_starred_unread">Stellati, non letti</string>
+    <string name="title_sort_on_unread_starred">Non letti, preferiti</string>
+    <string name="title_sort_on_starred_unread">Preferiti, non letti</string>
     <string name="title_sort_on_priority">Priorità</string>
     <string name="title_sort_on_sender">Mittente</string>
     <string name="title_sort_on_subject">Oggetto</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index fb9521747d..9b9ceb95fd 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -452,8 +452,8 @@
     <string name="title_advanced_discard_delete">השלכת טיוטה מוחקת אותה לצמיתות</string>
     <string name="title_advanced_reply_move">בעת מענה להודעה, המענה יישמר באותה התיקייה</string>
     <string name="title_advanced_reply_move_inbox">גם להודעות בדואר הנכנס</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">כמות ניסיונות השליחה המרבית</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">יתבצע ניסיון לשלוח מחדש בעת שינויים בחיבור</string>
+    <string name="title_advanced_send_retry_max">כמות ניסיונות השליחה המרבית</string>
+    <string name="title_advanced_send_retry_hint">יתבצע ניסיון לשלוח מחדש בעת שינויים בחיבור</string>
     <string name="title_advanced_auto_link">ליצור קישורים אוטומטית</string>
     <string name="title_advanced_plain_only">לשלוח טקסט פשוט בלבד כברירת מחדל</string>
     <string name="title_advanced_plain_only_reply">להפוך לטקסט פשוט אוטומטית בעת שליחת תגובה להודעה שהיא בטקסט פשוט בלבד</string>
@@ -1201,6 +1201,7 @@
     <string name="title_subject_forward_alt">העברה: %1$s</string>
     <string name="title_seen">סימון כנקרא</string>
     <string name="title_unseen">סימון כלא נקרא</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">סימון נקרא/לא נקרא</string>
     <string name="title_toggle_seen">החלפת מצב קריאה</string>
     <string name="title_hide">הסתרה</string>
     <string name="title_unhide">הצגה</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index b7522eb847..553d204774 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -410,8 +410,8 @@
     <string name="title_advanced_discard_delete">下書きを破棄とき完全に削除する</string>
     <string name="title_advanced_reply_move">メッセージに返信したときに返信を同じフォルダーに保存する</string>
     <string name="title_advanced_reply_move_inbox">受信トレイにあるメッセージにも適用する</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">送信試行回数の上限</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">接続が変更されると送信を再試行します</string>
+    <string name="title_advanced_send_retry_max">送信試行回数の上限</string>
+    <string name="title_advanced_send_retry_hint">接続が変更されると送信を再試行します</string>
     <string name="title_advanced_auto_link">自動でリンクを作成する</string>
     <string name="title_advanced_plain_only">デフォルトでプレーンテキストのみ送信する</string>
     <string name="title_advanced_plain_only_reply">プレーンテキストのみのメッセージにはプレーンテキストのみで返信する</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 2c97256b65..0943a59aa1 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -422,8 +422,8 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_discard_delete">Bij het verwijderen van een concept het concept definitief verwijderen</string>
     <string name="title_advanced_reply_move">Sla bij het beantwoorden van een bericht het antwoord op in dezelfde map</string>
     <string name="title_advanced_reply_move_inbox">Ook voor berichten in de inbox</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Maximaal aantal verzendpogingen</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">Verzenden zal opnieuw worden geprobeerd bij wijzigingen in de connectiviteit</string>
+    <string name="title_advanced_send_retry_max">Maximaal aantal verzendpogingen</string>
+    <string name="title_advanced_send_retry_hint">Verzenden zal opnieuw worden geprobeerd bij wijzigingen in de connectiviteit</string>
     <string name="title_advanced_auto_link">Automatisch koppelingen maken</string>
     <string name="title_advanced_plain_only">Verzend standaard platte tekst</string>
     <string name="title_advanced_plain_only_reply">Automatisch alleen platte tekst bij het beantwoorden van een bericht met alleen platte tekst</string>
@@ -1167,6 +1167,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_subject_forward_alt">Fwd: %1$s</string>
     <string name="title_seen">Markeer als gelezen</string>
     <string name="title_unseen">Markeer als ongelezen</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Markeer als ge/ongelezen</string>
     <string name="title_toggle_seen">Lezen omschakelen</string>
     <string name="title_hide">Verbergen</string>
     <string name="title_unhide">Tonen</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index ac7db222ba..edbed84438 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -451,8 +451,8 @@
     <string name="title_advanced_discard_delete">Po odrzuceniu wersji roboczej usuń ją trwale</string>
     <string name="title_advanced_reply_move">Przy odpowiadaniu na wiadomość, zapisz odpowiedź w tym samym folderze</string>
     <string name="title_advanced_reply_move_inbox">Również dla wiadomości w skrzynce odbiorczej</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Maksymalna ilość prób wysłania</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">Wysyłanie będzie ponawiane przy zmianie połączenia</string>
+    <string name="title_advanced_send_retry_max">Maksymalna ilość prób wysłania</string>
+    <string name="title_advanced_send_retry_hint">Wysyłanie będzie ponawiane przy zmianie połączenia</string>
     <string name="title_advanced_auto_link">Automatycznie utwórz linki</string>
     <string name="title_advanced_plain_only">Domyślnie wysyłaj czystym tekstem</string>
     <string name="title_advanced_plain_only_reply">Automatycznie używaj zwykłego tekstu tylko przy odpowiadaniu na wiadomość ze zwykłym tekstem</string>
@@ -1199,6 +1199,7 @@
     <string name="title_subject_forward_alt">Fwd: %1$s</string>
     <string name="title_seen">Oznacz jako przeczytane</string>
     <string name="title_unseen">Oznacz jako nieprzeczytane</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Oznacz przeczytane/nieprzeczytane</string>
     <string name="title_toggle_seen">Przeczytane/nieprzeczytane</string>
     <string name="title_hide">Ukryj</string>
     <string name="title_unhide">Pokaż</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index bff5858a0d..cef11c90c2 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -423,6 +423,8 @@
     <string name="title_advanced_discard_delete">No rascunho de descarte, excluir permanentemente o rascunho</string>
     <string name="title_advanced_reply_move">Ao responder a uma mensagem, salve a resposta na mesma pasta</string>
     <string name="title_advanced_reply_move_inbox">Também para mensagens na caixa de entrada</string>
+    <string name="title_advanced_send_retry_max">Máximo de tentativas de envio</string>
+    <string name="title_advanced_send_retry_hint">O envio será repetido em caso de alterações de conectividade</string>
     <string name="title_advanced_auto_link">Criar links automaticamente</string>
     <string name="title_advanced_plain_only">Enviar texto simples por padrão</string>
     <string name="title_advanced_plain_only_reply">Texto sem formatação automaticamente somente ao responder a uma mensagem somente com texto sem formatação</string>
@@ -1169,6 +1171,7 @@
     <string name="title_subject_forward_alt">Enc: %1$s</string>
     <string name="title_seen">Marcar como lida</string>
     <string name="title_unseen">Marcar como não lida</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Marcar como lido/não lido</string>
     <string name="title_toggle_seen">Alternar status da leitura</string>
     <string name="title_hide">Ocultar</string>
     <string name="title_unhide">Mostrar</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 8df794ad33..4fe9608a5b 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -425,8 +425,8 @@
     <string name="title_advanced_discard_delete">Ao descartar um rascunho, elimina-lo permanentemente</string>
     <string name="title_advanced_reply_move">Ao responder a uma mensagem, guarde a resposta na mesma pasta</string>
     <string name="title_advanced_reply_move_inbox">Também para as mensagens na caixa de entrada</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Número máximo de tentativas de envio</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">O envio será novamente tentado quando ocorrerem alterações de ligação</string>
+    <string name="title_advanced_send_retry_max">Número máximo de tentativas de envio</string>
+    <string name="title_advanced_send_retry_hint">O envio será novamente tentado quando ocorrerem alterações de ligação</string>
     <string name="title_advanced_auto_link">Criar ligações automaticamente</string>
     <string name="title_advanced_plain_only">Enviar texto simples por omissão</string>
     <string name="title_advanced_plain_only_reply">Texto puro automaticamente apenas quando responder a uma mensagem de texto puro</string>
@@ -1174,6 +1174,7 @@ Portanto, este problema só pode ser resolvido pelo seu provedor de e-mail - a i
     <string name="title_subject_forward_alt">Fwd: %1$s</string>
     <string name="title_seen">Marcar como lida</string>
     <string name="title_unseen">Marcar como não lida</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Marcar como lido/não lido</string>
     <string name="title_toggle_seen">Alternar estado de leitura</string>
     <string name="title_hide">Esconder</string>
     <string name="title_unhide">Mostrar</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index a9e15fdeec..41631c0c47 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -437,6 +437,8 @@
     <string name="title_advanced_discard_delete">Ciorna se șterge când renunțați la ea</string>
     <string name="title_advanced_reply_move">Când răspundeți la un mesaj, salvați răspunsul în același dosar</string>
     <string name="title_advanced_reply_move_inbox">De asemenea, pentru mesajele din primite</string>
+    <string name="title_advanced_send_retry_max">Încercări maxime de trimitere</string>
+    <string name="title_advanced_send_retry_hint">Trimiterea va fi reîncercată la schimbarea conectivității</string>
     <string name="title_advanced_auto_link">Creează automat adrese</string>
     <string name="title_advanced_plain_only">Trimite implicit ca text simplu</string>
     <string name="title_advanced_plain_only_reply">Setează automat text simplu doar când se răspunde la un mesaj cu text simplu</string>
@@ -1183,6 +1185,7 @@
     <string name="title_subject_forward_alt">Redir: %1$s</string>
     <string name="title_seen">Marcare ca citit</string>
     <string name="title_unseen">Marcare ca necitit</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Marcat citit/necitit</string>
     <string name="title_toggle_seen">Comutare citire</string>
     <string name="title_hide">Ascunde</string>
     <string name="title_unhide">Arată</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index d54bf67bb6..321a994277 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -451,8 +451,8 @@
     <string name="title_advanced_discard_delete">При отказе от черновика удалять его безвозвратно</string>
     <string name="title_advanced_reply_move">При ответе на сообщение сохранять ответ в той же папке</string>
     <string name="title_advanced_reply_move_inbox">Также для сообщений во \"Входящих\"</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Максимальное количество попыток отправки</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">Отправка повторится при изменении подключения</string>
+    <string name="title_advanced_send_retry_max">Максимальное количество попыток отправки</string>
+    <string name="title_advanced_send_retry_hint">Отправка повторится при изменении подключения</string>
     <string name="title_advanced_auto_link">Автоматическое создание ссылок</string>
     <string name="title_advanced_plain_only">Отправлять простым текстом по умолчанию</string>
     <string name="title_advanced_plain_only_reply">Автоматически использовать обычный текст только при ответе на сообщение с обычным текстом</string>
@@ -1201,6 +1201,7 @@
     <string name="title_subject_forward_alt">Fwd: %1$s</string>
     <string name="title_seen">Отметить как прочитанное</string>
     <string name="title_unseen">Отметить как непрочитанное</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Пометить прочитанным/непрочитанным</string>
     <string name="title_toggle_seen">Прочитано/непрочитано</string>
     <string name="title_hide">Скрыть</string>
     <string name="title_unhide">Показать</string>
diff --git a/app/src/main/res/values-szl-rPL/strings.xml b/app/src/main/res/values-szl-rPL/strings.xml
index ac7db222ba..edbed84438 100644
--- a/app/src/main/res/values-szl-rPL/strings.xml
+++ b/app/src/main/res/values-szl-rPL/strings.xml
@@ -451,8 +451,8 @@
     <string name="title_advanced_discard_delete">Po odrzuceniu wersji roboczej usuń ją trwale</string>
     <string name="title_advanced_reply_move">Przy odpowiadaniu na wiadomość, zapisz odpowiedź w tym samym folderze</string>
     <string name="title_advanced_reply_move_inbox">Również dla wiadomości w skrzynce odbiorczej</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Maksymalna ilość prób wysłania</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">Wysyłanie będzie ponawiane przy zmianie połączenia</string>
+    <string name="title_advanced_send_retry_max">Maksymalna ilość prób wysłania</string>
+    <string name="title_advanced_send_retry_hint">Wysyłanie będzie ponawiane przy zmianie połączenia</string>
     <string name="title_advanced_auto_link">Automatycznie utwórz linki</string>
     <string name="title_advanced_plain_only">Domyślnie wysyłaj czystym tekstem</string>
     <string name="title_advanced_plain_only_reply">Automatycznie używaj zwykłego tekstu tylko przy odpowiadaniu na wiadomość ze zwykłym tekstem</string>
@@ -1199,6 +1199,7 @@
     <string name="title_subject_forward_alt">Fwd: %1$s</string>
     <string name="title_seen">Oznacz jako przeczytane</string>
     <string name="title_unseen">Oznacz jako nieprzeczytane</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Oznacz przeczytane/nieprzeczytane</string>
     <string name="title_toggle_seen">Przeczytane/nieprzeczytane</string>
     <string name="title_hide">Ukryj</string>
     <string name="title_unhide">Pokaż</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index c3ac7320c6..754909418f 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -422,8 +422,8 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_advanced_discard_delete">Taslak gönderildiğinde taslağı kalıcı olarak sil</string>
     <string name="title_advanced_reply_move">Bir mesajı yanıtlarken, yanıtı aynı klasöre kaydedin</string>
     <string name="title_advanced_reply_move_inbox">Ayrıca gelen kutusundaki mesajlar için</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Maksimum gönderme denemesi</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">Bağlantı değişikliklerinde gönderme yeniden denenecektir</string>
+    <string name="title_advanced_send_retry_max">Maksimum gönderme denemesi</string>
+    <string name="title_advanced_send_retry_hint">Bağlantı değişikliklerinde gönderme yeniden denenecektir</string>
     <string name="title_advanced_auto_link">Otomatik olarak bağlantı oluşturun</string>
     <string name="title_advanced_plain_only">Öntanımlı olarak yalnızca düz metin gönder</string>
     <string name="title_advanced_plain_only_reply">Yalnızca düz metin mesajına yanıt verirken otomatik olarak yalnızca düz metin</string>
@@ -1167,6 +1167,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_subject_forward_alt">İlet: %1$s</string>
     <string name="title_seen">Okundu olarak işaretle</string>
     <string name="title_unseen">Okunmadı olarak işaretle</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Okundu/okunmadı olarak işaretle</string>
     <string name="title_toggle_seen">Okumayı aç/kapat</string>
     <string name="title_hide">Gizle</string>
     <string name="title_unhide">Göster</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 0e6590fdc6..3598c61092 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -232,7 +232,7 @@
     <string name="title_setup_select_account">Обрати обліковий запис</string>
     <string name="title_setup_instructions">Інструкції з встановлення</string>
     <string name="title_setup_no_settings">Не знайдено налаштувань для домену \'%1$s\'</string>
-    <string name="title_setup_no_settings_hint">Спробуйте, вручну, налаштувати обліковий запис за допомогою налаштувань, що надаються провайдером електронної пошти</string>
+    <string name="title_setup_no_settings_hint">Спробуйте вручну налаштувати обліковий запис за допомогою налаштувань, що надаються провайдером електронної пошти</string>
     <string name="title_setup_no_auth_hint">Будь ласка, двічі перевірте свою електронну адресу і пароль та переконайтеся, що для вашого облікового запису увімкнений зовнішній доступ (IMAP/SMTP)</string>
     <string name="title_setup_app_password_hint">Цей постачальник вимагає пароль для додатків замість пароля для облікового запису. Будь ласка, перевірте інструкції вашого постачальника.</string>
     <string name="title_setup_no_inbox">Вхідних повідомлень не знайдено</string>
@@ -452,8 +452,8 @@
     <string name="title_advanced_discard_delete">Видаляти чернетку назавжди при відкиданні</string>
     <string name="title_advanced_reply_move">Зберігати повідомлення-відповідь у тій самій теці</string>
     <string name="title_advanced_reply_move_inbox">Також для вхідних повідомлень</string>
-    <string name="title_advanced_send_retry_max" comment="title_advanced_send_retry_max&#10;Title for an option to configure the number of times sending a message will be retried">Максимальна кількість спроб надсилання</string>
-    <string name="title_advanced_send_retry_hint" comment="title_advanced_send_retry_hint&#10;Remark to tell when sending will be attempted again">При зміні підключення буде повторна спроба надсилання</string>
+    <string name="title_advanced_send_retry_max">Максимальна кількість спроб надсилання</string>
+    <string name="title_advanced_send_retry_hint">При зміні підключення буде повторна спроба надсилання</string>
     <string name="title_advanced_auto_link">Автоматично створювати посилання</string>
     <string name="title_advanced_plain_only">Надсилати повідомлення за замовчуванням як простий текст</string>
     <string name="title_advanced_plain_only_reply">Автоматично використовувати простий текст тільки при відповіді на повідомлення, які містять тільки простий текст</string>
@@ -800,7 +800,7 @@
     <string name="title_advanced_beta">Перевірити наявність тестових версій на BitBucket</string>
     <string name="title_advanced_changelog">Показувати список змін після оновлення</string>
     <string name="title_advanced_announcements">Перевірити на оголошення</string>
-    <string name="title_advanced_experiments">Спробуйте експериментальні функції</string>
+    <string name="title_advanced_experiments">Спробувати експериментальні функції</string>
     <string name="title_advanced_crash_reports">Надсилати звіти про помилки</string>
     <string name="title_advanced_cleanup_attachments">Видаляти вкладення для старих повідомлень</string>
     <string name="title_advanced_cleanup">Очистити</string>
@@ -1200,6 +1200,7 @@
     <string name="title_subject_forward_alt">Fw: %1$s</string>
     <string name="title_seen">Позначити як прочитане</string>
     <string name="title_unseen">Позначити як непрочитане</string>
+    <string name="title_seen_unseen" comment="title_seen_unseen&#10;Title for (swipe) action to toggle the read/unread status of a message&#10;Please try to keep it short, so it fits in a pop-up menu, like &quot;Mark un/read&quot;.">Позначити (не-)/прочитаним</string>
     <string name="title_toggle_seen">Перемкнути статус прочитання</string>
     <string name="title_hide">Приховати</string>
     <string name="title_unhide">Показати</string>