diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index ced5aff23..10c69b5e9 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -375,6 +375,7 @@
   <string name="purge_key">Изтриване на ключа</string>
   <string name="purge_key_desc_part1">Сигурни ли сте, че искате да изтриете този ключ?</string>
   <string name="purge_key_desc_part2">След това той ще бъде необратимо приет за грешен и повече няма да можете да създавате сесии с него.</string>
+  <string name="error_no_keys_to_trust_server_error">Няма ключове, които могат да бъдат използвани за този контакт.\nИзтеглянето на нови ключове от сървъра беше неуспешно. Възможно е да има проблем със сървъра на контактите Ви.</string>
   <string name="error_no_keys_to_trust">Няма ключове, които могат да бъдат използвани за този контакт. Ако сте изчистили някои от ключовете му, то той трябва да създаде нови.</string>
   <string name="error_trustkeys_title">Грешка</string>
   <string name="fetching_history_from_server">Получаване на историята от сървъра</string>
@@ -488,7 +489,7 @@
   <string name="download_failed_could_not_connect">Неуспешно сваляне: Неуспешна връзка със сървъра</string>
   <string name="pref_use_white_background">Използване на бял фон</string>
   <string name="pref_use_white_background_summary">Показване на получените съобщения с черен текст на бял фон</string>
-  <string name="account_status_tor_unavailable">Мрежата на TOR не е достъпна</string>
+  <string name="account_status_tor_unavailable">Мрежата на Тор е недостъпна</string>
   <string name="server_info_broken">Повредено</string>
   <string name="pref_presence_settings">Настройки за присъствието</string>
   <string name="pref_away_when_screen_off">Отсъстващ, когато екранът е изключен</string>
@@ -508,8 +509,8 @@
   <string name="verified_omemo_key_with_certificate">Ключът за OMEMO беше потвърден със сертификат!</string>
   <string name="device_does_not_support_certificates">Устройството Ви не поддържа избраните клиентски сертификати!</string>
   <string name="pref_connection_options">Настройки за връзката</string>
-  <string name="pref_use_tor">Свързване през Tor</string>
-  <string name="pref_use_tor_summary">Всички връзки да минават през мрежата на TOR. Изисква Orbot</string>
+  <string name="pref_use_tor">Свързване през Тор</string>
+  <string name="pref_use_tor_summary">Всички връзки да минават през мрежата на Тор. Изисква Орбот</string>
   <string name="account_settings_hostname">Име на сървър</string>
   <string name="account_settings_port">Порт</string>
   <string name="hostname_or_onion">Адрес на сървър или .onion</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 050803ce5..b1a6661e6 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -9,6 +9,7 @@
   <string name="action_secure">Zabezpečená konverzace</string>
   <string name="action_add_account">Přidat účet</string>
   <string name="action_edit_contact">Upravit jméno</string>
+  <string name="action_add_phone_book">Přidat do adresáře</string>
   <string name="action_delete_contact">Smazat ze seznamu</string>
   <string name="action_block_contact">Zablokovat kontakt</string>
   <string name="action_unblock_contact">Odblokovat kontakt</string>
@@ -172,6 +173,7 @@
   <string name="passwords_do_not_match">Hesla nesouhlasí</string>
   <string name="invalid_jid">Toto není platné Jabber ID</string>
   <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
+  <string name="add_phone_book_text">Chcete přidat %s do svého adresáře?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">volný pro chat</string>
   <string name="contact_status_away">pryč</string>
@@ -220,12 +222,14 @@
   <string name="conferences">Konference</string>
   <string name="search">Hledat</string>
   <string name="create_contact">Vytvořit kontakt</string>
+  <string name="enter_contact">Vložit kontakt</string>
   <string name="join_conference">Připojit ke konferenci</string>
   <string name="delete_contact">Smazat kontakt</string>
   <string name="view_contact_details">Zobrazit detaily kontaktu</string>
   <string name="block_contact">Zablokovat kontakt</string>
   <string name="unblock_contact">Odblokovat kontakt</string>
   <string name="create">Vytvořit</string>
+  <string name="select">Vybrat</string>
   <string name="contact_already_exists">Kontakt již existuje</string>
   <string name="join">Vstoupit</string>
   <string name="conference_address">Adresa konference</string>
@@ -371,6 +375,7 @@
   <string name="purge_key">Vymazat klíč</string>
   <string name="purge_key_desc_part1">Opravdu si přejete vymazat tento klíč?</string>
   <string name="purge_key_desc_part2">Bude neodvolatelně pokládán jako kompromitovaný a již s jeho pomocí nebudete moci nikdy spustit jiné sezení.</string>
+  <string name="error_no_keys_to_trust_server_error">Pro tento kontakt nejsou dostupné žádné použitelné klíče.\nNahrání klíčů ze serveru nebylo úspěšné. Možná je něco špatně se serverem vašeho kontaktu.</string>
   <string name="error_no_keys_to_trust">Pro tento kontakt nejsou dostupné žádné použitelné klíče. Pokud jste smazali jakýkoliv z jeho klíčů bude třeba vygenerovat nové.</string>
   <string name="error_trustkeys_title">Chyba</string>
   <string name="fetching_history_from_server">Načíst historii ze serveru</string>
@@ -486,12 +491,13 @@
   <string name="download_failed_could_not_connect">Stahování selhalo: Nelze se připojit k hostu</string>
   <string name="pref_use_white_background">Použít bílé pozadí</string>
   <string name="pref_use_white_background_summary">Zobrazovat přijaté zprávy jako černý text na bílém pozadí</string>
-  <string name="account_status_tor_unavailable">TOR síť nedostupná</string>
+  <string name="account_status_tor_unavailable">Tor síť není dostupná</string>
   <string name="server_info_broken">Rozbité</string>
   <string name="pref_presence_settings">Nastavení přítomnosti</string>
   <string name="pref_away_when_screen_off">Pryč při vypnuté obrazovce</string>
   <string name="pref_away_when_screen_off_summary">Při vypnuté obrazovce označí váš stav jako pryč</string>
   <string name="pref_xa_on_silent_mode">Nedostupný při vypnutém zvuku</string>
+  <string name="pref_xa_on_silent_mode_summary">Při tichém módu označí váš stav jako nedostupný</string>
   <string name="action_add_account_with_certificate">Přidat účet s certifikátem</string>
   <string name="unable_to_parse_certificate">Nelze načíst certifikát</string>
   <string name="authenticate_with_certificate">Nechat prázdné pro ověření s certifikátem</string>
@@ -506,7 +512,7 @@
   <string name="device_does_not_support_certificates">Tento přístroj nepodporuje výběr klientského certifikátu!</string>
   <string name="pref_connection_options">Možnosti připojení</string>
   <string name="pref_use_tor">Připojit přes Tor</string>
-  <string name="pref_use_tor_summary">Posílat všechna spojení pomocí sítě TOR. Vyžaduje Orbot</string>
+  <string name="pref_use_tor_summary">Vedení všech připojení po Tor síti vyžaduje aplikaci Orbot</string>
   <string name="account_settings_hostname">Hostname</string>
   <string name="account_settings_port">Port</string>
   <string name="hostname_or_onion">Server- nebo .onion-adresa</string>
@@ -523,4 +529,24 @@
   <string name="no_storage_permission">Conversations vyžaduje přístup k externímu úložišti</string>
   <string name="sync_with_contacts">Synchronizovat s kontakty</string>
   <string name="sync_with_contacts_long">Aplikace Conversations by ráda porovnala váš XMPP seznam s vašimi kontakty, aby mohla zobrazit plná jména a avatary.\n\nConversations načte a porovná kontakty pouze lokálně, bez jejich nahrávání na server.\n\nNyní budete dotázáni na udělení práv pro přístup k seznamu kontaktů.</string>
+  <string name="certificate_information">Informace certifikátu</string>
+  <string name="certificate_subject">Předmět</string>
+  <string name="certificate_issuer">Vydavatel</string>
+  <string name="certificate_cn">Jméno</string>
+  <string name="certificate_o">Organizace</string>
+  <string name="certificate_sha1">SHA1</string>
+  <string name="certicate_info_not_available">(Nedostupné)</string>
+  <string name="certificate_not_found">Certifikát nenalezen</string>
+  <string name="notify_on_all_messages">Upozorňovat na všechny zprávy</string>
+  <string name="notify_only_when_highlighted">Upozorňovat pouze pokud zvýrazněno</string>
+  <string name="notify_never">Upozornění vypnuta</string>
+  <string name="notify_paused">Upozornění pozastavena</string>
+  <string name="pref_picture_compression">Komprimovat obrázky</string>
+  <string name="pref_picture_compression_summary">Upravené a komprimované obrázky</string>
+  <string name="always">Vždy</string>
+  <string name="automatically">Automaticky</string>
+  <string name="battery_optimizations_enabled">Povolena optimalizace využití baterie</string>
+  <string name="battery_optimizations_enabled_explained">Tento přístroj provádí agresivní optimalizace využití baterie pro konverzace. Ty mohou způsobit zpoždění upozornění nebo ztrátu zpráv.\nJe doporučeno tyto vypnout.</string>
+  <string name="battery_optimizations_enabled_dialog">Tento přístroj provádí agresivní optimalizace využití baterie pro konverzace. Ty mohou způsobit zpoždění upozornění nebo ztrátu zpráv.\nnyní budete vyzváni k jejich vypnutí.</string>
+  <string name="disable">Vypnout</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index fefd900e9..187e19b75 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -375,6 +375,7 @@
   <string name="purge_key">Schlüssel löschen</string>
   <string name="purge_key_desc_part1">Soll dieser Schlüssel gelöscht werden?</string>
   <string name="purge_key_desc_part2">Dieser Vorgang kann nicht rückgängig gemacht werden und es kann nie wieder eine Verbindung mit diesem Schlüssel hergestellt werden.</string>
+  <string name="error_no_keys_to_trust_server_error">Für dieses Kontakt sind keine benutzbaren Schlüssel verfügbar.\nNeue Schlüssel vom Server herunterzuladen war nicht erfolgreich. Vielleicht stimmt etwas mit dem Server deines Kontakts nicht.</string>
   <string name="error_no_keys_to_trust">Es sind keine Schlüssel für diesen Kontakt verfügbar. Falls sie gelöscht wurden, müssen diese neu erstellt werden.</string>
   <string name="error_trustkeys_title">Fehler</string>
   <string name="fetching_history_from_server">Lade Chatverlauf…</string>
@@ -488,7 +489,7 @@
   <string name="download_failed_could_not_connect">Download fehlgeschlagen: keine Verbindung zum Host</string>
   <string name="pref_use_white_background">Weißen Hintergrund benutzen</string>
   <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string>
-  <string name="account_status_tor_unavailable">TOR-Netzwerk nicht verfügbar</string>
+  <string name="account_status_tor_unavailable">Tor-Netzwerk nicht verfügbar</string>
   <string name="server_info_broken">Fehlerhaft</string>
   <string name="pref_presence_settings">Status Einstellungen</string>
   <string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string>
@@ -509,7 +510,7 @@
   <string name="device_does_not_support_certificates">Dein Gerät unterstützt das Auswählen von Client-Zertifikaten nicht!</string>
   <string name="pref_connection_options">Verbindungs-Optionen</string>
   <string name="pref_use_tor">Über TOR verbinden</string>
-  <string name="pref_use_tor_summary">Alle Verbindungen über das TOR-Netzwerk tunneln. Benötigt Orbot</string>
+  <string name="pref_use_tor_summary">Alle Verbindungen über das Tor-Netzwerk tunneln. Benötigt Orbot</string>
   <string name="account_settings_hostname">Hostname</string>
   <string name="account_settings_port">Port</string>
   <string name="hostname_or_onion">Server- oder .onion-Adresse</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 7365261f6..9ca14f40b 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -9,6 +9,7 @@
   <string name="action_secure">Conversación segura</string>
   <string name="action_add_account">Añadir cuenta</string>
   <string name="action_edit_contact">Editar contacto</string>
+  <string name="action_add_phone_book">Añadir a contactos</string>
   <string name="action_delete_contact">Eliminar contacto de la lista</string>
   <string name="action_block_contact">Bloquear contacto</string>
   <string name="action_unblock_contact">Desbloquear contacto</string>
@@ -172,6 +173,7 @@
   <string name="passwords_do_not_match">Las contraseñas no coinciden</string>
   <string name="invalid_jid">El identificador no es un identificador Jabber válido</string>
   <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
+  <string name="add_phone_book_text">¿Quieres añadir a %s a tus contactos?</string>
   <string name="contact_status_online">Disponible</string>
   <string name="contact_status_free_to_chat">Hablador</string>
   <string name="contact_status_away">Ausente</string>
@@ -220,12 +222,14 @@
   <string name="conferences">Conversación Grupo</string>
   <string name="search">Buscar</string>
   <string name="create_contact">Crear Contacto</string>
+  <string name="enter_contact">Introducir contacto</string>
   <string name="join_conference">Unirse a Conversación en grupo</string>
   <string name="delete_contact">Eliminar Contacto</string>
   <string name="view_contact_details">Ver detalles del contacto</string>
   <string name="block_contact">Bloquear contacto</string>
   <string name="unblock_contact">Desbloquear contacto</string>
   <string name="create">Crear</string>
+  <string name="select">Seleccionar</string>
   <string name="contact_already_exists">El contacto ya existe</string>
   <string name="join">Unirse</string>
   <string name="conference_address">Dirección</string>
@@ -484,12 +488,12 @@
   <string name="download_failed_could_not_connect">Error al descargar: No se ha podido conectar con el servidor</string>
   <string name="pref_use_white_background">Usar fondo blanco</string>
   <string name="pref_use_white_background_summary">Mostrar mensajes recibidos en texto negro con fondo blanco</string>
-  <string name="account_status_tor_unavailable">Red Tor no disponible</string>
   <string name="server_info_broken">Error</string>
   <string name="pref_presence_settings">Opciones de presencia</string>
   <string name="pref_away_when_screen_off">Ausente con pantalla apagada</string>
   <string name="pref_away_when_screen_off_summary">Cambia tu estado a ausente cuando la pantalla está apagada</string>
   <string name="pref_xa_on_silent_mode">No disponible en modo silencio</string>
+  <string name="pref_xa_on_silent_mode_summary">Cambiar el recurso a no disponible cuando el dispositivo esté en modo silencio</string>
   <string name="action_add_account_with_certificate">Añadir cuenta con certificado</string>
   <string name="unable_to_parse_certificate">No se ha podido leer el certificado</string>
   <string name="authenticate_with_certificate">Dejar vacío para autenticar certificado w/ </string>
@@ -504,7 +508,6 @@
   <string name="device_does_not_support_certificates">¡Tu dispositivo no soporta la elección de certificados de cliente!</string>
   <string name="pref_connection_options">Opciones de conexión</string>
   <string name="pref_use_tor">Conectar via Tor</string>
-  <string name="pref_use_tor_summary">Todas las conexiones se realizan a través de la red TOR. Requiere Orbot</string>
   <string name="account_settings_hostname">Hostname</string>
   <string name="account_settings_port">Puerto</string>
   <string name="hostname_or_onion">Server- or .onion-Address</string>
@@ -520,4 +523,19 @@
   <string name="no_storage_permission">Conversations necesita acceder al almacenamiento externo</string>
   <string name="sync_with_contacts">Sincronizar contactos</string>
   <string name="sync_with_contacts_long">Conversations quiere cruzar tu lista de contactos de XMPP con tus contactos del móvil para mostrar sus nombres completos y sus fotos de perfil.\n\nConversations solo leerá tus contactos y los cruzará localmente sin subirlos a tu servidor.\n\nEl sistema te preguntará para conceder los permisos de acceso a tus contactos del móvil.</string>
+  <string name="certificate_information">Información de certificados</string>
+  <string name="certificate_subject">Asunto</string>
+  <string name="certificate_issuer">Editor</string>
+  <string name="certificate_cn">Nombre</string>
+  <string name="certificate_o">Organización</string>
+  <string name="certificate_sha1">SHA1</string>
+  <string name="certicate_info_not_available">(No disponible)</string>
+  <string name="certificate_not_found">Certificado no encontrado</string>
+  <string name="notify_on_all_messages">Notificar para todos los mensajes</string>
+  <string name="notify_only_when_highlighted">Notificar solo cuando se recibe un mensjae resaltado</string>
+  <string name="notify_never">Notificaciones deshabilitadas</string>
+  <string name="notify_paused">Notificaciones pausadas</string>
+  <string name="pref_picture_compression">Comprimir imagenes</string>
+  <string name="pref_picture_compression_summary">Redimiensionar y comprimir imágenes</string>
+  <string name="always">Siempre</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 144189259..0007323bf 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -484,7 +484,6 @@
   <string name="download_failed_could_not_connect">Deskargak huts egin du: ezin izan da ostalarira konektatu</string>
   <string name="pref_use_white_background">Atzeko-planoan kolore zuria erabili</string>
   <string name="pref_use_white_background_summary">Jasotako mezuak testu beltza atzeko-plano zuri baten gainean bezala erakutsi</string>
-  <string name="account_status_tor_unavailable">TOR sarea ez dago eskuragarri</string>
   <string name="server_info_broken">Hondatuta</string>
   <string name="pref_presence_settings">Presentzia ezarpenak</string>
   <string name="pref_away_when_screen_off">Urrun pantaila itzalita dagoenean</string>
@@ -504,7 +503,6 @@
   <string name="device_does_not_support_certificates">Zure gailuak ez du bezero ziurtagiriak aukeratzea onartzen!</string>
   <string name="pref_connection_options">Konexioaren aukerak</string>
   <string name="pref_use_tor">Tor bidez konektatu</string>
-  <string name="pref_use_tor_summary">Konexio guztiak TOR sarean zehar igaro. Orbot behar du</string>
   <string name="account_settings_hostname">Ostalariaren izena</string>
   <string name="account_settings_port">Ataka</string>
   <string name="hostname_or_onion">Zerbitzari- edo .onion-helbidea</string>
diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml
new file mode 100644
index 000000000..c757504ac
--- /dev/null
+++ b/src/main/res/values-fa-rIR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 5f75834e0..b511bbe44 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -484,7 +484,6 @@
   <string name="download_failed_could_not_connect">Échec du téléchargement : impossible de se connecter à l\'hôte</string>
   <string name="pref_use_white_background">Utiliser un fond blanc</string>
   <string name="pref_use_white_background_summary">Afficher les messages reçus en texte noir sur fond blanc.</string>
-  <string name="account_status_tor_unavailable">Réseau Tor indisponible</string>
   <string name="server_info_broken">Détraqué</string>
   <string name="pref_presence_settings">Options de présence</string>
   <string name="pref_away_when_screen_off">Absent quand l\'écran est éteint</string>
@@ -504,7 +503,6 @@
   <string name="device_does_not_support_certificates">Votre appareil ne supporte pas la sélection de certificats client !</string>
   <string name="pref_connection_options">Options de connexion</string>
   <string name="pref_use_tor">Connection via Tor</string>
-  <string name="pref_use_tor_summary">Faire transiter toutes les connexions sur le réseau Tor. Requiert Orbot</string>
   <string name="account_settings_hostname">Nom d\'hôte</string>
   <string name="account_settings_port">Port</string>
   <string name="hostname_or_onion">Adresse du serveur ou .onion</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index c83c7a8a2..bb6416a87 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -479,7 +479,6 @@
   <string name="download_failed_could_not_connect">Download fallito: Impossibile connettersi all\'host</string>
   <string name="pref_use_white_background">Usa sfondo bianco</string>
   <string name="pref_use_white_background_summary">Mostra i messaggi ricevuti con testo nero su sfondo bianco</string>
-  <string name="account_status_tor_unavailable">Rete TOR non disponibile</string>
   <string name="server_info_broken">Rotto</string>
   <string name="pref_presence_settings">Impostazioni presenza</string>
   <string name="pref_xa_on_silent_mode">Non disponibile in modalità silenzioso</string>
@@ -497,7 +496,6 @@
   <string name="device_does_not_support_certificates">Il tuo dispositivo non supporta la selezione di certificati utente!</string>
   <string name="pref_connection_options">Opzioni di connessione</string>
   <string name="pref_use_tor">Connettiti via Tor</string>
-  <string name="pref_use_tor_summary">Incanala tutte le connessioni tramite la rete TOR. Richiede Orbot</string>
   <string name="account_settings_hostname">Nome host</string>
   <string name="account_settings_port">Porta</string>
   <string name="hostname_or_onion">Indirizzo server o .onion</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 26283bbec..9348a88e8 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -476,7 +476,6 @@
   <string name="download_failed_could_not_connect">ההורדה נכשלה: נכשל ביצוע חיבור לשרת</string>
   <string name="pref_use_white_background">השתמש ברקע לבן</string>
   <string name="pref_use_white_background_summary">הראה הודעות שהתקבלו בטקסט שחור על גבי רקע לבען</string>
-  <string name="account_status_tor_unavailable">רשת TOR לא זמינה</string>
   <string name="server_info_broken">לא עובד</string>
   <string name="pref_presence_settings">הגדרות נוכחות Presence</string>
   <string name="pref_away_when_screen_off">העבר למצב \"לא נמצא\" כאשר המסך כבוי</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 976fecddd..1f8479de6 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -9,6 +9,7 @@
   <string name="action_secure">安全に会話</string>
   <string name="action_add_account">アカウントを追加</string>
   <string name="action_edit_contact">名前の編集</string>
+  <string name="action_add_phone_book">アドレス帳に追加</string>
   <string name="action_delete_contact">名簿から削除</string>
   <string name="action_block_contact">連絡先をブロック</string>
   <string name="action_unblock_contact">連絡先のブロックを解除</string>
@@ -172,6 +173,7 @@
   <string name="passwords_do_not_match">パスワードが一致しません</string>
   <string name="invalid_jid">これは有効な Jabber ID ではありません</string>
   <string name="error_out_of_memory">メモリ不足です。画像が大きすぎます</string>
+  <string name="add_phone_book_text">%s をお使いのアドレス帳に追加しますか?</string>
   <string name="contact_status_online">オンライン</string>
   <string name="contact_status_free_to_chat">自由にチャットできます</string>
   <string name="contact_status_away">離席中</string>
@@ -220,12 +222,14 @@
   <string name="conferences">会議</string>
   <string name="search">検索</string>
   <string name="create_contact">連絡先を作成</string>
+  <string name="enter_contact">連絡先を入力</string>
   <string name="join_conference">会議に参加</string>
   <string name="delete_contact">連絡先を削除</string>
   <string name="view_contact_details">連絡先の詳細を表示</string>
   <string name="block_contact">連絡先をブロック</string>
   <string name="unblock_contact">連絡先のブロックを解除</string>
   <string name="create">作成</string>
+  <string name="select">選択</string>
   <string name="contact_already_exists">連絡先はすでに存在します</string>
   <string name="join">参加</string>
   <string name="conference_address">会議アドレス</string>
@@ -371,6 +375,7 @@
   <string name="purge_key">鍵を消去</string>
   <string name="purge_key_desc_part1">この鍵を消去してもよろしいですか?</string>
   <string name="purge_key_desc_part2">これは不可逆的に侵害とみなされ、あなたは再びそのセッションを構築することはできません。</string>
+  <string name="error_no_keys_to_trust_server_error">この連絡先で利用可能な鍵がありません。\nサーバーから新しい鍵の取得に失敗しました。おそらく、お使いの連絡先サーバーに何か問題があります。</string>
   <string name="error_no_keys_to_trust">この連絡先で利用可能な鍵はありません。あなたがその鍵を消去している場合は、新しいものを生成してもらう必要があります。</string>
   <string name="error_trustkeys_title">エラー</string>
   <string name="fetching_history_from_server">サーバーから履歴を取得中</string>
@@ -482,12 +487,13 @@
   <string name="download_failed_could_not_connect">ダウンロードに失敗しました: ホストに接続できませんでした</string>
   <string name="pref_use_white_background">白い背景を使用する</string>
   <string name="pref_use_white_background_summary">白地に黒の文字で、受け取ったメッセージを表示します</string>
-  <string name="account_status_tor_unavailable">TOR ネットワークは利用できません</string>
+  <string name="account_status_tor_unavailable">Tor ネットワークが利用できません</string>
   <string name="server_info_broken">壊れています</string>
   <string name="pref_presence_settings">参加設定</string>
   <string name="pref_away_when_screen_off">画面がオフのときは離席</string>
   <string name="pref_away_when_screen_off_summary">画面がオフになっているとき、リソースを離席としてマークします</string>
   <string name="pref_xa_on_silent_mode">サイレントモード時は利用不可</string>
+  <string name="pref_xa_on_silent_mode_summary">デバイスがサイレントモードのとき、リソースが利用不可としてマークします</string>
   <string name="action_add_account_with_certificate">アカウントに証明書を追加</string>
   <string name="unable_to_parse_certificate">証明書を解析できません</string>
   <string name="authenticate_with_certificate">空にすると、証明書で認証します</string>
@@ -502,7 +508,7 @@
   <string name="device_does_not_support_certificates">お使いのデバイスはクライアント証明書の選択をサポートしていません!</string>
   <string name="pref_connection_options">接続オプション</string>
   <string name="pref_use_tor">Tor 経由で接続</string>
-  <string name="pref_use_tor_summary">TOR ネットワークを介してすべての接続をトンネルします。 Orbot が必要です</string>
+  <string name="pref_use_tor_summary">Tor ネットワークを介してすべての接続をトンネルします。 Orbot が必要です</string>
   <string name="account_settings_hostname">ホスト名</string>
   <string name="account_settings_port">ポート</string>
   <string name="hostname_or_onion">サーバーまたは .onion アドレス</string>
@@ -517,4 +523,24 @@
   <string name="no_storage_permission">Conversations は外部ストレージにアクセスが必要です</string>
   <string name="sync_with_contacts">連絡先と同期</string>
   <string name="sync_with_contacts_long">Conversations はフルネームやアバターを表示するために、連絡先と XMPP 名簿と一致するようにしたいです。\n\nConversations は、サーバーにアップロードすることはなく、ローカルで連絡先を読んで一致させるだけです。\n\n今、連絡先へのアクセス許可を付与するように求められます。</string>
+  <string name="certificate_information">証明書情報</string>
+  <string name="certificate_subject">表題</string>
+  <string name="certificate_issuer">発行者</string>
+  <string name="certificate_cn">一般名称</string>
+  <string name="certificate_o">組織</string>
+  <string name="certificate_sha1">SHA1</string>
+  <string name="certicate_info_not_available">(利用不可)</string>
+  <string name="certificate_not_found">証明書がありません</string>
+  <string name="notify_on_all_messages">すべてのメッセージで通知</string>
+  <string name="notify_only_when_highlighted">ハイライトされたときにのみ通知</string>
+  <string name="notify_never">通知は無効</string>
+  <string name="notify_paused">通知は一時停止</string>
+  <string name="pref_picture_compression">写真を圧縮</string>
+  <string name="pref_picture_compression_summary">写真をサイズ変更や圧縮します</string>
+  <string name="always">常に</string>
+  <string name="automatically">自動</string>
+  <string name="battery_optimizations_enabled">バッテリー最適化が有効</string>
+  <string name="battery_optimizations_enabled_explained">お使いのデバイスは、Conversations で、通知の遅延やメッセージの損失につながる可能性のある、いくつかの重いバッテリーの最適化を行っています。\nそれらを無効にすることをお勧めします。</string>
+  <string name="battery_optimizations_enabled_dialog">お使いのデバイスは、Conversations で通知の遅延やメッセージの損失につながる可能性のある、いくつかの重いバッテリーの最適化を行っています。\n\n今、それらを無効にするように求められます。</string>
+  <string name="disable">無効</string>
 </resources>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index a2010c6f2..b5adc79f4 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -484,7 +484,6 @@
   <string name="download_failed_could_not_connect">Nedlasting feilet: Kunne ikke koble til tjeneren</string>
   <string name="pref_use_white_background">Bruk hvit bakgrunn</string>
   <string name="pref_use_white_background_summary">Vis mottatte meldinger som svart tekst på hvit bakgrunn</string>
-  <string name="account_status_tor_unavailable">TOR-nettverk utilgjengelig</string>
   <string name="server_info_broken">Knekt</string>
   <string name="pref_presence_settings">Tilstedeværelse-innstillinger</string>
   <string name="pref_away_when_screen_off">Borte når skjermen er av</string>
@@ -504,7 +503,6 @@
   <string name="device_does_not_support_certificates">Din enhet støtter ikke valg av klientsertifikat!</string>
   <string name="pref_connection_options">Tilkoblingsalternativ</string>
   <string name="pref_use_tor">Koble til via Tor</string>
-  <string name="pref_use_tor_summary">Tunneler alle tilkoblinger gjennom TOR-nettverket. Krever Orbot</string>
   <string name="account_settings_hostname">Tjenernavn</string>
   <string name="account_settings_port">Port</string>
   <string name="hostname_or_onion">Tjener- eller -onion-adresse</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 030eadf7c..3dc384718 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -9,6 +9,7 @@
   <string name="action_secure">Beveiligd gesprek</string>
   <string name="action_add_account">Account toevoegen</string>
   <string name="action_edit_contact">Naam veranderen</string>
+  <string name="action_add_phone_book">Toevoegen aan adresboek</string>
   <string name="action_delete_contact">Verwijderen uit lijst</string>
   <string name="action_block_contact">Contact blokkeren</string>
   <string name="action_unblock_contact">Contact deblokkeren</string>
@@ -27,6 +28,8 @@
   <string name="minutes_ago">%d min. geleden</string>
   <string name="unread_conversations">ongelezen gesprekken</string>
   <string name="sending">versturen…</string>
+  <string name="message_decrypting">Bericht aan het ontsleutelen. Even geduld…</string>
+  <string name="pgp_message">OpenPGP-versleuteld bericht</string>
   <string name="nick_in_use">Naam is al in gebruik</string>
   <string name="admin">Beheerder</string>
   <string name="owner">Eigenaar</string>
@@ -72,10 +75,12 @@
   <string name="clear_conversation_history">Gespreksgeschiedenis wissen</string>
   <string name="clear_histor_msg">Wil je alle berichten in dit gesprek verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string>
   <string name="delete_messages">Berichten verwijderen</string>
+  <string name="also_end_conversation">Dit gesprek na afloop beëindigen</string>
   <string name="choose_presence">Kies aanwezigheid om te tonen aan contact</string>
   <string name="send_unencrypted_message">Verstuur onversleuteld bericht</string>
   <string name="send_otr_message">Verstuur OTR-versleuteld bericht</string>
   <string name="send_omemo_message">Verstuur OMEMO-versleuteld bericht</string>
+  <string name="send_omemo_x509_message">Verstuur v\\OMEMO-versleuteld bericht</string>
   <string name="send_pgp_message">Verstuur OpenPGP-versleuteld bericht</string>
   <string name="your_nick_has_been_changed">Je naam is veranderd</string>
   <string name="send_unencrypted">Verstuur onversleuteld</string>
@@ -84,12 +89,14 @@
   <string name="openkeychain_required_long">Conversations gebruikt een derde partij app genaamd <b>OpenKeychain</b> om berichten te versleutelen en ontsleutelen, en om publieke sleutels te beheren.\n\nOpenKeychain is beschikbaar onder de GPLv3 en beschikbaar op F-Droid en Google Play.\n\n<small>(Herstart Conversations na installatie.)</small></string>
   <string name="restart">Herstarten</string>
   <string name="install">Installeren</string>
+  <string name="openkeychain_not_installed">Gelieve OpenKeychain te installeren</string>
   <string name="offering">bezig met aanbieden…</string>
   <string name="waiting">wachten…</string>
   <string name="no_pgp_key">Geen OpenPGP-sleutel gevonden</string>
   <string name="contact_has_no_pgp_key">Conversations kan je berichten niet versleutelen omdat je contact geen publieke sleutel heeft ingesteld.\n\n<small>Vraag je contact om OpenPGP te configureren.</small></string>
   <string name="no_pgp_keys">Geen OpenPGP-sleutels gevonden</string>
   <string name="contacts_have_no_pgp_keys">Conversations kan je berichten niet versleutelen omdat je contacten geen publieke sleutel hebben ingesteld.\n\n<small>Vraag je contacten om OpenPGP te configureren.</small></string>
+  <string name="encrypted_message_received"><i>Versleuteld bericht ontvangen. Raak aan om te ontsleutelen.</i></string>
   <string name="pref_general">Algemeen</string>
   <string name="pref_xmpp_resource">XMPP-bron</string>
   <string name="pref_xmpp_resource_summary">De naam waarmee deze cliënt zich identificeert</string>
@@ -166,6 +173,7 @@
   <string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string>
   <string name="invalid_jid">Dit is geen geldige Jabber-ID</string>
   <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
+  <string name="add_phone_book_text">Wil je %s toevoegen aan je adresboek?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">beschikbaar</string>
   <string name="contact_status_away">weg</string>
@@ -201,22 +209,27 @@
   <string name="your_fingerprint">Jouw vingerafdruk</string>
   <string name="otr_fingerprint">OTR-vingerafdruk</string>
   <string name="omemo_fingerprint">OMEMO-vingerafdruk</string>
+  <string name="omemo_fingerprint_x509">v\\OMEMO-vingerafdruk</string>
   <string name="omemo_fingerprint_selected_message">OMEMO-vingerafdruk van bericht</string>
+  <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO-vingerafdruk van bericht</string>
   <string name="this_device_omemo_fingerprint">Eigen OMEMO-vingerafdruk</string>
   <string name="other_devices">Andere apparaten</string>
   <string name="trust_omemo_fingerprints">Vertrouw OMEMO-vingerafdrukken</string>
+  <string name="fetching_keys">Sleutels ophalen…</string>
   <string name="done">Klaar</string>
   <string name="verify">Bevestigen</string>
   <string name="decrypt">Ontsleutelen</string>
   <string name="conferences">Groepsgesprekken</string>
   <string name="search">Zoeken</string>
   <string name="create_contact">Contact aanmaken</string>
+  <string name="enter_contact">Contact invoeren</string>
   <string name="join_conference">Aan groepsgesprek deelnemen</string>
   <string name="delete_contact">Contact verwijderen</string>
   <string name="view_contact_details">Contactgegevens bekijken</string>
   <string name="block_contact">Contact blokkeren</string>
   <string name="unblock_contact">Contact deblokkeren</string>
   <string name="create">Aanmaken</string>
+  <string name="select">Selecteren</string>
   <string name="contact_already_exists">Het contact bestaat al</string>
   <string name="join">Deelnemen</string>
   <string name="conference_address">Gespreksadres</string>
@@ -325,6 +338,9 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Dienst in voorgrond houden</string>
   <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem van je verbinding te onderbreken</string>
+  <string name="pref_export_logs">Exporteer logs</string>
+  <string name="pref_export_logs_summary">Schrijf logs naar SD-kaart</string>
+  <string name="notification_export_logs_title">Logs schrijven naar SD-kaart</string>
   <string name="choose_file">Bestand kiezen</string>
   <string name="receiving_x_file">Ontvangen van %1$s (%2$d%% voltooid)</string>
   <string name="download_x_file">%s downloaden</string>
@@ -359,6 +375,7 @@
   <string name="purge_key">Sleutel verwijderen</string>
   <string name="purge_key_desc_part1">Ben je zeker dat je deze sleutel wil verwijderen?</string>
   <string name="purge_key_desc_part2">Ze zal onherroepelijk beschouwd worden als gecompromitteerd en je zal er nooit meer een nieuwe sessie mee kunnen bouwen.</string>
+  <string name="error_no_keys_to_trust_server_error">Er zijn geen bruikbare sleutels beschikbaar voor dit contact.\nHet ophalen van nieuwe sleutels van de server is mislukt. Misschien is er iets mis met de server van je contact.</string>
   <string name="error_no_keys_to_trust">Er zijn geen bruikbare sleutels beschikbaar voor dit contact. Als je zijn/haar sleutels hebt verwijderd dient hij/zij nieuwe aan te maken.</string>
   <string name="error_trustkeys_title">Fout</string>
   <string name="fetching_history_from_server">Geschiedenis van server halen</string>
@@ -429,6 +446,7 @@
   <string name="offering_x_file">Bezig met aanbieden van %s</string>
   <string name="hide_offline">Offline contacten verbergen</string>
   <string name="disable_account">Account uitschakelen</string>
+  <string name="contact_is_typing">%s is aan het typen…</string>
   <string name="contact_has_stopped_typing">%s is gestopt met typen</string>
   <string name="pref_chat_states">Aan-het-typen-meldingen</string>
   <string name="pref_chat_states_summary">Laat je contacten weten wanneer je een nieuw bericht aan het schrijven bent</string>
@@ -471,6 +489,61 @@
   <string name="download_failed_could_not_connect">Downloaden mislukt: kon geen verbinding maken met host</string>
   <string name="pref_use_white_background">Gebruik witte achtergrond</string>
   <string name="pref_use_white_background_summary">Toon ontvangen berichten als zwarte tekst op een witte achtergrond</string>
+  <string name="account_status_tor_unavailable">Tor-netwerk niet beschikbaar</string>
   <string name="server_info_broken">Gebroken</string>
+  <string name="pref_presence_settings">Aanwezigheidsinstellingen</string>
+  <string name="pref_away_when_screen_off">Even weg wanneer scherm uit staat</string>
+  <string name="pref_away_when_screen_off_summary">Stelt je bron in als even weg wanneer het scherm uitgeschakeld is</string>
+  <string name="pref_xa_on_silent_mode">Niet beschikbaar in stille modus</string>
+  <string name="pref_xa_on_silent_mode_summary">Stelt je bron in als niet beschikbaar wanneer je apparaat in stille modus staat</string>
+  <string name="action_add_account_with_certificate">Account met certificaat toevoegen</string>
+  <string name="unable_to_parse_certificate">Kan certificaat niet verwerken</string>
+  <string name="authenticate_with_certificate">Laat leeg om te authenticeren met certificaat</string>
+  <string name="captcha_ocr">Captcha-tekst</string>
+  <string name="captcha_required">Captcha vereist</string>
+  <string name="captcha_hint">voer de tekst van de afbeelding in</string>
+  <string name="certificate_chain_is_not_trusted">Certificaatsketen is niet vertrouwd</string>
   <string name="jid_does_not_match_certificate">Jabber-ID komt niet overeen met certificaat</string>
+  <string name="action_renew_certificate">Certificaat vernieuwen</string>
+  <string name="error_fetching_omemo_key">Fout bij ophalen van OMEMO-sleutel!</string>
+  <string name="verified_omemo_key_with_certificate">OMEMO-sleutel geverifieerd met certificaat!</string>
+  <string name="device_does_not_support_certificates">Je apparaat ondersteunt de selectie van cliënt-certificaten niet!</string>
+  <string name="pref_connection_options">Verbindingsopties</string>
+  <string name="pref_use_tor">Verbinden via Tor</string>
+  <string name="pref_use_tor_summary">Tunnel alle verbindingen door het Tor-netwerk. Vereist Orbot</string>
+  <string name="account_settings_hostname">Hostnaam</string>
+  <string name="account_settings_port">Poort</string>
+  <string name="hostname_or_onion">Server- of .onion-adres</string>
+  <string name="not_a_valid_port">Dit is geen geldig poortnummer</string>
+  <string name="not_valid_hostname">Dit is geen geldige hostnaam</string>
+  <string name="connected_accounts">%1$d van %2$d accounts verbonden</string>
+  <plurals name="x_messages">
+    <item quantity="one">%d bericht</item>
+    <item quantity="other">%d berichten</item>
+  </plurals>
+  <string name="shared_file_with_x">Bestand gedeeld met %s</string>
+  <string name="shared_image_with_x">Afbeelding gedeeld met %s</string>
+  <string name="no_storage_permission">Conversations heeft toegang nodig tot de externe opslag</string>
+  <string name="sync_with_contacts">Synchroniseer met contacten</string>
+  <string name="sync_with_contacts_long">Conversations wil je XMPP-rooster met je contacten vergelijken om hun volledige namen en profielfoto\'s te tonen.\n\nConversations zal je contacten enkel lokaal lezen en vergelijken zonder ze te uploaden naar je server.\n\nJe zal nu gevraagd worden Conversations toegang te verlenen tot je contacten.</string>
+  <string name="certificate_information">Certificaatinformatie</string>
+  <string name="certificate_subject">Onderwerp</string>
+  <string name="certificate_issuer">Uitgever</string>
+  <string name="certificate_cn">Algemene naam</string>
+  <string name="certificate_o">Organisatie</string>
+  <string name="certificate_sha1">SHA1</string>
+  <string name="certicate_info_not_available">(Niet beschikbaar)</string>
+  <string name="certificate_not_found">Geen certificaat gevonden</string>
+  <string name="notify_on_all_messages">Melding bij alle berichten</string>
+  <string name="notify_only_when_highlighted">Melding enkel wanneer vermeld</string>
+  <string name="notify_never">Meldingen uitgeschakeld</string>
+  <string name="notify_paused">Meldingen gepauzeerd</string>
+  <string name="pref_picture_compression">Afbeeldingen comprimeren</string>
+  <string name="pref_picture_compression_summary">Afbeeldingen verkleinen en comprimeren</string>
+  <string name="always">Altijd</string>
+  <string name="automatically">Automatisch</string>
+  <string name="battery_optimizations_enabled">Batterij-optimalisaties ingeschakeld</string>
+  <string name="battery_optimizations_enabled_explained">Je apparaat voert sterke batterij-optimalisaties uit op Conversations, die kunnen leiden tot vertraagde meldingen of zelfs verlies van berichten.\nHet is aangeraden deze optimalisaties uit te schakelen.</string>
+  <string name="battery_optimizations_enabled_dialog">Je apparaat voert sterke batterij-optimalisaties uit op Conversations, die kunnen leiden tot vertraagde meldingen of zelfs verlies van berichten.\nJe zal nu gevraagd worden deze optimalisaties uit te schakelen.</string>
+  <string name="disable">Uitschakelen</string>
 </resources>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index b71ed947f..6bf357617 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -375,6 +375,7 @@
   <string name="purge_key">Sterge cheia</string>
   <string name="purge_key_desc_part1">Sigur vrei sa stergi aceasta cheie?</string>
   <string name="purge_key_desc_part2">Va fi considera compromisa ireversibil si nu vei mai putea crea o sesiune cu ea niciodata.</string>
+  <string name="error_no_keys_to_trust_server_error">Nu exista chei utilizabile pentru acest contact.\nIncercarea de a descarca o cheie de pe server a esuat. Se poate sa fie o problema cu serverul de contacte.</string>
   <string name="error_no_keys_to_trust">Nu exista chei disponibile si utilizabile pentru acest contact. Daca ai sters vreuna din cheile contactului, trebuie sa generezi o alta noua.</string>
   <string name="error_trustkeys_title">Eroare</string>
   <string name="fetching_history_from_server">Descarc istoric de pe server</string>
@@ -490,7 +491,7 @@
   <string name="download_failed_could_not_connect">Descarcarea a esuat. Nu s-a putut realiza conexiunea cu gazda.</string>
   <string name="pref_use_white_background">Foloseste un fundal alb</string>
   <string name="pref_use_white_background_summary">Arata mesajele primite cu negru pe fond alb</string>
-  <string name="account_status_tor_unavailable">Retea TOR indisponibila</string>
+  <string name="account_status_tor_unavailable">Reteaua Tor nu este disponibila</string>
   <string name="server_info_broken">Deteriorat</string>
   <string name="pref_presence_settings">Setari de prezenta</string>
   <string name="pref_away_when_screen_off">Plecat cand ecranul este oprit</string>
@@ -511,7 +512,7 @@
   <string name="device_does_not_support_certificates">Dispozitivul nu permite selectia unui certificat pentru client!</string>
   <string name="pref_connection_options">Optiuni conexiune</string>
   <string name="pref_use_tor">Conectare prin TOR</string>
-  <string name="pref_use_tor_summary">Toate conexiunile trec prin TOR. Necesita Orbot.</string>
+  <string name="pref_use_tor_summary">Trimite toate conexiunile prin reteaua Tor. Necesita OrBot</string>
   <string name="account_settings_hostname">Nume gazda</string>
   <string name="account_settings_port">Port</string>
   <string name="hostname_or_onion">Adresa server- sau .onion</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 220a8e577..bf4f30001 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -488,7 +488,6 @@
   <string name="download_failed_could_not_connect">Загрузка не удалась: не удалось подключиться к серверу</string>
   <string name="pref_use_white_background">Использовать белый фон</string>
   <string name="pref_use_white_background_summary">Показывать принятые сообщения черным текстом на белом фоне</string>
-  <string name="account_status_tor_unavailable">Сеть TOR недоступна</string>
   <string name="server_info_broken">Повреждено</string>
   <string name="pref_presence_settings">Настройки присутствия</string>
   <string name="pref_away_when_screen_off">Вышел когда экран выключен</string>
@@ -508,7 +507,6 @@
   <string name="device_does_not_support_certificates">Ваше устройство не поддерживает выбор клиентских сертификатов!</string>
   <string name="pref_connection_options">Настройки соединения</string>
   <string name="pref_use_tor">Соединение через Tor</string>
-  <string name="pref_use_tor_summary">Направить все соединения через сеть TOR. Требуется Orbot</string>
   <string name="account_settings_hostname">Имя сервера</string>
   <string name="account_settings_port">Порт</string>
   <string name="hostname_or_onion">Сервер- или .onion-Адрес</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 69a0796aa..e8398398d 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -375,6 +375,7 @@
   <string name="purge_key">Очисти кључ</string>
   <string name="purge_key_desc_part1">Желите ли заиста да очистите овај кључ?</string>
   <string name="purge_key_desc_part2">Неповратно ће бити сматран компровитованим, и њиме више никад нећете моћи да успоставите сесију.</string>
+  <string name="error_no_keys_to_trust_server_error">Нема употребљивих кључева за овај контакт.\nДобављање нових кључева са сервера није било успешно. Можда нешто није у реду са сервером ваших контаката.</string>
   <string name="error_no_keys_to_trust">Нема употребљивих кључева за овај контакт. Ако сте очистили било који од тих кључева, контакт мора да генерише нови.</string>
   <string name="error_trustkeys_title">Грешка</string>
   <string name="fetching_history_from_server">Добављам историјат са сервера</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 920fc65e4..a8bb46b8c 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -375,6 +375,7 @@
   <string name="purge_key">Rensa nyckel</string>
   <string name="purge_key_desc_part1">Är du säker på att du vill rensa denna nyckel?</string>
   <string name="purge_key_desc_part2">Den kommer att antas oåterkalleligt komprometterat och du kommer aldrig kunna bygga en session med den igen.</string>
+  <string name="error_no_keys_to_trust_server_error">Det finns inga användbara nycklar tillgängliga för den här kontakten.\nHämtning av nya nyckar från servern har inte lyckats. Kanske är det något fel på din kontakts server.</string>
   <string name="error_no_keys_to_trust">Det finns inga användbara nycklar tillgängliga för den här kontakten. Om du har rensat någon av dennes nycklar behöver de generera nya.</string>
   <string name="error_trustkeys_title">Fel</string>
   <string name="fetching_history_from_server">Hämtar historik från server</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
new file mode 100644
index 000000000..c757504ac
--- /dev/null
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
new file mode 100644
index 000000000..c757504ac
--- /dev/null
+++ b/src/main/res/values-uk/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
new file mode 100644
index 000000000..c757504ac
--- /dev/null
+++ b/src/main/res/values-vi/strings.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources/>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 26aa7bc58..05565b33d 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -482,7 +482,6 @@
   <string name="download_failed_could_not_connect">下载失败：无法连接到服务器</string>
   <string name="pref_use_white_background">使用白色背景</string>
   <string name="pref_use_white_background_summary">收到的消息将显示为白底黑字</string>
-  <string name="account_status_tor_unavailable">TOR 网络不可用</string>
   <string name="server_info_broken">损坏</string>
   <string name="pref_presence_settings">上线设置</string>
   <string name="pref_away_when_screen_off">关闭屏幕时离开</string>
@@ -502,7 +501,6 @@
   <string name="device_does_not_support_certificates">您的设备不支持设备证书选择！</string>
   <string name="pref_connection_options">连接选项</string>
   <string name="pref_use_tor">通过 Tor 连接</string>
-  <string name="pref_use_tor_summary">所有连接使用 TOR 网络隧道。需要 Orbot</string>
   <string name="account_settings_hostname">主机名</string>
   <string name="account_settings_port">端口</string>
   <string name="hostname_or_onion">服务器 - 或者 .orion 地址</string>