diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 48fa2173ab..1e37588770 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -554,8 +554,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">المُرسِل</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">محظور</item>
+        <item>المُرسِل</item>
+        <item>محظور</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 48fa2173ab..1e37588770 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -554,8 +554,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">المُرسِل</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">محظور</item>
+        <item>المُرسِل</item>
+        <item>محظور</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index f9dc3d207f..f52377ecba 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -625,8 +625,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">المُرسِل</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">محظور</item>
+        <item>المُرسِل</item>
+        <item>محظور</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 23c27e02ff..548745ecc7 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -610,8 +610,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">المُرسِل</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">محظور</item>
+        <item>المُرسِل</item>
+        <item>محظور</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e5e595a30f..771f48569a 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -547,8 +547,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">المُرسِل</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">محظور</item>
+        <item>المُرسِل</item>
+        <item>محظور</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 4509ea2f87..9d433a4249 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -156,7 +156,6 @@
     <string name="title_setup_gmail_password">Bir hesaba bir şifrə ilə səlahiyyət vermək istəyirəm</string>
     <string name="title_setup_office_auth">\'AUTHENTICATE failed\' xətası, sistem administratorunun IMAP/SMTP-ni sıradan çıxartdığı üçün baş verə bilər</string>
     <string name="title_setup_oauth_rationale">%1$s hesabınıza müraciət üçün səlahiyyət verin</string>
-    <string name="title_setup_oauth_update">Mövcud hesaba təkrar səlahiyyət verin</string>
     <string name="title_setup_oauth_updated">Hesab səlahiyyətləndirmə yeniləndi</string>
     <string name="title_setup_oauth_authorize">Səlahiyyət ver</string>
     <string name="title_setup_select_account">Hesab seç</string>
@@ -1838,8 +1837,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Alan</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Göndərən</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Əngəlləndi</item>
+        <item>Göndərən</item>
+        <item>Əngəlləndi</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index ec5e2911d8..1684481e88 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1449,8 +1449,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Получател</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Подател</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Блокиран</item>
+        <item>Подател</item>
+        <item>Блокиран</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 794fb074ca..37b7b732a8 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -140,8 +140,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Sender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">অবরুদ্ধ</item>
+        <item>Sender</item>
+        <item>অবরুদ্ধ</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index 9e13678313..90e9a0febf 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -146,8 +146,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Sender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">অবরুদ্ধ</item>
+        <item>Sender</item>
+        <item>অবরুদ্ধ</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index 88a561ae75..d46bb4c2f7 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -169,7 +169,6 @@
     <string name="title_setup_gmail_password">Želim autorizovati račun s lozinkom</string>
     <string name="title_setup_office_auth">Greška \'PROVJERA nije uspjela\' može biti uzrokovana postavkama IMAP/SMTP-a koje je isključio sistemski administrator</string>
     <string name="title_setup_oauth_rationale">Autorizuj pristup vašem%1$s računu</string>
-    <string name="title_setup_oauth_update">Autorizuj postojeći račun opet</string>
     <string name="title_setup_oauth_updated">Autorizacija računa je ažurirana</string>
     <string name="title_setup_oauth_authorize">Autorizuj</string>
     <string name="title_setup_select_account">Izaberite račun</string>
@@ -862,7 +861,7 @@
     <string name="title_edit_contact">Uredi kontakt</string>
     <string name="title_contact_email">E-pošta</string>
     <string name="title_contact_name">Naziv</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Grupa</string>
+    <string name="title_contact_group">Grupa</string>
     <string name="title_import_contacts">Uvezi vCards-e</string>
     <string name="title_export_contacts">Izvezi vCards-e</string>
     <string name="title_create_sub_folder">Kreiraj podfolder</string>
@@ -1853,8 +1852,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Primalac</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Pošiljalac</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokiran</item>
+        <item>Pošiljalac</item>
+        <item>Blokiran</item>
         <item>Deblokiran</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 61bc55d03f..339441a53d 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -1288,8 +1288,8 @@ Ambdues opcions es poden desactivar si es desitja.</string>
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatari</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Remitent</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Bloquejat</item>
+        <item>Remitent</item>
+        <item>Bloquejat</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 2f8e4a4bc7..0e2577a7e6 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -179,7 +179,6 @@
     <string name="title_setup_gmail_password">Chci autorizovat účet pomocí hesla</string>
     <string name="title_setup_office_auth">Chyba „AUTHENTICATE failed“ může být způsobena zakázaným IMAP/SMTP správcem systému</string>
     <string name="title_setup_oauth_rationale">Autorizovat přístup k vašemu účtu %1$s</string>
-    <string name="title_setup_oauth_update">Znovu autorizovat již existující účet</string>
     <string name="title_setup_oauth_updated">Autorizace účtu byla aktualizována</string>
     <string name="title_setup_oauth_authorize">Autorizovat</string>
     <string name="title_setup_select_account">Vybrat účet</string>
@@ -871,7 +870,7 @@
     <string name="title_edit_contact">Upravit kontakt</string>
     <string name="title_contact_email">E-mail</string>
     <string name="title_contact_name">Název</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Skupina</string>
+    <string name="title_contact_group">Skupina</string>
     <string name="title_import_contacts">Importovat vCard</string>
     <string name="title_export_contacts">Exportovat vCard</string>
     <string name="title_create_sub_folder">Vytvořit podsložku</string>
@@ -1866,8 +1865,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Příjemce</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Odesílatel</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokováno</item>
+        <item>Odesílatel</item>
+        <item>Blokováno</item>
         <item>Neblokováno</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 72af2984b8..d2a10b7ef1 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -159,7 +159,7 @@
     <string name="title_setup_gmail_password">Jeg ønsker at godkende en konto med en adgangskode</string>
     <string name="title_setup_office_auth">Fejlen \'GODKENDELSE mislykkedes\' kan skyldes, at IMAP/SMTP er deaktiveret af systemadministratoren</string>
     <string name="title_setup_oauth_rationale">Godkend adgang til din %1$s-konto</string>
-    <string name="title_setup_oauth_update">Godkend eksisterende konto igen</string>
+    <string name="title_setup_oauth_update">Godkend en eksisterende konto igen (ellers opret en ny konto)</string>
     <string name="title_setup_oauth_updated">Kontogodkendelsen blev opdateret</string>
     <string name="title_setup_oauth_authorize">Godkend</string>
     <string name="title_setup_select_account">Vælg konto</string>
@@ -853,7 +853,7 @@
     <string name="title_edit_contact">Redigér Kontakt</string>
     <string name="title_contact_email">E-mail</string>
     <string name="title_contact_name">Navn</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Gruppe</string>
+    <string name="title_contact_group">Gruppe</string>
     <string name="title_import_contacts">Importere vCard</string>
     <string name="title_export_contacts">Eksportere vCard</string>
     <string name="title_create_sub_folder">Opret undermappe</string>
@@ -1849,8 +1849,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Modtager</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Afsender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokeret</item>
+        <item>Afsender</item>
+        <item>Blokeret</item>
         <item>Ublokeret</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 8fa8bd2d78..d8a2d3be49 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -158,7 +158,7 @@
     <string name="title_setup_gmail_password">Ich möchte ein Konto mit einem Passwort autorisieren</string>
     <string name="title_setup_office_auth">Der Fehler »AUTHENTICATE failed« kann dadurch verursacht werden, dass IMAP/SMTP vom Systemverwalter deaktiviert wurde</string>
     <string name="title_setup_oauth_rationale">Zugriff auf Ihr %1$s -Konto autorisieren</string>
-    <string name="title_setup_oauth_update">Vorhandenes Konto erneut autorisieren</string>
+    <string name="title_setup_oauth_update">Ein bestehendes Konto erneut autorisieren (andernfalls erstellen Sie ein neues Konto)</string>
     <string name="title_setup_oauth_updated">Kontoautorisierung wurde aktualisiert</string>
     <string name="title_setup_oauth_authorize">Autorisieren</string>
     <string name="title_setup_select_account">Konto wählen</string>
@@ -850,7 +850,7 @@
     <string name="title_edit_contact">Kontakt bearbeiten</string>
     <string name="title_contact_email">Neue E-Mail</string>
     <string name="title_contact_name">Name</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Gruppe</string>
+    <string name="title_contact_group">Gruppe</string>
     <string name="title_import_contacts">vCards importieren</string>
     <string name="title_export_contacts">vCards exportieren</string>
     <string name="title_create_sub_folder">Unterordner erstellen</string>
@@ -1843,8 +1843,8 @@ Zur Erinnerung daran zeigt FairEmail einen kleinen Hinweis an, dieser verschwind
     </string-array>
     <string-array name="contactTypes">
         <item>Empfänger</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Absender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blockiert</item>
+        <item>Absender</item>
+        <item>Blockiert</item>
         <item>Nicht blockiert</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index e346376033..1ad5ef9775 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -159,7 +159,7 @@
     <string name="title_setup_gmail_password">Θέλω να εξουσιοδοτήσω έναν λογαριασμό με έναν κωδικό πρόσβασης</string>
     <string name="title_setup_office_auth">Το σφάλμα \'ΠΙΣΤΟΠΟΙΗΣΗ απέτυχε\' μπορεί να προκληθεί επειδή το IMAP/SMTP έχει απενεργοποιηθεί από το διαχειριστή του συστήματος</string>
     <string name="title_setup_oauth_rationale">Παραχωρήστε πρόσβαση στον λογαριασμό σας %1$s</string>
-    <string name="title_setup_oauth_update">Εκ νέου εξουσιοδότηση υπάρχοντος λογαριασμού</string>
+    <string name="title_setup_oauth_update">Εκ νέου εξουσιοδότηση ενός ήδη υπάρχοντος λογαριασμού (διαφορετικά, δημιουργήστε έναν καινούργιο λογαριασμό)</string>
     <string name="title_setup_oauth_updated">Η εξουσιοδότηση λογαριασμού ενημερώθηκε</string>
     <string name="title_setup_oauth_authorize">Εξουσιοδότηση</string>
     <string name="title_setup_select_account">Επιλογή λογαριασμού</string>
@@ -849,7 +849,7 @@
     <string name="title_edit_contact">Επεξεργασία επαφής</string>
     <string name="title_contact_email">Ηλεκτρονικό ταχυδρομείο</string>
     <string name="title_contact_name">Όνομα</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Ομάδα</string>
+    <string name="title_contact_group">Ομάδα</string>
     <string name="title_import_contacts">Εισαγωγή vCard</string>
     <string name="title_export_contacts">Εξαγωγή vCard</string>
     <string name="title_create_sub_folder">Δημιουργία υποφακέλου</string>
@@ -1842,8 +1842,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Παραλήπτης</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Αποστολέας</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Αποκλεισμένος</item>
+        <item>Αποστολέας</item>
+        <item>Αποκλεισμένος</item>
         <item>Μη αποκλεισμένος</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index b9ffd08361..e86b99fe52 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -10,7 +10,6 @@
     <string name="title_setup">Settings</string>
     <string name="title_setup_quick">Quick setup</string>
     <string name="title_setup_gmail_password">I want to authorise an account with a password</string>
-    <string name="title_setup_oauth_update">Authorise existing account again</string>
     <string name="title_setup_oauth_authorize">Authorise</string>
     <string name="title_setup_doze">Disable battery optimisations</string>
     <string name="title_setup_doze_explanation">Battery optimisations should be disabled for the app to ensure reliable sending and receiving of messages in the background</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 7750533bed..0ee48e4d7f 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -159,7 +159,6 @@
     <string name="title_setup_gmail_password">Quiero autorizar una cuenta con una contraseña</string>
     <string name="title_setup_office_auth">El error \'AUTHENTICATE failed\' puede ser causado por IMAP/SMTP desactivado por el administrador de sistemas</string>
     <string name="title_setup_oauth_rationale">Autorizar acceso a su cuenta %1$s</string>
-    <string name="title_setup_oauth_update">Volver a autorizar cuenta existente</string>
     <string name="title_setup_oauth_updated">Se ha actualizado la autorización de la cuenta</string>
     <string name="title_setup_oauth_authorize">Autorizar</string>
     <string name="title_setup_select_account">Seleccionar cuenta</string>
@@ -851,7 +850,7 @@
     <string name="title_edit_contact">Editar contacto</string>
     <string name="title_contact_email">Correo electrónico</string>
     <string name="title_contact_name">Nombre</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Grupo</string>
+    <string name="title_contact_group">Grupo</string>
     <string name="title_import_contacts">Importar vCards</string>
     <string name="title_export_contacts">Exportar vCards</string>
     <string name="title_create_sub_folder">Crear subcarpeta</string>
@@ -1843,8 +1842,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatario</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Remitente</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Bloqueado</item>
+        <item>Remitente</item>
+        <item>Bloqueado</item>
         <item>No bloqueado</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index d641b4f843..c5bca069d3 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -1396,8 +1396,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Hartzailea</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Igorlea</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokeatua</item>
+        <item>Igorlea</item>
+        <item>Blokeatua</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 8c81e7dbaa..98d46452d1 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -154,7 +154,7 @@
     <string name="title_setup_gmail_drafts">اگر پوشه پیش‌نویس‌ها به‌وسیله IMAP قابل دسترسی نیست، می‌توان آن را در تنظیمات برچسب‌های جیمیل درست کرد</string>
     <string name="title_setup_office_auth">خطای \'AUTHENTICATE failed\' می‌تواند به‌دلیل غیرفعال بودن IMAP/SMTP به‌ دست مدیر سیستم باشد</string>
     <string name="title_setup_oauth_rationale">برای دسترسی به %1$s حسابتان اجازه دهید</string>
-    <string name="title_setup_oauth_update">تایید دوباره هویت حساب موجود</string>
+    <string name="title_setup_oauth_update">به یک حساب موجود اجازه بدهید (در غیر این صورت یک حساب جدید بسازید)</string>
     <string name="title_setup_oauth_updated">تایید هویت حساب به روز شد</string>
     <string name="title_setup_oauth_authorize">اجازه دهید</string>
     <string name="title_setup_select_account">انتخاب حساب</string>
@@ -587,7 +587,7 @@
     <string name="title_edit_contact">ویرایش مخاطب</string>
     <string name="title_contact_email">ایمیل</string>
     <string name="title_contact_name">نام</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">گروه</string>
+    <string name="title_contact_group">گروه</string>
     <string name="title_create_sub_folder">ساخت زیرپوشه</string>
     <string name="title_empty_trash_ask">پیام‌های سطل آشغال برای همیشه پاک شوند?</string>
     <string name="title_empty_spam_ask">پیام‌های هرزنامه برای همیشه پاک شوند؟</string>
@@ -1343,8 +1343,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>گیرنده</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">فرستنده</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">مسدود شده</item>
+        <item>فرستنده</item>
+        <item>مسدود شده</item>
         <item>مسدود نشده</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index e15f2482ac..2e92b87ac9 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -155,7 +155,6 @@
     <string name="title_setup_gmail_password">Haluan käyttää salasanaa tilin valtuuttamiseen</string>
     <string name="title_setup_office_auth">Virhe \'AUTHENTICATE failed\' voi aiheutua siitä, että järjestelmän ylläpitäjän on poistanut IMAP/SMTP-protokollat käytöstä</string>
     <string name="title_setup_oauth_rationale">Valtuuta pääsy tilillesi %1$s</string>
-    <string name="title_setup_oauth_update">Valtuuta olemassa oleva tili uudelleen</string>
     <string name="title_setup_oauth_updated">Tilin valtuutus päivitettiin</string>
     <string name="title_setup_oauth_authorize">Valtuuta</string>
     <string name="title_setup_select_account">Valitse tili</string>
@@ -1830,8 +1829,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Vastaanottaja</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Lähettäjä</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Estetty</item>
+        <item>Lähettäjä</item>
+        <item>Estetty</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index d02429d1a6..762df603c1 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -159,7 +159,7 @@
     <string name="title_setup_gmail_password">Je veux autoriser un compte avec un mot de passe</string>
     <string name="title_setup_office_auth">L’erreur \'AUTHENTICATE failed\' peut être due à la désactivation d’IMAP/SMTP par l’administrateur système</string>
     <string name="title_setup_oauth_rationale">Autoriser l’accès à votre compte %1$s</string>
-    <string name="title_setup_oauth_update">Autoriser à nouveau le compte existant</string>
+    <string name="title_setup_oauth_update">Autoriser à nouveau un compte existant (sinon créer un nouveau compte)</string>
     <string name="title_setup_oauth_updated">L\'autorisation du compte a été mise à jour</string>
     <string name="title_setup_oauth_authorize">Autoriser</string>
     <string name="title_setup_select_account">Sélectionner un compte</string>
@@ -853,7 +853,7 @@
     <string name="title_edit_contact">Modifier un contact</string>
     <string name="title_contact_email">Courriel</string>
     <string name="title_contact_name">Nom</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Groupe</string>
+    <string name="title_contact_group">Groupe</string>
     <string name="title_import_contacts">Importer des vCards</string>
     <string name="title_export_contacts">Exporter des vCards</string>
     <string name="title_create_sub_folder">Créer un sous-dossier</string>
@@ -981,6 +981,7 @@
     <string name="title_eml_remark">Pour transférer des messages, les messages bruts (originaux) doivent être téléchargés depuis le serveur de messagerie. Ceci nécessite une connexion Internet et les messages doivent toujours être stockés sur le serveur de messagerie.</string>
     <string name="title_eml_option">Ceci peut être évité en activant le téléchargement systématique des fichiers de messages originaux dans les paramètres de connexion</string>
     <string name="title_eml_downloaded">Messages originaux téléchargés : %1$s</string>
+    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Confirmer automatiquement après quelques secondes</string>
     <string name="title_buttons">Sélectionner les boutons</string>
     <string name="title_buttons_hint">Les actions réellement disponibles dépendent du type de compte et de la configuration</string>
     <string name="title_button_search">Rechercher dans les messages</string>
@@ -1850,8 +1851,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Destinataire</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Expéditeur</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Bloqué</item>
+        <item>Expéditeur</item>
+        <item>Bloqué</item>
         <item>Non bloqué</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index df2ae6a41d..1bc9df4033 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -159,7 +159,7 @@
     <string name="title_setup_gmail_password">Je veux autoriser un compte avec un mot de passe</string>
     <string name="title_setup_office_auth">L’erreur \'AUTHENTICATE failed\' peut être due à la désactivation d’IMAP/SMTP par l’administrateur système</string>
     <string name="title_setup_oauth_rationale">Autoriser l\'accès à votre compte %1$s</string>
-    <string name="title_setup_oauth_update">Autoriser à nouveau le compte existant</string>
+    <string name="title_setup_oauth_update">Autoriser à nouveau un compte existant (sinon créer un nouveau compte)</string>
     <string name="title_setup_oauth_updated">L\'autorisation du compte a été mise à jour</string>
     <string name="title_setup_oauth_authorize">Autoriser</string>
     <string name="title_setup_select_account">Sélectionner un compte</string>
@@ -853,7 +853,7 @@
     <string name="title_edit_contact">Modifier un contact</string>
     <string name="title_contact_email">E-mail</string>
     <string name="title_contact_name">Nom</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Groupe</string>
+    <string name="title_contact_group">Groupe</string>
     <string name="title_import_contacts">Importer des vCards</string>
     <string name="title_export_contacts">Exporter des vCards</string>
     <string name="title_create_sub_folder">Créer un sous-dossier</string>
@@ -981,6 +981,7 @@
     <string name="title_eml_remark">Pour transférer des messages, les messages bruts (originaux) doivent être téléchargés depuis le serveur de messagerie. Ceci nécessite une connexion Internet et les messages doivent cependant être stockés sur le serveur de messagerie.</string>
     <string name="title_eml_option">Ceci peut être évité en activant le téléchargement systématique des fichiers de messages originaux dans les paramètres de connexion</string>
     <string name="title_eml_downloaded">Messages originaux téléchargés : %1$s</string>
+    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Confirmer automatiquement après quelques secondes</string>
     <string name="title_buttons">Sélectionner les boutons</string>
     <string name="title_buttons_hint">Les actions réellement disponibles dépendent du type de compte et de la configuration</string>
     <string name="title_button_search">Rechercher dans les messages</string>
@@ -1850,8 +1851,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Destinataire</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Expéditeur</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Bloqué</item>
+        <item>Expéditeur</item>
+        <item>Bloqué</item>
         <item>Non bloqué</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 137f97f4b7..91c791d7af 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -140,7 +140,6 @@
     <string name="title_setup_gmail_password">Ik wol in akkount autorisearje mei in wachtwurd</string>
     <string name="title_setup_office_auth">De flater \'AUTHENTICATE is mislearre\' kin wurde feroarsake troch IMAP / SMTP te wurden útskeakele troch de systeembehearder</string>
     <string name="title_setup_oauth_rationale">Autorisearje tagong ta jo %1$s akkount</string>
-    <string name="title_setup_oauth_update">Autorisearje besteand account opnij</string>
     <string name="title_setup_oauth_updated">Akkountautorisaasje is bywurke</string>
     <string name="title_setup_oauth_authorize">Autorisearje</string>
     <string name="title_setup_select_account">Selektearje akkount</string>
@@ -1558,8 +1557,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Ûntfanger</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Stjoerder</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blocked</item>
+        <item>Stjoerder</item>
+        <item>Blocked</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 13297df4bc..2e76eb1e5b 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -153,7 +153,6 @@
     <string name="title_setup_gmail_password">Quero autorizar unha conta con un contrasinal</string>
     <string name="title_setup_office_auth">O erro \'AUTHENTICATE failed\' pode estar causado porque IMAP/SMTP estea desactivado polo administrador do sistema</string>
     <string name="title_setup_oauth_rationale">Autorizar o acceso á súa conta %1$s</string>
-    <string name="title_setup_oauth_update">Autorizar outra vez unha conta xa existente</string>
     <string name="title_setup_oauth_updated">A autorización da conta foi actualizada</string>
     <string name="title_setup_oauth_authorize">Autorizar</string>
     <string name="title_setup_select_account">Seleccionar conta</string>
@@ -1822,8 +1821,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatario</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Remitente</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blocked</item>
+        <item>Remitente</item>
+        <item>Blocked</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 2e698be338..e927622ef1 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -145,8 +145,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Sender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">अवरोधित</item>
+        <item>Sender</item>
+        <item>अवरोधित</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index e272d29bdf..9c7899a497 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -124,7 +124,6 @@
     <string name="title_setup_gmail_password">Želim lozinkom odobriti račun</string>
     <string name="title_setup_office_auth">Greška \'AUTHENTICATE failed\' se može pojaviti ako je IMAP/SMTP isključen od strane administratora</string>
     <string name="title_setup_oauth_rationale">Autorizirajte pristup vašem %1$s računu</string>
-    <string name="title_setup_oauth_update">Ponovo odobri postoječi račun</string>
     <string name="title_setup_oauth_authorize">Autoriziraj</string>
     <string name="title_setup_select_account">Odaberi račun</string>
     <string name="title_setup_instructions">Upute za postavljanje</string>
@@ -1162,8 +1161,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Primatelj</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Pošiljatelj</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokirano</item>
+        <item>Pošiljatelj</item>
+        <item>Blokirano</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 05ae7d5499..8617a8e113 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -155,7 +155,6 @@
     <string name="title_setup_gmail_password">Szeretnék egy fiókot hitelesíteni jelszóval</string>
     <string name="title_setup_office_auth">Az \'AUTHENTICATE failed\' hibának oka lehet hogy a rendszeradminisztrátor kikapcsolta az IMAP/SMTP-t</string>
     <string name="title_setup_oauth_rationale">Engedélyezze a hozzáférést a %1$s fiókjához</string>
-    <string name="title_setup_oauth_update">Ismételt autorizáció meglévő fiókhoz</string>
     <string name="title_setup_oauth_updated">A fiókhitelesítés frissült</string>
     <string name="title_setup_oauth_authorize">Engedélyezés</string>
     <string name="title_setup_select_account">Válasszon fiókot</string>
@@ -1795,8 +1794,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Címzett</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Feladó</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Letiltva</item>
+        <item>Feladó</item>
+        <item>Letiltva</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index e25b7a34e5..272c858435 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -143,7 +143,6 @@ Memblokir domain pengirim menggunakan aturan saring, yang merupakan fitur pro.
     <string name="title_setup_gmail_password">Saya ingin mengotorisasi akun dengan kata sandi</string>
     <string name="title_setup_office_auth">Kesalahan \'AUTHENTICATE Failed\' bisa disebabkan oleh IMAP/SMTP yang dinon-aktifkan oleh administrator sistem.</string>
     <string name="title_setup_oauth_rationale">Izinkan akses ke akun %1$s Anda</string>
-    <string name="title_setup_oauth_update">Mengotorisasi akun yang sudah ada</string>
     <string name="title_setup_oauth_updated">Ulang kembali otorisasi akun</string>
     <string name="title_setup_oauth_authorize">Perizinan</string>
     <string name="title_setup_select_account">Pilih Akun</string>
@@ -1741,8 +1740,8 @@ Memformat ulang pesan perlu waktu, tergantung dari ukuran pesan dan keceoatan pe
     </string-array>
     <string-array name="contactTypes">
         <item>Penerima</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Pengirim</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Diblokir</item>
+        <item>Pengirim</item>
+        <item>Diblokir</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 98d58ea1af..08d39cb4b5 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -159,7 +159,7 @@
     <string name="title_setup_gmail_password">Voglio autorizzare un profilo con una password</string>
     <string name="title_setup_office_auth">L\'errore \'AUTHENTICATE fallita\' può esser causato dalla disabilitazione di IMAP/SMTP dall\'amministratore di sistema</string>
     <string name="title_setup_oauth_rationale">Autorizza l\'accesso al tuo profilo di %1$s</string>
-    <string name="title_setup_oauth_update">Autorizza di nuovo il profilo esistente</string>
+    <string name="title_setup_oauth_update">Autorizza nuovamente un profilo esistente (altrimenti creane uno nuovo)</string>
     <string name="title_setup_oauth_updated">Autorizzazione del profilo aggiornata</string>
     <string name="title_setup_oauth_authorize">Autorizza</string>
     <string name="title_setup_select_account">Seleziona profilo</string>
@@ -853,7 +853,7 @@
     <string name="title_edit_contact">Modifica contatto</string>
     <string name="title_contact_email">Email</string>
     <string name="title_contact_name">Nome</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Gruppo</string>
+    <string name="title_contact_group">Gruppo</string>
     <string name="title_import_contacts">Importa vCard</string>
     <string name="title_export_contacts">Esporta vCard</string>
     <string name="title_create_sub_folder">Crea sottocartella</string>
@@ -1850,8 +1850,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatario</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Mittente</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Bloccato</item>
+        <item>Mittente</item>
+        <item>Bloccato</item>
         <item>Non bloccato</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 94cc1bf4f7..2eda1ba9a7 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -179,7 +179,7 @@
     <string name="title_setup_gmail_password">ארצה לאמת חשבון עם סיסמה</string>
     <string name="title_setup_office_auth">השגיאה ‚AUTHENTICATE נכשל’ עלולה להיגרם עקב IMAP/SMTP שהושבתו על ידי הנהלת המערכת</string>
     <string name="title_setup_oauth_rationale">להרשות גישה לחשבון %1$s שלך</string>
-    <string name="title_setup_oauth_update">אישור חשבון קיים שוב</string>
+    <string name="title_setup_oauth_update">אימות חשבון קיים שוב (אחרת ליצור חשבון חדש)</string>
     <string name="title_setup_oauth_updated">אישור החשבון עודכן</string>
     <string name="title_setup_oauth_authorize">להרשות</string>
     <string name="title_setup_select_account">בחירת חשבון</string>
@@ -872,7 +872,7 @@
     <string name="title_edit_contact">עריכת איש קשר</string>
     <string name="title_contact_email">דוא״ל</string>
     <string name="title_contact_name">שם</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">קבוצה</string>
+    <string name="title_contact_group">קבוצה</string>
     <string name="title_import_contacts">ייבוא כרטיסי ביקור (vCard)</string>
     <string name="title_export_contacts">ייצוא כרטיסי ביקור (vCard)</string>
     <string name="title_create_sub_folder">יצירת תת־תיקייה</string>
@@ -1864,8 +1864,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>נמען</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">מוען</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">חסום</item>
+        <item>מוען</item>
+        <item>חסום</item>
         <item>לא חסום</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 3d09342c36..0b9317b0d2 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -149,7 +149,7 @@
     <string name="title_setup_gmail_password">パスワードでアカウントを認証したい</string>
     <string name="title_setup_office_auth">「AUTHENTICATE failed」というエラーは、システム管理者によって IMAP/SMTP が無効にされていることが原因である可能性があります</string>
     <string name="title_setup_oauth_rationale">%1$s アカウントへのアクセスを許可する</string>
-    <string name="title_setup_oauth_update">登録済みのアカウントをもう一度認証する</string>
+    <string name="title_setup_oauth_update">設定済みのアカウントをもう一度認証する (設定されていない場合、新しいアカウントを作成します)</string>
     <string name="title_setup_oauth_updated">アカウントの認証情報が更新されました</string>
     <string name="title_setup_oauth_authorize">認証</string>
     <string name="title_setup_select_account">アカウントを選択</string>
@@ -842,7 +842,7 @@
     <string name="title_edit_contact">連絡先を編集</string>
     <string name="title_contact_email">メール</string>
     <string name="title_contact_name">名前</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">グループ</string>
+    <string name="title_contact_group">グループ</string>
     <string name="title_import_contacts">vCard をインポート</string>
     <string name="title_export_contacts">vCard をエクスポート</string>
     <string name="title_create_sub_folder">サブフォルダーを作成</string>
@@ -1154,7 +1154,7 @@
     <string name="title_translating">翻訳しています&#8230;</string>
     <string name="title_translate_formal">書き言葉を使用</string>
     <string name="title_translate_small">ソーステキストに小さなフォントを使用する</string>
-    <string name="title_translate_usage">使用: %1$s / %2$s (%3$d %%)</string>
+    <string name="title_translate_usage">利用文字数: %1$s / %2$s (%3$d %%)</string>
     <string name="title_translate_tap">テキストをタップして翻訳</string>
     <string name="title_edit_plain_text">プレーンテキストとして編集</string>
     <string name="title_edit_formatted_text">再フォーマットされたテキストとして編集</string>
@@ -1838,8 +1838,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>宛先</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">差出人</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">ブロック中</item>
+        <item>差出人</item>
+        <item>ブロック中</item>
         <item>未ブロック</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index e612226f8d..00d28f616f 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1022,8 +1022,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>수신</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">발신인</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">차단됨</item>
+        <item>발신인</item>
+        <item>차단됨</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 29e2c0322d..924c0e140f 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -49,8 +49,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Sender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Užblokuota</item>
+        <item>Sender</item>
+        <item>Užblokuota</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index f37f4f0fcb..fa093c69c4 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -120,7 +120,6 @@
     <string name="title_setup_gmail_password">Jeg ønsker å godkjenne en konto med et passord</string>
     <string name="title_setup_office_auth">Feilen \'AUTHENTICATE failed\' kan skyldes at IMAP/SMTP er deaktivert av systemadministratoren</string>
     <string name="title_setup_oauth_rationale">Autoriser tilgang til din %1$s konto</string>
-    <string name="title_setup_oauth_update">Autoriser eksisterende konto på nytt</string>
     <string name="title_setup_oauth_updated">Konto autorisasjon ble oppdatert</string>
     <string name="title_setup_oauth_authorize">Godkjenne</string>
     <string name="title_setup_select_account">Velg konto</string>
@@ -1421,8 +1420,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Mottaker</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Avsender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokkert</item>
+        <item>Avsender</item>
+        <item>Blokkert</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 770fe91f24..c7988c9c00 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -158,7 +158,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_setup_gmail_password">Ik wil een account met een wachtwoord autoriseren</string>
     <string name="title_setup_office_auth">De fout \'AUTHENTICATE failed\' kan worden veroorzaakt doordat IMAP/SMTP door de systeemadministrator is uitgeschakeld</string>
     <string name="title_setup_oauth_rationale">Autoriseer toegang tot uw %1$s account</string>
-    <string name="title_setup_oauth_update">Autoriseer bestaande account opnieuw</string>
+    <string name="title_setup_oauth_update">Autoriseer een bestaand account opnieuw (anders een nieuwe account aanmaken)</string>
     <string name="title_setup_oauth_updated">Accountautorisatie is bijgewerkt</string>
     <string name="title_setup_oauth_authorize">Autoriseren</string>
     <string name="title_setup_select_account">Selecteer account</string>
@@ -849,7 +849,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_edit_contact">Contact bewerken</string>
     <string name="title_contact_email">E-mail</string>
     <string name="title_contact_name">Naam</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Groep</string>
+    <string name="title_contact_group">Groep</string>
     <string name="title_import_contacts">Importeer vCards</string>
     <string name="title_export_contacts">Exporteer vCards</string>
     <string name="title_create_sub_folder">Maak submap</string>
@@ -976,6 +976,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_eml_remark">Om berichten door te sturen, moeten de ruwe (originele) berichten worden gedownload van de mailserver. Dit vereist een internetverbinding en de berichten dienen nog opgeslagen te zijn op de mailserver.</string>
     <string name="title_eml_option">Dit kan worden voorkomen door het altijd downloaden van ruwe berichtbestanden in de verbindingsinstellingen in te schakelen</string>
     <string name="title_eml_downloaded">Ruwe berichten om te downloaden: %1$s</string>
+    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Automatisch bevestigen na enkele seconden</string>
     <string name="title_buttons">Selecteer knoppen</string>
     <string name="title_buttons_hint">De daadwerkelijk beschikbare acties hangen af van het accounttype en de configuratie</string>
     <string name="title_button_search">Zoeken in berichten</string>
@@ -1838,8 +1839,8 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     </string-array>
     <string-array name="contactTypes">
         <item>Ontvanger</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Afzender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Geblokkeerd</item>
+        <item>Afzender</item>
+        <item>Geblokkeerd</item>
         <item>Niet geblokkeerd</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 036b85738a..a3e981f7ac 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -120,7 +120,6 @@
     <string name="title_setup_gmail_password">Jeg ønsker å godkjenne en konto med et passord</string>
     <string name="title_setup_office_auth">Feilen \'AUTHENTICATE failed\' kan skyldes at IMAP/SMTP er deaktivert av systemadministratoren</string>
     <string name="title_setup_oauth_rationale">Autoriser tilgang til din %1$s konto</string>
-    <string name="title_setup_oauth_update">Autoriser eksisterende konto på nytt</string>
     <string name="title_setup_oauth_updated">Konto autorisasjon ble oppdatert</string>
     <string name="title_setup_oauth_authorize">Godkjenne</string>
     <string name="title_setup_select_account">Velg konto</string>
@@ -1421,8 +1420,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Mottaker</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Avsender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokkert</item>
+        <item>Avsender</item>
+        <item>Blokkert</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index f37f4f0fcb..fa093c69c4 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -120,7 +120,6 @@
     <string name="title_setup_gmail_password">Jeg ønsker å godkjenne en konto med et passord</string>
     <string name="title_setup_office_auth">Feilen \'AUTHENTICATE failed\' kan skyldes at IMAP/SMTP er deaktivert av systemadministratoren</string>
     <string name="title_setup_oauth_rationale">Autoriser tilgang til din %1$s konto</string>
-    <string name="title_setup_oauth_update">Autoriser eksisterende konto på nytt</string>
     <string name="title_setup_oauth_updated">Konto autorisasjon ble oppdatert</string>
     <string name="title_setup_oauth_authorize">Godkjenne</string>
     <string name="title_setup_select_account">Velg konto</string>
@@ -1421,8 +1420,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Mottaker</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Avsender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokkert</item>
+        <item>Avsender</item>
+        <item>Blokkert</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-or-rIN/strings.xml b/app/src/main/res/values-or-rIN/strings.xml
index d6b5ddb061..f43ed450a5 100644
--- a/app/src/main/res/values-or-rIN/strings.xml
+++ b/app/src/main/res/values-or-rIN/strings.xml
@@ -87,7 +87,6 @@
     <string name="title_setup_pop3">POP3 ଆକାଉଣ୍ଟ୍</string>
     <string name="title_setup_oauth_permission">ଇମେଲ୍ ପ୍ରଦାନକାରୀ କେବଳ Play Store ଏବଂ GitHub ସଂସ୍କରଣ ପାଇଁ OAuth ଅନୁମୋଦନ କରିଛନ୍ତି</string>
     <string name="title_setup_gmail_support">Google ଆକାଉଣ୍ଟଗୁଡ଼ିକର ପ୍ରାଧିକରଣ କେବଳ Play Store ଏବଂ GitHub ସଂସ୍କରଣରେ କାମ କରିବ କାରଣ ଆଣ୍ଡ୍ରଏଡ୍ ଡିଜିଟାଲ୍ ଆପ୍ ସ୍ବାକ୍ଷର ଯାଞ୍ଚ କରେ</string>
-    <string name="title_setup_oauth_update">ବିଦ୍ୟମାନ ଆକାଉଣ୍ଟକୁ ପୁନଃ ପ୍ରାଧିକୃତ କରନ୍ତୁ</string>
     <string name="title_setup_oauth_updated">ଆକାଉଣ୍ଟ୍ ପ୍ରାଧିକରଣ ଅଦ୍ୟତନ କରାଯାଇଥିଲା</string>
     <string name="title_setup_oauth_authorize">ପ୍ରାଧିକୃତ କରନ୍ତୁ</string>
     <string name="title_setup_select_account">ଆକାଉଣ୍ଟ୍ ବାଛନ୍ତୁ</string>
@@ -344,7 +343,7 @@
     <string name="title_edit_properties">ଗୁଣଧର୍ମ ସମ୍ପାଦନା</string>
     <string name="title_contact_email">ଇମେଲ୍</string>
     <string name="title_contact_name">ନାମ</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">ଗୋଷ୍ଠୀ</string>
+    <string name="title_contact_group">ଗୋଷ୍ଠୀ</string>
     <string name="title_import_contacts">vCards ଆମଦାନୀ କରନ୍ତୁ</string>
     <string name="title_export_contacts">vCards ରପ୍ତାନି କରନ୍ତୁ</string>
     <string name="title_empty_trash_ask">ଆବର୍ଜନା ପାତ୍ରରେ ଥିବା ସମସ୍ତ ବାର୍ତ୍ତା ସବୁଦିନ ପାଇଁ ବିଲୋପ କରିବେ କି?</string>
@@ -379,6 +378,7 @@
     <string name="title_pin">ସର୍ଟକଟ୍ ଯୋଡ଼ନ୍ତୁ</string>
     <string name="title_raw_send_message">ବାର୍ତ୍ତା</string>
     <string name="title_raw_send_thread">ବାର୍ତ୍ତାଳାପ</string>
+    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">କିଛି ସେକେଣ୍ଡ ପରେ ସ୍ୱତଃସ୍ପୃତ ଭାବେ ନିଶ୍ଚିତ କରିବା</string>
     <string name="title_trash">ଆବର୍ଜନା ପାତ୍ର</string>
     <string name="title_delete">ବିଲୋପ</string>
     <string name="title_delete_all">ସବୁ ବିଲୋପ କରନ୍ତୁ</string>
@@ -748,8 +748,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>ପ୍ରାପ୍ତେସୁ</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">ପ୍ରେରକ</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">ବ୍ଲକ୍ ହୋଇଅଛି</item>
+        <item>ପ୍ରେରକ</item>
+        <item>ବ୍ଲକ୍ ହୋଇଅଛି</item>
         <item>ବ୍ଲକ୍ ହୋଇନାହିଁ</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 48dc7f120a..2ee886d04d 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -179,7 +179,7 @@
     <string name="title_setup_gmail_password">Chcę autoryzować konto hasłem</string>
     <string name="title_setup_office_auth">Błąd \"AUTHENTICATE failed\" może być spowodowany wyłączeniem protokołu IMAP/SMTP przez administratora systemu</string>
     <string name="title_setup_oauth_rationale">Autoryzuj dostęp do Twojego konta %1$s</string>
-    <string name="title_setup_oauth_update">Ponownie autoryzuj istniejące konto</string>
+    <string name="title_setup_oauth_update">Autoryzuj istniejące konto ponownie (w przeciwnym razie utwórz nowe konto)</string>
     <string name="title_setup_oauth_updated">Autoryzacja konta została zaktualizowana</string>
     <string name="title_setup_oauth_authorize">Autoryzuj</string>
     <string name="title_setup_select_account">Wybierz konto</string>
@@ -871,7 +871,7 @@
     <string name="title_edit_contact">Edytuj kontakt</string>
     <string name="title_contact_email">E-mail</string>
     <string name="title_contact_name">Nazwa</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Grupa</string>
+    <string name="title_contact_group">Grupa</string>
     <string name="title_import_contacts">Importuj karty vCards</string>
     <string name="title_export_contacts">Eksportuj karty vCards</string>
     <string name="title_create_sub_folder">Utwórz podfolder</string>
@@ -1866,8 +1866,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Adresat</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Nadawca</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Zablokowane</item>
+        <item>Nadawca</item>
+        <item>Zablokowane</item>
         <item>Niezablokowany</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ed87affb08..dee947f7a6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -159,7 +159,7 @@
     <string name="title_setup_gmail_password">Quero autorizar uma conta com uma senha</string>
     <string name="title_setup_office_auth">O erro \'Falha de Autenticação\' pode ser causadado por desativação do IMAP/SMTP pelo administrador do sistema</string>
     <string name="title_setup_oauth_rationale">Autorizar acesso à sua conta %1$s</string>
-    <string name="title_setup_oauth_update">Autorizar conta existente novamente</string>
+    <string name="title_setup_oauth_update">Autorizar uma conta existente novamente (caso contrário, crie uma nova conta)</string>
     <string name="title_setup_oauth_updated">Autorização da conta foi atualizada</string>
     <string name="title_setup_oauth_authorize">Autorizar</string>
     <string name="title_setup_select_account">Selecionar conta</string>
@@ -851,7 +851,7 @@
     <string name="title_edit_contact">Editar contato</string>
     <string name="title_contact_email">E-mail</string>
     <string name="title_contact_name">Nome</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Grupo</string>
+    <string name="title_contact_group">Grupo</string>
     <string name="title_import_contacts">Importar vCards</string>
     <string name="title_export_contacts">Exportar vCards</string>
     <string name="title_create_sub_folder">Criar subpasta</string>
@@ -1845,8 +1845,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatário</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Remetente</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Bloqueado</item>
+        <item>Remetente</item>
+        <item>Bloqueado</item>
         <item>Não bloqueado</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 8ed42f19ff..a06977e21b 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -85,7 +85,7 @@
     <string name="title_junk_clear">Limpar</string>
     <string name="title_junk_clear_hint">Isto irá eliminar todas as regras de bloqueio do remetente</string>
     <string name="title_notification_sending">A enviar mensagens</string>
-    <string name="title_notification_waiting">A aguardar ligação</string>
+    <string name="title_notification_waiting">A aguardar por ligação válida à Internet</string>
     <string name="title_notification_idle">Ausente</string>
     <string name="title_notification_failed">\'%1$s\' falhou</string>
     <string name="title_notification_alert">Alerta de servidor: \'%1$s\'</string>
@@ -156,7 +156,7 @@
     <string name="title_setup_gmail_password">Quero autorizar uma conta com uma palavra-passe</string>
     <string name="title_setup_office_auth">O erro \'AUTHENTICATE falhou\' pode ser causado por IMAP/SMTP estar desativado pelo administrador do sistema</string>
     <string name="title_setup_oauth_rationale">Autorizar o acesso à sua conta %1$s</string>
-    <string name="title_setup_oauth_update">Autorizar conta existente novamente</string>
+    <string name="title_setup_oauth_update">Autorizar novamente uma conta existente (caso contrário, criar uma conta)</string>
     <string name="title_setup_oauth_updated">Autorização de conta actualizada</string>
     <string name="title_setup_oauth_authorize">Autorizar</string>
     <string name="title_setup_select_account">Selecionar Conta</string>
@@ -489,6 +489,7 @@
     <string name="title_advanced_notify_summary">Mostrar apenas resumo na notificação</string>
     <string name="title_advanced_notify_preview">Mostrar pré-visualização de mensagem nas notificações</string>
     <string name="title_advanced_notify_preview_all">Pré-visualizar todo o texto</string>
+    <string name="title_advanced_notify_preview_only">Mostrar notificações apenas com pré-visualização do texto</string>
     <string name="title_advanced_notify_actions">Ações de notificação</string>
     <string name="title_advanced_notify_action_trash">Lixo</string>
     <string name="title_advanced_notify_action_delete">Eliminar</string>
@@ -583,7 +584,11 @@
     <string name="title_advanced_gmail_thread_hint">Apenas se aplica às mensagens recebidas recentemente e pode quebrar os grupos existentes</string>
     <string name="title_advanced_subject_threading_hint">Apenas para as mensagens recebidas nas últimas %1$d horas</string>
     <string name="title_advanced_poll_folders_hint">Sincroniza periodicamente a lista de pastas mesmo após a ligação a uma conta</string>
+    <string name="title_advanced_check_authentication_hint">Isto irá verificar os resultados de autenticação DKIM, SPF e DMARC de acordo com o servidor de e-mail</string>
+    <string name="title_advanced_check_tls_hint">Isto mostrará um escudo verde apenas se uma mensagem foi transportada de forma segura por todos os servidores</string>
+    <string name="title_advanced_check_reply_hint">Isto irá verificar se o nome de domínio do remetente e o endereço de resposta são os mesmos</string>
     <string name="title_advanced_lookup_mx_hint">Faz a verificação se existem registos DNS MX</string>
+    <string name="title_advanced_sync_delay_hint">Isto atrasará a sincronização de mensagens</string>
     <string name="title_advanced_suggest_names_hint">Com a opção desactiva, ao seleccionar um contacto apenas os endereços de e-mail serão utilizados</string>
     <string name="title_advanced_suggest_local_hint">Em complemento aos contactos fornecidos pelo Android. Apenas só será guardada informação de contactos nas mensagens recém-enviadas ou recebidas caso esta função esteja activa.</string>
     <string name="title_advanced_usenet_hint">Coloca \'-- \' entre o texto e a assinatura</string>
@@ -596,6 +601,9 @@
     <string name="title_advanced_layout_hint">Pode mudar para um layout mais compacto e alterar o tamanho do texto da mensagem no menu da barra de acção presente na parte superior da vista de mensagens</string>
     <string name="title_advanced_navbar_colorize_hint">O funcionamento disto depende da versão e variante do Android</string>
     <string name="title_advanced_split_hint">Esta opção divide o ecrã em partes</string>
+    <string name="title_advanced_preview_hint">Apenas disponível quando o texto da mensagem for transferido</string>
+    <string name="title_advanced_preview_lines_hint">Máximo %s caracteres no total</string>
+    <string name="title_advanced_preview_issue">O movimento de deslizar pode ser lento devido a um erro em algumas versões Android, quando o número de linhas é superior a uma</string>
     <string name="title_advanced_overview_mode_hint">Isto pode resultar em tipos de letra muito pequenos</string>
     <string name="title_advanced_override_width_hint">Isto pode tornar as mensagens mais estreitas, mas também pode parecer estranho</string>
     <string name="title_advanced_monospaced_pre_hint">Mensagens de texto simples serão consideradas como pré-formatadas</string>
@@ -662,6 +670,7 @@
     <string name="title_sign_key">Chave de assinatura: %1$s</string>
     <string name="title_last_connected">Última ligação: %1$s</string>
     <string name="title_pop_support">O protocolo POP3 só pode descarregar e eliminar mensagens da caixa de entrada. Não é possível marcar as mensagens como lidas, denunciar spam, mover mensagens, etc. Considere a utilização do protocolo IMAP sempre que possível.</string>
+    <string name="title_review">Rever</string>
     <string name="title_hint_accounts">Toque e mantenha premido numa conta para ver as opções, por exemplo, para desactivar ou eliminar uma conta</string>
     <string name="title_synchronize_now">Sincronizar agora</string>
     <string name="title_synchronize_subfolders">Subpastas</string>
@@ -676,7 +685,7 @@
     <string name="title_notify_batch_disable">Desactivar as notificações de novas mensagens</string>
     <string name="title_delete_local">Eliminar mensagens locais</string>
     <string name="title_delete_browsed">Eliminar msgs navegadas/pesquisadas</string>
-    <string name="title_expunge">Esponja</string>
+    <string name="title_expunge">Eliminar permanentemente (msgs. sinalizadas)</string>
     <string name="title_expunge_remark">Isto irá apagar permanentemente todas as mensagens marcadas para exclusão</string>
     <string name="title_empty_trash">Esvaziar lixo</string>
     <string name="title_empty_spam">Esvaziar spam</string>
@@ -687,20 +696,24 @@
     <string name="title_edit_contact">Editar contacto</string>
     <string name="title_contact_email">E-mail</string>
     <string name="title_contact_name">Nome</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Grupo</string>
+    <string name="title_contact_group">Grupo</string>
     <string name="title_import_contacts">Importar vCards</string>
     <string name="title_delete_operation_title">Eliminar operações</string>
+    <string name="title_delete_operation_error">Com uma mensagem de erro</string>
     <string name="title_delete_operation_fetch">Obter operações</string>
     <string name="title_delete_operation_move">Mover operações</string>
     <string name="title_delete_operation_flag">Sinalizar operações</string>
     <string name="title_delete_operation_delete">Eliminar operações</string>
     <string name="title_delete_operation_deleted">%1$d operações eliminadas</string>
+    <string name="title_delete_contacts">Eliminar os contactos locais visíveis?</string>
     <string name="title_no_operations">Sem operações pendentes</string>
     <string name="title_check_operations">A decorrer verificação de operações</string>
     <string name="title_hint_operations">Eliminar operações pode resultar no desaparecimento de mensagens e problemas de sincronização</string>
+    <string name="title_op_title_headers">A transferir cabeçalhos</string>
+    <string name="title_op_title_raw">A transferir mensagem original (raw)</string>
     <string name="title_show_flagged">Mostrar n⁰ de msg. favoritas</string>
     <string name="title_sort_unread_atop">Mostrar pastas por ler primeiro</string>
-    <string name="title_search_folder">Pesquisar pasta</string>
+    <string name="title_search_folder">Pesquisar por pasta</string>
     <string name="title_apply_to_all">Aplicar a tudo</string>
     <string name="title_edit_account_name">Editar nome da conta</string>
     <string name="title_unified_folder">Mostrar na cx. entrada unificada</string>
@@ -738,6 +751,7 @@
     <string name="title_duplicate_in">Mensagem duplicada em %1$s</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
+    <string name="title_subject_reply_alt">Re: %1$s</string>
     <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>
@@ -820,8 +834,11 @@
     <string name="title_no_viewer_type">Tipo de conteúdo</string>
     <string name="title_no_viewer_search">Procurar aplicação</string>
     <string name="title_no_recorder">Não existe uma aplicação compatível de gravação de áudio</string>
+    <string name="title_no_camera">Não existe uma aplicação compatível de câmara</string>
     <string name="title_no_stream">O FairEmail não tem permissão para ler este ficheiro</string>
     <string name="title_no_stream_help">Isto pode ser resolvido selecionando o ficheiro com uma aplicação de gestão de ficheiros mais moderna ou concedendo permissão ao FairEmail para ler ficheiros</string>
+    <string name="title_no_internet">Sem ligação à Internet ou a ligação não é válida</string>
+    <string name="title_no_search">Pesquisa no servidor não está disponível para esta conta</string>
     <string name="title_insufficient_memory">Mensagem muito grande para a memória disponível (%1$d)</string>
     <string name="title_fullscreen">Mostrar ecrã completo</string>
     <string name="title_fit_width">Ajustar à largura</string>
@@ -838,9 +855,11 @@
     <string name="title_ask_show_amp">Mostrar a variante AMP da mensagem?</string>
     <string name="title_ask_show_amp_hint">As mensagens AMP são concebidas para serem dinâmicas e para interagirem com a internet e, portanto, podem ser usadas por definição para o acompanhar</string>
     <string name="title_ask_reporting">Enviar relatórios de erro?</string>
+    <string name="title_ask_review">Por favor, avalie o FairEmail</string>
     <string name="title_ask_review_rationale">        Está a utilizar o FairEmail há algum tempo.
         Gostaríamos que avaliasse o FairEmail na Play Store.
     </string>
+    <string name="title_download_message">A transferir &#8230;</string>
     <string name="title_compose">Compor</string>
     <string name="title_submitter">Enviado por:</string>
     <string name="title_delivered_to">Entregue a:</string>
@@ -987,6 +1006,12 @@
     <string name="title_search_size_hint">A pesquisar por mensagens pelo tamanho, quando existam um grande número de mensagens, talvez não funcione com alguns servidores</string>
     <string name="title_search_more">Mais opções</string>
     <string name="title_search_use_index">Utilizar o índice de pesquisa</string>
+    <string name="title_search_in_senders">Em remetentes (de)</string>
+    <string name="title_search_in_recipients">Em destinatários (para, cc)</string>
+    <string name="title_search_in_subject">No assunto</string>
+    <string name="title_search_in_keywords">Em palavras-chave (se suportado)</string>
+    <string name="title_search_in_message">Em mensagens de texto</string>
+    <string name="title_search_in_notes">Em notas locais</string>
     <string name="title_search_with">Limitar pesquisa a</string>
     <string name="title_search_with_unseen">Não lidas</string>
     <string name="title_search_with_flagged">Com estrela</string>
@@ -1007,6 +1032,9 @@
     <string name="title_search_flag_notes">notas</string>
     <string name="title_search_flag_invite">convite</string>
     <string name="title_search_flag_size">tamanho &gt; %1$s</string>
+    <string name="title_search_device">Pesquisar no dispositivo</string>
+    <string name="title_search_server">Pesquisar no servidor</string>
+    <string name="title_search_in">Pesquisar em</string>
     <string name="title_search_delete">Eliminar a pesquisa guardada?</string>
     <string name="title_sort_on">Ordenar por</string>
     <string name="title_sort_on_time">Data</string>
@@ -1070,6 +1098,7 @@
     <string name="title_rule_move">Mover</string>
     <string name="title_rule_copy">Copiar (etiqueta)</string>
     <string name="title_rule_answer">Responder/encaminhar</string>
+    <string name="title_rule_tts">Conversão de texto em voz</string>
     <string name="title_rule_automation">Automatização</string>
     <string name="title_rule_delete">Eliminar permanentemente</string>
     <string name="title_rule_sound">Reproduzir som</string>
@@ -1084,7 +1113,12 @@
     <string name="title_rule_recipient">Destinatário contém</string>
     <string name="title_rule_subject">Assunto contém</string>
     <string name="title_rule_attachments">Contém anexos</string>
+    <string name="title_rule_header">Cabeçalho contém</string>
+    <string name="title_rule_body">Texto contém</string>
+    <string name="title_rule_skip_quotes">Ignorar o texto citado</string>
     <string name="title_rule_time_before">Recebida antes de</string>
+    <string name="title_rule_action">Acção</string>
+    <string name="title_rule_action_remark">Esta acção será aplicada às novas mensagens que chegam à pasta %1$s</string>
     <string name="title_rule_hours">Horas</string>
     <string name="title_rule_folder">Pasta</string>
     <string name="title_rule_template">Modelo de resposta</string>
@@ -1093,6 +1127,7 @@
     <string name="title_rule_forward_to">Encaminhar para</string>
     <string name="title_rule_with_attachments">Com anexos</string>
     <string name="title_rule_answer_remark">Apenas uma resposta será enviada em cada conversação, para evitar respostas repetidas</string>
+    <string name="title_rule_folder_missing">Pasta em falta</string>
     <string name="title_rule_identity_missing">Identidade em falta</string>
     <string name="title_rule_answer_missing">Modelo em falta</string>
     <string name="title_rule_keyword_missing">Palavra-chave em falta</string>
@@ -1555,8 +1590,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatário</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Remetente</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Bloqueado</item>
+        <item>Remetente</item>
+        <item>Bloqueado</item>
         <item>Não bloqueado</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 095dd59b88..890f2cadcf 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -169,7 +169,6 @@
     <string name="title_setup_gmail_password">Vreau să autorizez un cont cu o parolă</string>
     <string name="title_setup_office_auth">Eroarea \'Autentificare eșuată\' poate fi cauzată de dezactivarea administrativă a IMAP/SMTP</string>
     <string name="title_setup_oauth_rationale">Autorizare acces la contul %1$s</string>
-    <string name="title_setup_oauth_update">Autorizațî din nou contul existent</string>
     <string name="title_setup_oauth_updated">Autorizarea contului a fost actualizată</string>
     <string name="title_setup_oauth_authorize">Autorizare</string>
     <string name="title_setup_select_account">Selectare cont</string>
@@ -861,7 +860,7 @@
     <string name="title_edit_contact">Editare contact</string>
     <string name="title_contact_email">E-mail</string>
     <string name="title_contact_name">Nume</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Grup</string>
+    <string name="title_contact_group">Grup</string>
     <string name="title_import_contacts">Importă vCards</string>
     <string name="title_export_contacts">Exportați vCards</string>
     <string name="title_create_sub_folder">Creează sub-dosar</string>
@@ -1855,8 +1854,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Destinatar</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Expeditor</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blocat</item>
+        <item>Expeditor</item>
+        <item>Blocat</item>
         <item>Nu este blocat</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index c43dec71c7..1f6a8cf45f 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -179,7 +179,7 @@
     <string name="title_setup_gmail_password">Я хочу авторизоваться в учётной записи паролем</string>
     <string name="title_setup_office_auth">Ошибка \"AUTHENTICATE failed\" может быть вызвана отключением IMAP/SMTP системным администратором</string>
     <string name="title_setup_oauth_rationale">Авторизовать доступ к вашей учётной записи %1$s</string>
-    <string name="title_setup_oauth_update">Повторная авторизация учётной записи</string>
+    <string name="title_setup_oauth_update">Авторизация существующей учётной записи (или создание новой)</string>
     <string name="title_setup_oauth_updated">Авторизация учётной записи обновлена</string>
     <string name="title_setup_oauth_authorize">Авторизироваться</string>
     <string name="title_setup_select_account">Выбрать учётную запись</string>
@@ -872,7 +872,7 @@
     <string name="title_edit_contact">Изменить контакт</string>
     <string name="title_contact_email">Эл. почта</string>
     <string name="title_contact_name">Имя</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Группа</string>
+    <string name="title_contact_group">Группа</string>
     <string name="title_import_contacts">Импорт vCard</string>
     <string name="title_export_contacts">Экспорт vCard</string>
     <string name="title_create_sub_folder">Создать вложенную папку</string>
@@ -1000,6 +1000,7 @@
     <string name="title_eml_remark">Для пересылки исходные (оригинальные) сообщения необходимо загрузить с сервера электронной почты. Это требует подключения к интернету, а сами сообщения должны храниться на сервере.</string>
     <string name="title_eml_option">Это можно предотвратить, включив загрузку исходных сообщений в настройках подключения</string>
     <string name="title_eml_downloaded">Загружены исходные сообщения: %1$s</string>
+    <string name="title_auto_confirm" comment="title_auto_confirm&#10;Option title for checkbox to auto close (confirm) dialogs.">Автоматическое подтверждение через несколько секунд</string>
     <string name="title_buttons">Выбрать кнопки</string>
     <string name="title_buttons_hint">Доступные действия зависят от типа учётной записи и конфигурации</string>
     <string name="title_button_search">Поиск в сообщениях</string>
@@ -1870,8 +1871,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Получатель</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Отправитель</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Заблокировано</item>
+        <item>Отправитель</item>
+        <item>Заблокировано</item>
         <item>Не заблокировано</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index b4f06ec295..62dcfb978d 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -175,7 +175,6 @@
     <string name="title_setup_gmail_password">Chcem si autorizovať účet zadaním hesla</string>
     <string name="title_setup_office_auth">Chyba \"OVERENIE zlyhalo\" môže byť zapríčinená zakázanými IMAP/SMTP správcom systému</string>
     <string name="title_setup_oauth_rationale">Autorizovať prístup do vášho %1$s účtu</string>
-    <string name="title_setup_oauth_update">Znovu autorizovať existujúci účet</string>
     <string name="title_setup_oauth_updated">Autorizácia účtu bola aktualizovaná</string>
     <string name="title_setup_oauth_authorize">Autorizovať</string>
     <string name="title_setup_select_account">Vybrať účet</string>
@@ -1851,8 +1850,8 @@ Nastavenie vždy toto kompenzuje neustálym sledovaním zmien.</string>
     </string-array>
     <string-array name="contactTypes">
         <item>Adresát</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Odosielateľ</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokované</item>
+        <item>Odosielateľ</item>
+        <item>Blokované</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index a410bbf961..be217d9d9f 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -1225,8 +1225,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Prejemnik</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Pošiljatelju</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blokirano</item>
+        <item>Pošiljatelju</item>
+        <item>Blokirano</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index b4fc005ea2..a495da2760 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -1059,8 +1059,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Прималац</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Пошиљаоцу</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Блокирано</item>
+        <item>Пошиљаоцу</item>
+        <item>Блокирано</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 66be3e3de1..ce5a5790ac 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -159,7 +159,6 @@
     <string name="title_setup_gmail_password">Jag vill auktorisera ett konto med ett lösenord</string>
     <string name="title_setup_office_auth">Felet \"AUTHENTICATE failed\" kan orsakas av att IMAP/SMTP inaktiveras av systemadministratören</string>
     <string name="title_setup_oauth_rationale">Auktorisera åtkomst till ditt %1$s konto</string>
-    <string name="title_setup_oauth_update">Auktorisera befintligt konto igen</string>
     <string name="title_setup_oauth_updated">Kontoauktorisering har uppdaterats</string>
     <string name="title_setup_oauth_authorize">Auktorisera</string>
     <string name="title_setup_select_account">Välj konto</string>
@@ -848,7 +847,7 @@
     <string name="title_edit_contact">Redigera kontakt</string>
     <string name="title_contact_email">E-post</string>
     <string name="title_contact_name">Namn</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Grupp</string>
+    <string name="title_contact_group">Grupp</string>
     <string name="title_import_contacts">Importera vCards</string>
     <string name="title_export_contacts">Exportera vCard</string>
     <string name="title_create_sub_folder">Skapa undermapp</string>
@@ -1841,8 +1840,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Mottagare</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Avsändaren</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Blockerade</item>
+        <item>Avsändaren</item>
+        <item>Blockerade</item>
         <item>Inte blockerad</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ta-rIN/strings.xml b/app/src/main/res/values-ta-rIN/strings.xml
index c9822dee7a..6013678d20 100644
--- a/app/src/main/res/values-ta-rIN/strings.xml
+++ b/app/src/main/res/values-ta-rIN/strings.xml
@@ -125,6 +125,7 @@
     <string name="title_setup_options">விருப்பங்கள்</string>
     <string name="title_advanced_section_synchronize">பெறுபவை</string>
     <string name="title_advanced_section_send">அனுப்புபவை</string>
+    <string name="title_advanced_section_privacy">தனியுரிமை</string>
     <string name="title_advanced_section_notifications">அறிவிப்புகள்</string>
     <string name="title_advanced_caption_general">பொது</string>
     <string name="title_advanced_caption_conversation">உரையாடல்</string>
@@ -132,6 +133,7 @@
     <string name="title_advanced_notify_action_delete">அழி</string>
     <string name="title_advanced_cleanup">சுத்தமாக்கு</string>
     <string name="title_synchronize_enabled">ஒத்திசைத்தல்</string>
+    <string name="title_contact_email">மின்னஞ்சல்</string>
     <string name="title_raw_send_message">அஞ்சல்</string>
     <string name="title_raw_send_thread">உரையாடல்</string>
     <string name="title_delete">அழி</string>
@@ -154,6 +156,12 @@
     <string name="title_log_clear">அகற்று</string>
     <string name="title_debug_info_remark">தயவுசெய்து சிக்கலை விளக்க மற்றும் பிரச்சினையின் நேரம் என்பதை குறிப்பிடவும்:</string>
     <!-- Thunderbird -->
+    <string-array name="startupNames">
+        <item>Unified inbox</item>
+        <item>Unified folders</item>
+        <item>Primary account folders</item>
+        <item>கணக்குகள்</item>
+    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
     <!-- https://www.w3.org/TR/css-fonts-4/#generic-font-families -->
@@ -162,8 +170,8 @@
     <!-- https://datatracker.ietf.org/doc/html/rfc5751#section-2.7 -->
     <string-array name="contactTypes">
         <item>Recipient</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Sender</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">தடுக்கப்பட்டவை</item>
+        <item>Sender</item>
+        <item>தடுக்கப்பட்டவை</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 2c2aafbef0..67bfef068a 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -158,7 +158,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_setup_gmail_password">Bir hesabı bir şifre ile yetkilendirmek istiyorum</string>
     <string name="title_setup_office_auth">\'AUTHENTICATE failed\' hatası, sistem yöneticinizin IMAP/SMTP protokollerini engellemesinden kaynaklanıyor olabilir</string>
     <string name="title_setup_oauth_rationale">%1$s hesabınıza erişim için yetkilendirin</string>
-    <string name="title_setup_oauth_update">Mevcut hesabı tekrar yetkilendirin</string>
+    <string name="title_setup_oauth_update">Mevcut bir hesabı yeniden yetkilendir (aksi takdirde yeni bir hesap oluştur)</string>
     <string name="title_setup_oauth_updated">Hesap yetkilendirme güncellendi</string>
     <string name="title_setup_oauth_authorize">Yetkilendir</string>
     <string name="title_setup_select_account">Hesap seç</string>
@@ -850,7 +850,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_edit_contact">Kişiyi düzenle</string>
     <string name="title_contact_email">e-posta</string>
     <string name="title_contact_name">Ad</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">Grup</string>
+    <string name="title_contact_group">Grup</string>
     <string name="title_import_contacts">vCard\'ları içe aktar</string>
     <string name="title_export_contacts">vCard\'ları dışa aktar</string>
     <string name="title_create_sub_folder">Alt dizin oluştur</string>
@@ -1842,8 +1842,8 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     </string-array>
     <string-array name="contactTypes">
         <item>Alıcı</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Gönderen</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Engellenen</item>
+        <item>Gönderen</item>
+        <item>Engellenen</item>
         <item>Engellenmemiş</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 9a5be90f2a..055574f1dd 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -180,7 +180,6 @@
     <string name="title_setup_gmail_password">Я хочу авторизувати обліковий запис за допомогою пароля</string>
     <string name="title_setup_office_auth">Помилка \'Автентифікація не вдалася\' викликана помилкою IMAP/SMTP можливо вимкненою системним адміністратором</string>
     <string name="title_setup_oauth_rationale">Авторизувати доступ до вашого облікового запису %1$s</string>
-    <string name="title_setup_oauth_update">Авторизувати обліковий запис що існує знову</string>
     <string name="title_setup_oauth_updated">Авторизація облікового запису була оновлена</string>
     <string name="title_setup_oauth_authorize">Авторизація</string>
     <string name="title_setup_select_account">Обрати обліковий запис</string>
@@ -1865,8 +1864,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Одержувач</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Відправником</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Заблоковано</item>
+        <item>Відправником</item>
+        <item>Заблоковано</item>
         <item>Not blocked</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index b545f3f7d9..33141eff50 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -149,7 +149,6 @@
     <string name="title_setup_gmail_password">Tôi muốn uỷ quyền một tài khoản với mật khẩu</string>
     <string name="title_setup_office_auth">Lỗi \'XÁC THỰC thất bại\' có thể gây ra bởi IMAP/SMTP bị vô hiệu hoá bởi quản trị viên hệ thống</string>
     <string name="title_setup_oauth_rationale">Cấp quyền truy cập vào tài khoản %1$s của bạn</string>
-    <string name="title_setup_oauth_update">Uỷ quyền lại tài khoản đang tồn tại</string>
     <string name="title_setup_oauth_updated">Việc uỷ quyền tài khoản đã được cập nhật</string>
     <string name="title_setup_oauth_authorize">Uỷ quyền</string>
     <string name="title_setup_select_account">Chọn tài khoản</string>
@@ -840,6 +839,7 @@
     <string name="title_edit_contact">Chỉnh sửa liên hệ</string>
     <string name="title_contact_email">Email</string>
     <string name="title_contact_name">Tên</string>
+    <string name="title_contact_group">Nhóm</string>
     <string name="title_import_contacts">Nhập tệp vCard</string>
     <string name="title_export_contacts">Xuất vCard</string>
     <string name="title_create_sub_folder">Tạo thư mục con</string>
@@ -1824,8 +1824,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>Người nhận</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">Người gửi</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">Đã chặn</item>
-        <item>Not blocked</item>
+        <item>Người gửi</item>
+        <item>Đã chặn</item>
+        <item>Không bị chặn</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e434061558..a8bd3986a9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -149,7 +149,7 @@
     <string name="title_setup_gmail_password">我想通过密码来授权一个账户</string>
     <string name="title_setup_office_auth">\"认证失败\" 的错误可能是由于 IMAP/SMTP 被系统管理员禁用导致的</string>
     <string name="title_setup_oauth_rationale">授权访问您的 %1$s 账户</string>
-    <string name="title_setup_oauth_update">再次授权现有账户</string>
+    <string name="title_setup_oauth_update">重新授权现有账户（否则请新建账户）</string>
     <string name="title_setup_oauth_updated">账户授权已更新</string>
     <string name="title_setup_oauth_authorize">授权</string>
     <string name="title_setup_select_account">选择账户</string>
@@ -840,7 +840,7 @@
     <string name="title_edit_contact">编辑联系人</string>
     <string name="title_contact_email">电子邮件</string>
     <string name="title_contact_name">名称</string>
-    <string name="title_contact_group" comment="title_contact_group&#10;Local contact group name">组</string>
+    <string name="title_contact_group">组</string>
     <string name="title_import_contacts">从 vCard 文件导入</string>
     <string name="title_export_contacts">导出为 vCard 文件</string>
     <string name="title_create_sub_folder">创建子文件夹</string>
@@ -1830,8 +1830,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>收件人</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">发件人</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">已拦截</item>
+        <item>发件人</item>
+        <item>已拦截</item>
         <item>未屏蔽</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9c501bacfe..3e85b666de 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -144,7 +144,6 @@
     <string name="title_setup_gmail_password">我想要使用密碼來授權帳戶</string>
     <string name="title_setup_office_auth">“驗證失敗”錯誤可能是由系統管理員停用 IMAP/SMTP 所致</string>
     <string name="title_setup_oauth_rationale">授權存取您的 %1$s 帳戶</string>
-    <string name="title_setup_oauth_update">再次授權現有帳戶</string>
     <string name="title_setup_oauth_updated">帳戶授權已更新</string>
     <string name="title_setup_oauth_authorize">授權</string>
     <string name="title_setup_select_account">選擇帳戶</string>
@@ -1774,8 +1773,8 @@
     </string-array>
     <string-array name="contactTypes">
         <item>接收者</item>
-        <item comment="contact types: sender&#10;As in &quot;this is a sender&quot;">寄件者</item>
-        <item comment="contact types: blocked sender&#10;As in &quot;This sender is blocked&quot;">已封鎖</item>
+        <item>寄件者</item>
+        <item>已封鎖</item>
         <item>Not blocked</item>
     </string-array>
 </resources>