From 0371a94567a3a32b1b4d3f72b8df6678861ea553 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 9 Feb 2020 20:11:21 +0100
Subject: [PATCH] Crowdin sync

---
 app/src/main/res/values-bg-rBG/strings.xml | 4 +++-
 app/src/main/res/values-cs-rCZ/strings.xml | 2 +-
 app/src/main/res/values-da-rDK/strings.xml | 5 ++++-
 app/src/main/res/values-de-rDE/strings.xml | 5 ++++-
 app/src/main/res/values-es-rES/strings.xml | 4 +++-
 app/src/main/res/values-eu-rES/strings.xml | 4 +++-
 app/src/main/res/values-fi-rFI/strings.xml | 6 ++++--
 app/src/main/res/values-fr-rFR/strings.xml | 5 ++++-
 app/src/main/res/values-hr-rHR/strings.xml | 2 +-
 app/src/main/res/values-hu-rHU/strings.xml | 2 +-
 app/src/main/res/values-it-rIT/strings.xml | 5 ++++-
 app/src/main/res/values-ja-rJP/strings.xml | 4 +++-
 app/src/main/res/values-nl-rNL/strings.xml | 5 ++++-
 app/src/main/res/values-nn-rNO/strings.xml | 5 ++++-
 app/src/main/res/values-no-rNO/strings.xml | 5 ++++-
 app/src/main/res/values-pl-rPL/strings.xml | 6 +++++-
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 app/src/main/res/values-ro-rRO/strings.xml | 2 +-
 app/src/main/res/values-ru-rRU/strings.xml | 5 ++++-
 app/src/main/res/values-tr-rTR/strings.xml | 7 ++++++-
 app/src/main/res/values-zh-rCN/strings.xml | 4 +++-
 21 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 4a3cce1e2f..5d7c93b92b 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -248,7 +248,6 @@
     <string name="title_advanced_threading">Групиране на разговори</string>
     <string name="title_advanced_indentation">Ляв/десен отстъп на получени/изпратени съобщения в разговори</string>
     <string name="title_advanced_highlight_unread">Маркирай непрочетените съобщения</string>
-    <string name="title_advanced_distinguish_contacts">Подчертайте подателя, когато подателят е известен като локаленен „до“ контакт</string>
     <string name="title_advanced_color_stripe">Показване на цветна ивица</string>
     <string name="title_advanced_avatars">Покажи снимка на контакт</string>
     <string name="title_advanced_gravatars">Покажи Gravatars</string>
@@ -259,6 +258,8 @@
     <string name="title_advanced_color_value">Яркост</string>
     <string name="title_advanced_color_threshold">Бяла или черна буква в генерирани икони</string>
     <string name="title_advanced_name_email">Покажи имена и имейл адреси</string>
+    <string name="title_advanced_replace_name">Предпочитано име от контакти пред изпратено име</string>
+    <string name="title_advanced_distinguish_contacts">Подчертайте подателя, когато подателят е известен като локаленен „до“ контакт</string>
     <string name="title_advanced_authentication">Покажи предупреждение, когато получаващият сървър не може да удостовери съобщението</string>
     <string name="title_advanced_font_size_sender">Размер на текст на подател</string>
     <string name="title_advanced_font_size_subject">Размер на текст на тема</string>
@@ -439,6 +440,7 @@
     <string name="title_port">Номер на порт</string>
     <string name="title_user">Потрибител</string>
     <string name="title_password">Парола</string>
+    <string name="title_use_certificate">Използвай клиентски сертификат</string>
     <string name="title_realm">Област</string>
     <string name="title_use_ip">Използвай локален IP адрес вместо име на хост</string>
     <string name="title_primary_account">Основен (по подразбиране профил)</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 49ac3a906e..a18ac36272 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -270,7 +270,6 @@
     <string name="title_advanced_threading">Vlákna konverzací</string>
     <string name="title_advanced_indentation">Levé/pravé odsazení přijatých/odeslaných zpráv v konverzacích</string>
     <string name="title_advanced_highlight_unread">Zvýraznit nepřečtené zprávy</string>
-    <string name="title_advanced_distinguish_contacts">Podtrhnout odesílatele, je-li známý jako místní \"komu\" kontakt</string>
     <string name="title_advanced_color_stripe">Zobrazit barevný pruh</string>
     <string name="title_advanced_avatars">Zobrazit fotografie kontaktů</string>
     <string name="title_advanced_gravatars">Zobrazit Gravatary</string>
@@ -281,6 +280,7 @@
     <string name="title_advanced_color_value">Jas</string>
     <string name="title_advanced_color_threshold">Mezní hodnota barvy písmena</string>
     <string name="title_advanced_name_email">Zobrazit jména a e-mailové adresy</string>
+    <string name="title_advanced_distinguish_contacts">Podtrhnout odesílatele, je-li známý jako místní \"komu\" kontakt</string>
     <string name="title_advanced_authentication">Zobrazit upozornění, nemůže-li přijímající server zprávu ověřit</string>
     <string name="title_advanced_font_size_sender">Velikost písma odesílatele</string>
     <string name="title_advanced_font_size_subject">Velikost písma předmětu</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 527895b965..8dbf3181f8 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -247,7 +247,6 @@
     <string name="title_advanced_threading">Samtaler i tråde</string>
     <string name="title_advanced_indentation">Venstre-/-højreindryk modtagne/sendte beskeder i samtaler</string>
     <string name="title_advanced_highlight_unread">Fremhæv ulæste beskeder</string>
-    <string name="title_advanced_distinguish_contacts">Understreg afsender, når denne er kendt som lokal \'Til\'-kontakt</string>
     <string name="title_advanced_color_stripe">Vis farvestripe</string>
     <string name="title_advanced_avatars">Vis kontaktfotos</string>
     <string name="title_advanced_gravatars">Vis Gravatarer</string>
@@ -258,6 +257,8 @@
     <string name="title_advanced_color_value">Lysstyrke</string>
     <string name="title_advanced_color_threshold">Grænseværdi, bogstavsfarve</string>
     <string name="title_advanced_name_email">Vis navne og e-mailadresser</string>
+    <string name="title_advanced_replace_name">Foretræk Kontakt- fremfor Afsendernavn</string>
+    <string name="title_advanced_distinguish_contacts">Understreg afsender, når denne er kendt som lokal \'Til\'-kontakt</string>
     <string name="title_advanced_authentication">Vis en advarsel, når indgående server ikke kunne bekræfte beskeden</string>
     <string name="title_advanced_font_size_sender">Skriftstørrelse, Afsender</string>
     <string name="title_advanced_font_size_subject">Skriftstørrelse, Emne</string>
@@ -439,6 +440,7 @@
     <string name="title_port">Portnummer</string>
     <string name="title_user">Brugernavn</string>
     <string name="title_password">Adgangskode</string>
+    <string name="title_use_certificate">Benyt klientcertifikat</string>
     <string name="title_realm">Område</string>
     <string name="title_use_ip">Brug lokal IP-adresse i stedet for værtsnavn</string>
     <string name="title_primary_account">Primær (standardkonto)</string>
@@ -712,6 +714,7 @@
     <string name="title_signature_unconfirmed_from">Beskedsignatur gyldig, men ubekræftet: %1$s</string>
     <string name="title_signature_invalid">Beskedsignatur ugyldig</string>
     <string name="title_signature_invalid_reason">Beskedsignatur ugyldig: %1$s</string>
+    <string name="title_signature_key_missing">Nøgle mangler</string>
     <string name="title_signature_certificate_invalid">Certifikatkæde ugyldig</string>
     <string name="title_signature_sender">Afsenderadresse</string>
     <string name="title_signature_email">Signaturadresse</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 2660f0c889..8f92bede19 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -248,7 +248,6 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_advanced_threading">Konversationsansicht</string>
     <string name="title_advanced_indentation">In der Unterhaltungsansicht empfangene Nachrichten nach links und Gesendete nach rechts einrücken</string>
     <string name="title_advanced_highlight_unread">Ungelesene Nachrichten hervorheben</string>
-    <string name="title_advanced_distinguish_contacts">Den Sender unterstrichen darstellen, wenn er ein bekannter lokaler \'An\'-Kontakt ist</string>
     <string name="title_advanced_color_stripe">Farbstreifen anzeigen</string>
     <string name="title_advanced_avatars">Kontaktfotos anzeigen</string>
     <string name="title_advanced_gravatars">Gravatare anzeigen</string>
@@ -259,6 +258,8 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_advanced_color_value">Helligkeit</string>
     <string name="title_advanced_color_threshold">Schwellenwert für Buchstabenfarbe</string>
     <string name="title_advanced_name_email">Namen und E-Mail-Adressen anzeigen</string>
+    <string name="title_advanced_replace_name">Bevorzuge einen Kontaktnamen gegenüber einem gesendeten Namen</string>
+    <string name="title_advanced_distinguish_contacts">Den Sender unterstrichen darstellen, wenn er ein bekannter lokaler \'An\'-Kontakt ist</string>
     <string name="title_advanced_authentication">Warnung anzeigen, wenn der empfangende Server die Nachricht nicht authentifizieren konnte</string>
     <string name="title_advanced_font_size_sender">Schriftgröße für den Absender</string>
     <string name="title_advanced_font_size_subject">Schriftgröße für den Betreff</string>
@@ -440,6 +441,7 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_port">Portnummer</string>
     <string name="title_user">Benutzername</string>
     <string name="title_password">Passwort</string>
+    <string name="title_use_certificate">Clientzertifikat verwenden</string>
     <string name="title_realm">Bereich</string>
     <string name="title_use_ip">Lokale IP-Adresse anstelle des Domain-Namens verwenden</string>
     <string name="title_primary_account">Primäres Konto</string>
@@ -713,6 +715,7 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_signature_unconfirmed_from">Signatur gültig aber nicht bestätigt: %1$s</string>
     <string name="title_signature_invalid">Ungültige Nachrichtensignatur</string>
     <string name="title_signature_invalid_reason">Nachrichten-Signatur ungültig: %1$s</string>
+    <string name="title_signature_key_missing">Schlüssel fehlt</string>
     <string name="title_signature_certificate_invalid">Zertifikatskette ungültig</string>
     <string name="title_signature_sender">E-Mail-Adresse des Absenders</string>
     <string name="title_signature_email">E-Mail-Adresse der Unterschrift</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index a3b85f16c7..a83fa68120 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -248,7 +248,6 @@
     <string name="title_advanced_threading">Hilos de conversación</string>
     <string name="title_advanced_indentation">Sangría izquierda/derecha para mensajes recibidos/enviados en conversaciones</string>
     <string name="title_advanced_highlight_unread">Resaltar mensajes no leídos</string>
-    <string name="title_advanced_distinguish_contacts">Subrayar el remitente cuando el remitente es conocido como contacto \'a:\' local</string>
     <string name="title_advanced_color_stripe">Mostrar raya de color</string>
     <string name="title_advanced_avatars">Mostrar fotos de contactos</string>
     <string name="title_advanced_gravatars">Mostrar Gravatares</string>
@@ -259,6 +258,8 @@
     <string name="title_advanced_color_value">Brillo</string>
     <string name="title_advanced_color_threshold">Umbral de color de letras</string>
     <string name="title_advanced_name_email">Mostrar nombres y direcciones de correo electrónico</string>
+    <string name="title_advanced_replace_name">Preferir un nombre de contacto sobre un nombre enviado</string>
+    <string name="title_advanced_distinguish_contacts">Subrayar el remitente cuando el remitente es conocido como contacto \'a:\' local</string>
     <string name="title_advanced_authentication">Mostrar una advertencia cuando el servidor de recepción no pudo autenticar el mensaje</string>
     <string name="title_advanced_font_size_sender">Tamaño de fuente de remitente</string>
     <string name="title_advanced_font_size_subject">Tamaño de fuente del asunto</string>
@@ -440,6 +441,7 @@
     <string name="title_port">Puerto</string>
     <string name="title_user">Nombre de usuario</string>
     <string name="title_password">Contraseña</string>
+    <string name="title_use_certificate">Usar certificado de cliente</string>
     <string name="title_realm">Dominio</string>
     <string name="title_use_ip">Usar dirección IP local en lugar de nombre de dominio</string>
     <string name="title_primary_account">Primaria (cuenta predeterminada)</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index e9c61b58a8..b81fad166d 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -247,7 +247,6 @@
     <string name="title_advanced_threading">Elkarrizketak haritzea</string>
     <string name="title_advanced_indentation">Ezker/eskuin marjina elkarrizketetan jaso/bidalitako mezuetan</string>
     <string name="title_advanced_highlight_unread">Nabarmendu irakurri gabeko mezuak</string>
-    <string name="title_advanced_distinguish_contacts">Azpimarratu igorlea kontaktua jasotzaile lokalki ezaguna bada</string>
     <string name="title_advanced_color_stripe">Erakutsi kolorezko marra</string>
     <string name="title_advanced_avatars">Erakutsi kontaktuen argazkiak</string>
     <string name="title_advanced_gravatars">Erakutsi gravatarrak</string>
@@ -258,6 +257,8 @@
     <string name="title_advanced_color_value">Distira</string>
     <string name="title_advanced_color_threshold">Letren kolorearen atalasea</string>
     <string name="title_advanced_name_email">Erakutsi izenak eta e-mail helbideak</string>
+    <string name="title_advanced_replace_name">Nahiago kontaktu-izena bidaltzaile-izena baino</string>
+    <string name="title_advanced_distinguish_contacts">Azpimarratu igorlea kontaktua jasotzaile lokalki ezaguna bada</string>
     <string name="title_advanced_authentication">Erakutsi abisua zerbitzari jasotzaileak ezin izan badu mezua autentifikatu</string>
     <string name="title_advanced_font_size_sender">Igorlearen letra tamaina</string>
     <string name="title_advanced_font_size_subject">Gaiaren letra tamaina</string>
@@ -438,6 +439,7 @@
     <string name="title_port">Ataka zenbakia</string>
     <string name="title_user">Erabiltzaile izena</string>
     <string name="title_password">Pasahitza</string>
+    <string name="title_use_certificate">Erabili bezeroaren ziurtagiria</string>
     <string name="title_realm">Domeinua</string>
     <string name="title_use_ip">Erabili IP lokala ostalari izenaren ordez</string>
     <string name="title_primary_account">Nagusia (kontu lehenetsia)</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index e386975237..3d9fb08fe8 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -246,7 +246,6 @@
     <string name="title_advanced_threading">Keskustelujen ketjuttaminen</string>
     <string name="title_advanced_indentation">Tasaa vastaanotetut/lähetetyt viestit keskusteluissa vasemmalle/oikealle</string>
     <string name="title_advanced_highlight_unread">Korosta lukemattomat viestit</string>
-    <string name="title_advanced_distinguish_contacts">Alleviivaa lähettäjä tämän ollessa paikallisesti tunnettu vastaanottaja</string>
     <string name="title_advanced_color_stripe">Näytä väriliuska</string>
     <string name="title_advanced_avatars">Näytä yhteystietojen kuvat</string>
     <string name="title_advanced_gravatars">Näytä Gravatarit</string>
@@ -257,6 +256,8 @@
     <string name="title_advanced_color_value">Kirkkaus</string>
     <string name="title_advanced_color_threshold">Kirjasimen värin kynnysarvo</string>
     <string name="title_advanced_name_email">Näytä nimet ja sähköpostiosoitteet</string>
+    <string name="title_advanced_replace_name">Käytä ensisijaisesti yhteystiedon nimeä lähettäjän nimen sijaan</string>
+    <string name="title_advanced_distinguish_contacts">Alleviivaa lähettäjä tämän ollessa paikallisesti tunnettu vastaanottaja</string>
     <string name="title_advanced_authentication">Näytä varoitus, kun vastaanottava palvelin ei voinut todentaa viestiä</string>
     <string name="title_advanced_font_size_sender">Viestin lähettäjän kirjaisimen koko</string>
     <string name="title_advanced_font_size_subject">Viestin aiheen kirjaisimen koko</string>
@@ -293,7 +294,7 @@
     <string name="title_advanced_onclose">Keskustelua suljettaessa</string>
     <string name="title_advanced_quick_filter">Näytä huomaamattomat pikasuodatuskuvakkeet</string>
     <string name="title_advanced_quick_scroll">Näytä huomaamattomat ylös-/alaspikavierityskuvakkeet</string>
-    <string name="title_advanced_autoread">Siirtäessä viestejä merkitse ne luetuiksi</string>
+    <string name="title_advanced_autoread">Merkitse viestit luetuiksi siirrettäessä</string>
     <string name="title_advanced_autounstar">Poista tähti viestejä siirrettäessä</string>
     <string name="title_advanced_reset_importance">Palauta oma tärkeysjärjestys oletusasetukseen siirrettäessä</string>
     <string name="title_advanced_discard_delete">Poista luonnos hylättäessä</string>
@@ -438,6 +439,7 @@
     <string name="title_port">Porttinumero</string>
     <string name="title_user">Käyttäjätunnus</string>
     <string name="title_password">Salasana</string>
+    <string name="title_use_certificate">Käytä asiakasvarmennetta</string>
     <string name="title_realm">Toimialue</string>
     <string name="title_use_ip">Käytä paikallista IP-osoitetta verkkotunnuksen sijaan</string>
     <string name="title_primary_account">Ensisijainen (oletustili)</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index e7726620ee..fe89254658 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -248,7 +248,6 @@
     <string name="title_advanced_threading">Afficher en mode conversation</string>
     <string name="title_advanced_indentation">Décaler les messages reçus/envoyés vers la gauche/droite dans les conversations</string>
     <string name="title_advanced_highlight_unread">Surligner les messages non lus</string>
-    <string name="title_advanced_distinguish_contacts">Souligner l\'expéditeur lorsqu\'il est connu comme contact local</string>
     <string name="title_advanced_color_stripe">Afficher la bande de couleur</string>
     <string name="title_advanced_avatars">Afficher la photo des contacts</string>
     <string name="title_advanced_gravatars">Afficher les Gravatars</string>
@@ -259,6 +258,8 @@
     <string name="title_advanced_color_value">Luminosité</string>
     <string name="title_advanced_color_threshold">Seuil de couleur de lettre</string>
     <string name="title_advanced_name_email">Afficher les noms et les adresses e-mail</string>
+    <string name="title_advanced_replace_name">Préférer un nom de contact à un nom d\'envoi</string>
+    <string name="title_advanced_distinguish_contacts">Souligner l\'expéditeur lorsqu\'il est connu comme contact local</string>
     <string name="title_advanced_authentication">Afficher un avertissement lorsque le serveur de réception n\'a pas pu authentifier le message</string>
     <string name="title_advanced_font_size_sender">Taille de police de l\'expéditeur</string>
     <string name="title_advanced_font_size_subject">Taille de police de l\'objet</string>
@@ -440,6 +441,7 @@
     <string name="title_port">Numéro de port</string>
     <string name="title_user">Nom d\'utilisateur</string>
     <string name="title_password">Mot de passe</string>
+    <string name="title_use_certificate">Utiliser le certificat client</string>
     <string name="title_realm">Domaine</string>
     <string name="title_use_ip">Utiliser l\'adresse IP locale au lieu du nom de domaine</string>
     <string name="title_primary_account">Principal (compte par défaut)</string>
@@ -713,6 +715,7 @@
     <string name="title_signature_unconfirmed_from">Signature de message valide mais non confirmée : %1$s</string>
     <string name="title_signature_invalid">Signature de message invalide</string>
     <string name="title_signature_invalid_reason">Signature de message invalide : %1$s</string>
+    <string name="title_signature_key_missing">Clé manquante</string>
     <string name="title_signature_certificate_invalid">Chaîne de certificats invalide</string>
     <string name="title_signature_sender">Adresse de l\'expéditeur</string>
     <string name="title_signature_email">Adresse de la signature</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index b4ee3bb07a..329d409a04 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -240,7 +240,6 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_advanced_threading">Prikaz razgovora</string>
     <string name="title_advanced_indentation">Uvlaka primljenih/poslanih poruka u razgovorima prema lijevo/desno</string>
     <string name="title_advanced_highlight_unread">Označiti nepročitane poruke</string>
-    <string name="title_advanced_distinguish_contacts">Podvucite pošiljatelja kada je pošiljalac poznat kao lokalni \"za\" kontakt</string>
     <string name="title_advanced_color_stripe">Pokaži prugu boje</string>
     <string name="title_advanced_avatars">Prikaži fotografije kontakata</string>
     <string name="title_advanced_generated_icons">Prikaži generirane ikone</string>
@@ -250,6 +249,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_advanced_color_value">Svjetlost</string>
     <string name="title_advanced_color_threshold">Prag za boju slova</string>
     <string name="title_advanced_name_email">Prikažite imena i adrese e-pošte</string>
+    <string name="title_advanced_distinguish_contacts">Podvucite pošiljatelja kada je pošiljalac poznat kao lokalni \"za\" kontakt</string>
     <string name="title_advanced_authentication">Pokaži upozorenje kada primateljski server nije mogao provjeriti autentičnost poruke</string>
     <string name="title_advanced_font_size_sender">Veličina fonta pošiljatelja</string>
     <string name="title_advanced_font_size_subject">Veličina fonta predmeta</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index c82df77460..f54c116750 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -246,7 +246,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_advanced_threading">Beszélgetések összefűzése</string>
     <string name="title_advanced_indentation">Beérkezett/elküldött üzenetek balra/jobbra tördelése a beszélgetésekben</string>
     <string name="title_advanced_highlight_unread">Olvasatlan üzenetek kiemelése</string>
-    <string name="title_advanced_distinguish_contacts">Húzza alá a küldőt, ha az egy ismert, korábban megcímzett helyi névjegy</string>
     <string name="title_advanced_color_stripe">Színszalag megjelenítése</string>
     <string name="title_advanced_avatars">Névjegyzék fényképeinek megjelenítése</string>
     <string name="title_advanced_gravatars">Gravatar képek megjelenítése</string>
@@ -257,6 +256,7 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_advanced_color_value">Fényerő</string>
     <string name="title_advanced_color_threshold">Betűszín küszöbérték</string>
     <string name="title_advanced_name_email">Nevek és email címek megjelenítése</string>
+    <string name="title_advanced_distinguish_contacts">Húzza alá a küldőt, ha az egy ismert, korábban megcímzett helyi névjegy</string>
     <string name="title_advanced_authentication">Figyelmeztessen, ha a fogadó szerver nem tudta igazolni az üzenet hitelességét</string>
     <string name="title_advanced_font_size_sender">Küldő betűmérete</string>
     <string name="title_advanced_font_size_subject">Tárgy betűmérete</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 64971df1e7..924b96cd28 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -247,7 +247,6 @@
     <string name="title_advanced_threading">Thread di conversazione</string>
     <string name="title_advanced_indentation">Messaggi ricevuti/inviati con rientro a sinistra/destra nelle conversazioni</string>
     <string name="title_advanced_highlight_unread">Evidenzia i messaggi non letti</string>
-    <string name="title_advanced_distinguish_contacts">Sottolinea il mittente quando il mittente è conosciuto come contatto locale \'a\"</string>
     <string name="title_advanced_color_stripe">Mostra striscia di colore</string>
     <string name="title_advanced_avatars">Mostra foto del contatto</string>
     <string name="title_advanced_gravatars">Mostra Gravatars</string>
@@ -258,6 +257,8 @@
     <string name="title_advanced_color_value">Luminosità</string>
     <string name="title_advanced_color_threshold">Soglia colore lettera</string>
     <string name="title_advanced_name_email">Mostra nomi e indirizzi email</string>
+    <string name="title_advanced_replace_name">Preferisci un nome di contatto a un nome inviato</string>
+    <string name="title_advanced_distinguish_contacts">Sottolinea il mittente quando il mittente è conosciuto come contatto locale \'a\"</string>
     <string name="title_advanced_authentication">Mostra un avviso quando il server ricevente non può autenticare il messaggio</string>
     <string name="title_advanced_font_size_sender">Dimensione font mittente</string>
     <string name="title_advanced_font_size_subject">Dimensione carattere oggetto</string>
@@ -439,6 +440,7 @@
     <string name="title_port">Numero porta</string>
     <string name="title_user">Nome utente</string>
     <string name="title_password">Password</string>
+    <string name="title_use_certificate">Utilizza il certificato client</string>
     <string name="title_realm">Dominio</string>
     <string name="title_use_ip">Usa l\'indirizzo IP locale invece del nome dell\'host</string>
     <string name="title_primary_account">Principale (account predefinito)</string>
@@ -711,6 +713,7 @@
     <string name="title_signature_unconfirmed_from">Firma di messaggio valida ma non confermata: %1$s</string>
     <string name="title_signature_invalid">Firma messaggio non valida</string>
     <string name="title_signature_invalid_reason">Firma del messaggio non valida: %1$s</string>
+    <string name="title_signature_key_missing">Chiave mancante</string>
     <string name="title_signature_certificate_invalid">Catena di certificati non valida</string>
     <string name="title_signature_sender">Indirizzo del mittente</string>
     <string name="title_signature_email">Indirizzo della firma</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 1508de26e2..0ca1063008 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -234,7 +234,6 @@
     <string name="title_advanced_threading">会話スレッド</string>
     <string name="title_advanced_indentation">会話の受信/送信メッセージの左/右インデント</string>
     <string name="title_advanced_highlight_unread">未読メッセージを強調表示</string>
-    <string name="title_advanced_distinguish_contacts">送信者がローカル(宛先)連絡先として知られている場合、送信者に下線を引く</string>
     <string name="title_advanced_color_stripe">カラーストライプを表示</string>
     <string name="title_advanced_avatars">連絡先の写真を表示</string>
     <string name="title_advanced_gravatars">Gravatar(アバター)を表示</string>
@@ -245,6 +244,8 @@
     <string name="title_advanced_color_value">明度</string>
     <string name="title_advanced_color_threshold">閾値の文字色</string>
     <string name="title_advanced_name_email">名前とメールアドレスを表示</string>
+    <string name="title_advanced_replace_name">送信名より連絡先名を優先する</string>
+    <string name="title_advanced_distinguish_contacts">送信者がローカル(宛先)連絡先として知られている場合、送信者に下線を引く</string>
     <string name="title_advanced_authentication">受信サーバがメッセージを認証出来なかった時に警告を表示</string>
     <string name="title_advanced_font_size_sender">送信者のフォントサイズ</string>
     <string name="title_advanced_font_size_subject">件名のフォントサイズ</string>
@@ -425,6 +426,7 @@
     <string name="title_port">ポート番号</string>
     <string name="title_user">ユーザー名</string>
     <string name="title_password">パスワード</string>
+    <string name="title_use_certificate">クライアント証明書を使用</string>
     <string name="title_realm">Realm(Ntlm認証に使用)</string>
     <string name="title_use_ip">ホスト名の代わりにローカルIPアドレスを使用</string>
     <string name="title_primary_account">基本(デフォルトアカウント)</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 8a682d8009..52f9d22ddc 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -248,7 +248,6 @@
     <string name="title_advanced_threading">Gesprekken groeperen</string>
     <string name="title_advanced_indentation">Links/rechts inspringen van ontvangen/verzonden berichten in gesprekken</string>
     <string name="title_advanced_highlight_unread">Ongelezen berichten markeren</string>
-    <string name="title_advanced_distinguish_contacts">Onderstreep de afzender wanneer de afzender bekend staat als lokaal \'aan\'-contact</string>
     <string name="title_advanced_color_stripe">Toon kleurenstreep</string>
     <string name="title_advanced_avatars">Toon foto\'s contacten</string>
     <string name="title_advanced_gravatars">Gravatars weergeven</string>
@@ -259,6 +258,8 @@
     <string name="title_advanced_color_value">Helderheid</string>
     <string name="title_advanced_color_threshold">Drempel letterkleur</string>
     <string name="title_advanced_name_email">Toon namen en e-mailadressen</string>
+    <string name="title_advanced_replace_name">Geef de voorkeur aan een contactnaam boven een verzonden naam</string>
+    <string name="title_advanced_distinguish_contacts">Onderstreep de afzender wanneer de afzender bekend staat als lokaal \'aan\'-contact</string>
     <string name="title_advanced_authentication">Toon een waarschuwing wanneer de ontvangende server het bericht niet kon verifiëren</string>
     <string name="title_advanced_font_size_sender">Tekengrootte afzender</string>
     <string name="title_advanced_font_size_subject">Tekengrootte onderwerp</string>
@@ -440,6 +441,7 @@
     <string name="title_port">Poortnummer</string>
     <string name="title_user">Gebruikersnaam</string>
     <string name="title_password">Wachtwoord</string>
+    <string name="title_use_certificate">Gebruik client certificaat</string>
     <string name="title_realm">Realm</string>
     <string name="title_use_ip">Gebruik lokaal IP-adres in plaats van hostnaam</string>
     <string name="title_primary_account">Primair account (standaard account)</string>
@@ -713,6 +715,7 @@
     <string name="title_signature_unconfirmed_from">Handtekening bericht geldig maar niet bevestigd: %1$s</string>
     <string name="title_signature_invalid">Handtekening bericht ongeldig</string>
     <string name="title_signature_invalid_reason">Handtekening bericht ongeldig: %1$s</string>
+    <string name="title_signature_key_missing">Sleutel ontbreekt</string>
     <string name="title_signature_certificate_invalid">Certificaatketen ongeldig</string>
     <string name="title_signature_sender">Adres van de afzender</string>
     <string name="title_signature_email">Adres van de handtekening</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 213151ca92..9f4f3f45af 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -248,7 +248,6 @@
     <string name="title_advanced_threading">Konversasjonstråder</string>
     <string name="title_advanced_indentation">Venstre/høyre innrykk mottatt/sendt meldinger i samtaler</string>
     <string name="title_advanced_highlight_unread">Merk uleste meldinger</string>
-    <string name="title_advanced_distinguish_contacts">Understreke avsenderen når avsenderen er kjent som lokal \'til\' -kontakt</string>
     <string name="title_advanced_color_stripe">Vis fargestripe</string>
     <string name="title_advanced_avatars">Vis kontakt bilde</string>
     <string name="title_advanced_gravatars">Vis Gravatars</string>
@@ -259,6 +258,8 @@
     <string name="title_advanced_color_value">Lysstyrke</string>
     <string name="title_advanced_color_threshold">Terskelbokstavfarge</string>
     <string name="title_advanced_name_email">Vis navn og e-postadresser</string>
+    <string name="title_advanced_replace_name">Foretrekker et kontaktnavn fremfor et sendt navn</string>
+    <string name="title_advanced_distinguish_contacts">Understreke avsenderen når avsenderen er kjent som lokal \'til\' -kontakt</string>
     <string name="title_advanced_authentication">Vis en advarsel når mottakeren ikke kunne godkjenne meldingen</string>
     <string name="title_advanced_font_size_sender">Skriftstørrelse for avsender</string>
     <string name="title_advanced_font_size_subject">Skriftstørrelse emne</string>
@@ -440,6 +441,7 @@
     <string name="title_port">Portnummer</string>
     <string name="title_user">Brukernavn</string>
     <string name="title_password">Passord</string>
+    <string name="title_use_certificate">Bruk klientsertifikat</string>
     <string name="title_realm">Område</string>
     <string name="title_use_ip">Bruk lokal IP-adresse i stedet for vertsnavn</string>
     <string name="title_primary_account">Primær (standardkonto)</string>
@@ -712,6 +714,7 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_signature_unconfirmed_from">Meldingssignatur er gyldig, men ikke bekreftet: %1$s</string>
     <string name="title_signature_invalid">Meldings signatur ugyldig</string>
     <string name="title_signature_invalid_reason">Meldingens signatur er ugyldig: %1$s</string>
+    <string name="title_signature_key_missing">Nøkkel mangler</string>
     <string name="title_signature_certificate_invalid">Sertifikatkjeden er ugyldig</string>
     <string name="title_signature_sender">Avsenders adresse</string>
     <string name="title_signature_email">Signaturens adresse</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 213151ca92..9f4f3f45af 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -248,7 +248,6 @@
     <string name="title_advanced_threading">Konversasjonstråder</string>
     <string name="title_advanced_indentation">Venstre/høyre innrykk mottatt/sendt meldinger i samtaler</string>
     <string name="title_advanced_highlight_unread">Merk uleste meldinger</string>
-    <string name="title_advanced_distinguish_contacts">Understreke avsenderen når avsenderen er kjent som lokal \'til\' -kontakt</string>
     <string name="title_advanced_color_stripe">Vis fargestripe</string>
     <string name="title_advanced_avatars">Vis kontakt bilde</string>
     <string name="title_advanced_gravatars">Vis Gravatars</string>
@@ -259,6 +258,8 @@
     <string name="title_advanced_color_value">Lysstyrke</string>
     <string name="title_advanced_color_threshold">Terskelbokstavfarge</string>
     <string name="title_advanced_name_email">Vis navn og e-postadresser</string>
+    <string name="title_advanced_replace_name">Foretrekker et kontaktnavn fremfor et sendt navn</string>
+    <string name="title_advanced_distinguish_contacts">Understreke avsenderen når avsenderen er kjent som lokal \'til\' -kontakt</string>
     <string name="title_advanced_authentication">Vis en advarsel når mottakeren ikke kunne godkjenne meldingen</string>
     <string name="title_advanced_font_size_sender">Skriftstørrelse for avsender</string>
     <string name="title_advanced_font_size_subject">Skriftstørrelse emne</string>
@@ -440,6 +441,7 @@
     <string name="title_port">Portnummer</string>
     <string name="title_user">Brukernavn</string>
     <string name="title_password">Passord</string>
+    <string name="title_use_certificate">Bruk klientsertifikat</string>
     <string name="title_realm">Område</string>
     <string name="title_use_ip">Bruk lokal IP-adresse i stedet for vertsnavn</string>
     <string name="title_primary_account">Primær (standardkonto)</string>
@@ -712,6 +714,7 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_signature_unconfirmed_from">Meldingssignatur er gyldig, men ikke bekreftet: %1$s</string>
     <string name="title_signature_invalid">Meldings signatur ugyldig</string>
     <string name="title_signature_invalid_reason">Meldingens signatur er ugyldig: %1$s</string>
+    <string name="title_signature_key_missing">Nøkkel mangler</string>
     <string name="title_signature_certificate_invalid">Sertifikatkjeden er ugyldig</string>
     <string name="title_signature_sender">Avsenders adresse</string>
     <string name="title_signature_email">Signaturens adresse</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 0e334bbc24..b14f3e630a 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -269,7 +269,6 @@
     <string name="title_advanced_threading">Konwersacje w wątkach</string>
     <string name="title_advanced_indentation">Lewe/prawe wcięcie otrzymane/wysłane wiadomości w rozmowach</string>
     <string name="title_advanced_highlight_unread">Podświetl nieprzeczytane wiadomości</string>
-    <string name="title_advanced_distinguish_contacts">Podkreśl nadawcę, gdy znany jest jako lokalny kontakt „do”</string>
     <string name="title_advanced_color_stripe">Pokaż kolorowy pasek</string>
     <string name="title_advanced_avatars">Pokaż zdjęcia kontaktu</string>
     <string name="title_advanced_gravatars">Pokaż Gravatary</string>
@@ -280,6 +279,8 @@
     <string name="title_advanced_color_value">Jasność</string>
     <string name="title_advanced_color_threshold">Próg koloru czcionki</string>
     <string name="title_advanced_name_email">Pokaż nazwy i adresy e-mail</string>
+    <string name="title_advanced_replace_name">Preferuj nazwę kontaktu nad nazwą wysłaną</string>
+    <string name="title_advanced_distinguish_contacts">Podkreśl nadawcę, gdy znany jest jako lokalny kontakt „do”</string>
     <string name="title_advanced_authentication">Pokaż ostrzeżenie, gdy serwer odbierający nie może uwierzytelnić wiadomości</string>
     <string name="title_advanced_font_size_sender">Rozmiar czcionki nadawcy</string>
     <string name="title_advanced_font_size_subject">Rozmiar czcionki tematu</string>
@@ -432,6 +433,7 @@
     <string name="title_identity_email">Twój adres e-mail</string>
     <string name="title_identity_color_hint">Kolory tożsamości mają pierwszeństwo przed kolorami folderów i kont</string>
     <string name="title_advanced_sender">Zezwól na edycję adresu nadawcy</string>
+    <string name="title_advanced_sender_regex">Regex, aby dopasować nazwę użytkownika dla przychodzących adresów e-mail</string>
     <string name="title_identity_reply_to">Odpowiedz na adres</string>
     <string name="title_identity_receipt">Domyślnie żądaj potwierdzenia odbioru/odczytu</string>
     <string name="title_identity_use_ip_hint">W przypadku „nieprawidłowego powitania”, „wymaga prawidłowego adresu” lub podobnego błędu spróbuj zmienić to ustawienie</string>
@@ -656,6 +658,7 @@
     <string name="title_download_message">Pobieranie &#8230;</string>
     <string name="title_compose">Napisz</string>
     <string name="title_submitter">Wysłane przez:</string>
+    <string name="title_delivered_to">Dostarczone do:</string>
     <string name="title_from">Od:</string>
     <string name="title_to">Do:</string>
     <string name="title_reply_to">Odpisz do:</string>
@@ -722,6 +725,7 @@
     <string name="title_resync">Resynchronizuj</string>
     <string name="title_no_openpgp">Nie znaleziono OpenKeychain</string>
     <string name="title_user_interaction">Przenoszenie do OpenKeychain</string>
+    <string name="title_signed_data">Sprawdź podpis, aby wyświetlić tekst wiadomości</string>
     <string name="title_not_encrypted">Wiadomość nie jest podpisana lub zaszyfrowana</string>
     <string name="title_reset_sign_key">Resetuj klucz podpisu</string>
     <string name="title_signature_none">Wiadomość niepodpisana</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5ae6ed0762..2fb1c58b2d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -242,7 +242,6 @@
     <string name="title_advanced_threading">Encadeamento de conversas</string>
     <string name="title_advanced_indentation">Indentatação esquerda/direita para mensagens recebido/enviado em conversas</string>
     <string name="title_advanced_highlight_unread">Destacar mensagens não lidas</string>
-    <string name="title_advanced_distinguish_contacts">Sublinhar o remetente quando o remetente é conhecido como contato local \'para\'</string>
     <string name="title_advanced_color_stripe">Mostrar faixa de cores</string>
     <string name="title_advanced_avatars">Mostrar fotos de contatos</string>
     <string name="title_advanced_gravatars">Mostrar Gravatares</string>
@@ -253,6 +252,7 @@
     <string name="title_advanced_color_value">Brilho</string>
     <string name="title_advanced_color_threshold">Limite da cor da carta</string>
     <string name="title_advanced_name_email">Mostrar os nomes e endereços de e-mail</string>
+    <string name="title_advanced_distinguish_contacts">Sublinhar o remetente quando o remetente é conhecido como contato local \'para\'</string>
     <string name="title_advanced_authentication">Mostrar um aviso quando o servidor de recebimento não puder autenticar a mensagem</string>
     <string name="title_advanced_font_size_sender">Remetente do tamanho da fonte</string>
     <string name="title_advanced_font_size_subject">Assunto do tamanho da fonte</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 2bb5f24126..80c326d02b 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -258,7 +258,6 @@
     <string name="title_advanced_threading">Aranjare mesaje în conversație</string>
     <string name="title_advanced_indentation">Aliniere mesaje primite/trimise în stânga/dreapta în conversații</string>
     <string name="title_advanced_highlight_unread">Evidențiază mesajele necitite</string>
-    <string name="title_advanced_distinguish_contacts">Subliniază expeditorul atunci când este cunoscut drept un contact `către`</string>
     <string name="title_advanced_color_stripe">Arată banda de culori</string>
     <string name="title_advanced_avatars">Arată pozele contactelor</string>
     <string name="title_advanced_gravatars">Arată iconițe de pe Gravatar</string>
@@ -269,6 +268,7 @@
     <string name="title_advanced_color_value">Luminozitate</string>
     <string name="title_advanced_color_threshold">Limită culoare literă</string>
     <string name="title_advanced_name_email">Arată nume și adrese de e-mail</string>
+    <string name="title_advanced_distinguish_contacts">Subliniază expeditorul atunci când este cunoscut drept un contact `către`</string>
     <string name="title_advanced_authentication">Arată o avertizare atunci când serverul destinatar nu a putut autentifica mesajul</string>
     <string name="title_advanced_font_size_sender">Mărime font expeditor</string>
     <string name="title_advanced_font_size_subject">Mărime font subiect</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index c64ecf1578..1bfd09b790 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -270,7 +270,6 @@
     <string name="title_advanced_threading">Связанные диалоги</string>
     <string name="title_advanced_indentation">Левый/правый отступ для полученных/отправленных сообщений в диалогах</string>
     <string name="title_advanced_highlight_unread">Выделять непрочитанные сообщения</string>
-    <string name="title_advanced_distinguish_contacts">Подчёркивать отправителя, если он известен как локальный контакт «кому»</string>
     <string name="title_advanced_color_stripe">Показать цветовую полосу</string>
     <string name="title_advanced_avatars">Показывать фотографии контакта</string>
     <string name="title_advanced_gravatars">Показывать Граватары</string>
@@ -281,6 +280,8 @@
     <string name="title_advanced_color_value">Яркость</string>
     <string name="title_advanced_color_threshold">Порог яркости отображения букв</string>
     <string name="title_advanced_name_email">Показывать имена и адреса электронной почты</string>
+    <string name="title_advanced_replace_name">Предпочитать имя контакта вместо имени отправителя</string>
+    <string name="title_advanced_distinguish_contacts">Подчёркивать отправителя, если он известен как локальный контакт «кому»</string>
     <string name="title_advanced_authentication">Показывать предупреждение, когда сервер не может аутентифицировать сообщение</string>
     <string name="title_advanced_font_size_sender">Размера шрифта поля \"Отправитель\"</string>
     <string name="title_advanced_font_size_subject">Размера шрифта поля \"Тема\"</string>
@@ -462,6 +463,7 @@
     <string name="title_port">Номер порта</string>
     <string name="title_user">Имя пользователя</string>
     <string name="title_password">Пароль</string>
+    <string name="title_use_certificate">Использовать сертификат клиента</string>
     <string name="title_realm">Реалм</string>
     <string name="title_use_ip">Использовать локальный IP-адрес вместо имени хоста</string>
     <string name="title_primary_account">Основная (учётная запись по умолчанию)</string>
@@ -735,6 +737,7 @@
     <string name="title_signature_unconfirmed_from">Подпись сообщения верна, но не подтверждена: %1$s</string>
     <string name="title_signature_invalid">Подпись сообщения недействительна</string>
     <string name="title_signature_invalid_reason">Некорректная подпись сообщения: %1$s</string>
+    <string name="title_signature_key_missing">Ключ отсутствует</string>
     <string name="title_signature_certificate_invalid">Некорректная цепочка сертификатов</string>
     <string name="title_signature_sender">Адрес отправителя</string>
     <string name="title_signature_email">Адрес подписи</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 52e8f30ec8..8ed4498afe 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -248,7 +248,6 @@
     <string name="title_advanced_threading">İletişim iş parçacığı</string>
     <string name="title_advanced_indentation">Sohbetlerde alınan/gönderilen mesajları sola/sağa girintile</string>
     <string name="title_advanced_highlight_unread">Okunmamış iletileri vurgula</string>
-    <string name="title_advanced_distinguish_contacts">Gönderen yerel \'alıcı\' kişisi olarak biliniyorsa gönderenin altını çiz</string>
     <string name="title_advanced_color_stripe">Renk şeridini göster</string>
     <string name="title_advanced_avatars">Kişi fotoğraflarını göster</string>
     <string name="title_advanced_gravatars">Gravatar\'ları göster</string>
@@ -259,6 +258,8 @@
     <string name="title_advanced_color_value">Parlaklık</string>
     <string name="title_advanced_color_threshold">Eşik harf rengi</string>
     <string name="title_advanced_name_email">Adları ve e-posta adreslarini göster</string>
+    <string name="title_advanced_replace_name">Gönderilen ad yerine kişi adı tercih et</string>
+    <string name="title_advanced_distinguish_contacts">Gönderen yerel \'alıcı\' kişisi olarak biliniyorsa gönderenin altını çiz</string>
     <string name="title_advanced_authentication">Alıcı sunucu iletinin kimliğini doğrulayamadığında bir uyarı göster</string>
     <string name="title_advanced_font_size_sender">Gönderen yazı boyutu</string>
     <string name="title_advanced_font_size_subject">Konu yazı boyutu</string>
@@ -440,6 +441,7 @@
     <string name="title_port">Port numarası</string>
     <string name="title_user">Kullanıcı adı</string>
     <string name="title_password">Parola</string>
+    <string name="title_use_certificate">İstemci sertifikası kullan</string>
     <string name="title_realm">Bölge</string>
     <string name="title_use_ip">Ana bilgisayar adı yerine yerel IP adresini kullan</string>
     <string name="title_primary_account">Birincil (varsayılan hesap)</string>
@@ -636,6 +638,7 @@
     <string name="title_download_message">İndiriliyor &#8230;</string>
     <string name="title_compose">Eposta Oluştur</string>
     <string name="title_submitter">Gönderen:</string>
+    <string name="title_delivered_to">Teslim edilen:</string>
     <string name="title_from">Gönderen:</string>
     <string name="title_to">Alıcı:</string>
     <string name="title_reply_to">Yanıt adresi:</string>
@@ -702,6 +705,7 @@
     <string name="title_resync">Yeniden eşzamanla</string>
     <string name="title_no_openpgp">OpenKeychain bulunamadı</string>
     <string name="title_user_interaction">OpenKeychain\'e gönderiliyor</string>
+    <string name="title_signed_data">Mesaj metnini göstermek için imzayı doğrula</string>
     <string name="title_not_encrypted">Mesaj imzalı veya şifreli değil</string>
     <string name="title_reset_sign_key">İmzalama anahtarını sıfırla</string>
     <string name="title_signature_none">İleti imzalı değil</string>
@@ -711,6 +715,7 @@
     <string name="title_signature_unconfirmed_from">Mesaj imzası geçerli ancak doğrulanmamış: %1$s</string>
     <string name="title_signature_invalid">İleti imzası geçersiz</string>
     <string name="title_signature_invalid_reason">Mesaj imzası geçersiz: %1$s</string>
+    <string name="title_signature_key_missing">Anahtar eksik</string>
     <string name="title_signature_certificate_invalid">Sertifika zinciri geçersiz</string>
     <string name="title_signature_sender">Gönderenin adresi</string>
     <string name="title_signature_email">İmzanın adresi</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ee8c6dee9e..364ba05618 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -235,7 +235,6 @@
     <string name="title_advanced_threading">会话线程</string>
     <string name="title_advanced_indentation">左/右缩进接收/发送的消息</string>
     <string name="title_advanced_highlight_unread">高亮未读消息</string>
-    <string name="title_advanced_distinguish_contacts">下划线发件人(当其为本地发送给的联系人时)</string>
     <string name="title_advanced_color_stripe">头像前显示色彩条纹</string>
     <string name="title_advanced_avatars">显示联系人头像</string>
     <string name="title_advanced_gravatars">显示Gravatars头像</string>
@@ -246,6 +245,8 @@
     <string name="title_advanced_color_value">亮度</string>
     <string name="title_advanced_color_threshold">阈值字母颜色</string>
     <string name="title_advanced_name_email">显示名称和电子邮件地址</string>
+    <string name="title_advanced_replace_name">较之发送名称，更倾向联系人名称</string>
+    <string name="title_advanced_distinguish_contacts">下划线发件人(当其为本地发送给的联系人时)</string>
     <string name="title_advanced_authentication">当接收服务器无法验证消息时显示警告</string>
     <string name="title_advanced_font_size_sender">发件人字体大小</string>
     <string name="title_advanced_font_size_subject">邮件主题字体大小</string>
@@ -427,6 +428,7 @@
     <string name="title_port">端口号</string>
     <string name="title_user">用户名</string>
     <string name="title_password">密码</string>
+    <string name="title_use_certificate">使用客户端证书</string>
     <string name="title_realm">移动数据库</string>
     <string name="title_use_ip">使用本地IP地址而非主机名</string>
     <string name="title_primary_account">主账户 (默认帐户)</string>