diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 6b825007c..84f59bb3b 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -72,7 +72,6 @@
   <string name="clear_conversation_history">حذف سجل المحفوظات للمحادثة</string>
   <string name="clear_histor_msg">هل ترغب بحذف جميع الرسائل في تلك المحادثة?\n\n<b>تنويه:</b> هذا لن يؤثر على الرسائل المخزنة على الأجهزة أو أي أماكن أخرى.</string>
   <string name="delete_messages">حذف الرسائل</string>
-  <string name="choose_presence">اختيار ظهورك لجهات الإتصال</string>
   <string name="send_otr_message">OTRارساله رساله مشفره عبر</string>
   <string name="send_pgp_message">OpenPGPارساله رساله مشفره عبر</string>
   <string name="your_nick_has_been_changed">تم تغيير لقبك بنجاح</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index d7e5b21ae..ad248e06f 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">Искате ли да изтриете всички съобщения от този разговор?\n\n<b>Внимание:</b> Това няма да изтрие съобщенията, съхранявани на други устройства или на сървърите.</string>
   <string name="delete_messages">Изтриване на съобщенията</string>
   <string name="also_end_conversation">Приключване на този разговор след това</string>
-  <string name="choose_presence">Изберете присъствие за контакта</string>
+  <string name="choose_presence">Изберете устройство</string>
   <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
   <string name="send_message_to_x">Изпращане на съобщение до %s</string>
   <string name="send_otr_message">Изпр. на съобщение, шифр. чрез OTP</string>
@@ -360,8 +360,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Услугата да е на преден план</string>
   <string name="pref_keep_foreground_service_summary">Предотвратява прекъсването на връзката Ви от операционната система</string>
-  <string name="pref_export_logs">Изнасяне на журналите</string>
-  <string name="pref_export_logs_summary">Записване на журналите в картата с памет</string>
   <string name="notification_export_logs_title">Записване на журналите в картата с памет</string>
   <string name="choose_file">Изберете файл</string>
   <string name="receiving_x_file">Получаване на %1$s (%2$d%% завършено)</string>
@@ -636,4 +634,10 @@
   <string name="pref_use_green_background_summary">Получените съобщения ще бъдат на зелен фон</string>
   <string name="unable_to_connect_to_keychain">Неуспешно свързване с OpenKeychain</string>
   <string name="this_device_is_no_longer_in_use">Това устройство вече не се използва</string>
+  <string name="type_pc">Компютър</string>
+  <string name="type_phone">Мобилен телефон</string>
+  <string name="type_tablet">Таблет</string>
+  <string name="type_web">Браузър</string>
+  <string name="type_console">Конзола</string>
+  <string name="payment_required">Изисква се плащане</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index ac515d9e5..2210069a4 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -72,7 +72,6 @@
   <string name="clear_conversation_history">Netejar historial de conversa</string>
   <string name="clear_histor_msg">Vols esborrar tots els missatges d\'aquesta conversa?\n\n<b>Avís:</b> Això no afectarà els missatges desats en altres dispositius o servidors.</string>
   <string name="delete_messages">Esborrar missatges</string>
-  <string name="choose_presence">Selecciona recurs del contacte</string>
   <string name="send_otr_message">Enviar missatge xifrat amb OTR</string>
   <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string>
   <string name="your_nick_has_been_changed">El teu sobrenom s\'ha modificat</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 35ac0e814..b6098fb8d 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">Chcete smazat všechny zprávy v této konverzaci?\n\n<b>Varování:</b> Toto neovlivní zprávy uložené na jiných přístrojích nebo serverech.</string>
   <string name="delete_messages">Smazat zprávy</string>
   <string name="also_end_conversation">Poté ukončit tuto konverzaci</string>
-  <string name="choose_presence">Vybrat aktualizaci stavu pro kontakt</string>
+  <string name="choose_presence">Vybrat přístroj</string>
   <string name="send_unencrypted_message">Odeslat nešifrovanou zprávu</string>
   <string name="send_message_to_x">Odeslat zprávu pro %s</string>
   <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
@@ -117,7 +117,7 @@
   <string name="pref_sound">Tón upozornění</string>
   <string name="pref_sound_summary">Přehrát zvuk při přijetí nové zprávy</string>
   <string name="pref_notification_grace_period">Časová lhůta</string>
-  <string name="pref_notification_grace_period_summary">Časová lhůta po kterou bude Conversations v tichém režimu při spatření aktivity na jiném přístroji</string>
+  <string name="pref_notification_grace_period_summary">Časová lhůta po kterou bude Conversations v tichém režimu při zaznamenání aktivity na jiném přístroji</string>
   <string name="pref_advanced_options">Rozšířené</string>
   <string name="pref_never_send_crash">Neodesílat detaily o pádu aplikace</string>
   <string name="pref_never_send_crash_summary">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace</string>
@@ -157,7 +157,9 @@
   <string name="account_status_regis_success">Registrace dokončena</string>
   <string name="account_status_regis_not_sup">Server nepodporuje registrace</string>
   <string name="account_status_security_error">Bezpečnostní chyba</string>
+  <string name="account_status_policy_violation">Porušení podmínek</string>
   <string name="account_status_incompatible_server">Nekompatibilní server</string>
+  <string name="account_status_stream_error">Chyba přenosu</string>
   <string name="encryption_choice_unencrypted">Nešifrováno</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -218,6 +220,8 @@
   <string name="reception_failed">Příjem selhal</string>
   <string name="your_fingerprint">Váš identifikátor</string>
   <string name="otr_fingerprint">OTR identifikátor</string>
+  <string name="otr_fingerprint_selected_message">OTR otisk zprávy</string>
+  <string name="openpgp_key_id">OpenPGP ID klíče</string>
   <string name="omemo_fingerprint">OMEMO otisk</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO otisk</string>
   <string name="omemo_fingerprint_selected_message">OMEMO otisk zprávy</string>
@@ -356,8 +360,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Ponechat službu v popředí</string>
   <string name="pref_keep_foreground_service_summary">Zamezit operačnímu systému v ukončení připojení</string>
-  <string name="pref_export_logs">Exportovat logy</string>
-  <string name="pref_export_logs_summary">Zapsat logy na SD kartu</string>
   <string name="notification_export_logs_title">Zapisování logů na SD kartu</string>
   <string name="choose_file">Vybrat soubor</string>
   <string name="receiving_x_file">Přijímám %1$s (%2$d%% dokončeno)</string>
@@ -389,7 +391,7 @@
   <string name="regenerate_omemo_key">Znovu vytvořit OMEMO klíč</string>
   <string name="wipe_omemo_pep">Smazat ostatní přístroje z PEP</string>
   <string name="clear_other_devices">Smazat přístroje</string>
-  <string name="clear_other_devices_desc">Opravdu chcete vymazat ostatní přístroje z OMEMO upozornění? Až se příště vaše přístroje připojí, znovu se ohlásí, ale pravděpodobně neobdrží zprávy odeslané v mezičase mezi přihlášeními.</string>
+  <string name="clear_other_devices_desc">Opravdu chcete vymazat ostatní přístroje z OMEMO upozornění? Až se příště tyto přístroje připojí, znovu se ohlásí, ale pravděpodobně neobdrží zprávy odeslané v mezičase mezi přihlášeními.</string>
   <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>
@@ -504,7 +506,7 @@
   <string name="username">Uživatelské jméno</string>
   <string name="username_hint">Uživatelské jméno</string>
   <string name="invalid_username">Toto není platné uživatelské jméno</string>
-  <string name="conference_name">Jméno konferenc</string>
+  <string name="conference_name">Jméno konference</string>
   <string name="invalid_conference_name">Toto není platné jméno konference</string>
   <string name="download_failed_server_not_found">Stahování selhalo: Server nenalezen</string>
   <string name="download_failed_file_not_found">Stahování selhalo: Soubor nenalezen</string>
@@ -514,6 +516,7 @@
   <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íť není dostupná</string>
   <string name="account_status_bind_failure">Bind chyba</string>
+  <string name="account_status_host_unknown">Server není zodpovědný za doménu</string>
   <string name="server_info_broken">Rozbité</string>
   <string name="pref_presence_settings">Stav</string>
   <string name="pref_away_when_screen_off">Pryč při vypnuté obrazovce</string>
@@ -561,7 +564,7 @@
   <string name="shared_text_with_x">Text sdílen s %s</string>
   <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="sync_with_contacts_long">Aplikace Conversations by ráda porovnala svůj 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>
@@ -579,8 +582,8 @@
   <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="battery_optimizations_enabled_explained">Tento přístroj provádí agresivní optimalizace využití baterie pro aplikaci Conversations. 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 aplikaci Conversations. 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>
   <string name="selection_too_large">Vybraný obsah je příliš dlouhý</string>
   <string name="no_accounts">(Žádné aktivované účty)</string>
@@ -613,6 +616,7 @@
   <string name="device_does_not_support_battery_op">Tento přístroj nepodporuje vypnutí možnosti optimalizace využití baterie</string>
   <string name="show_password">Zobrazit heslo</string>
   <string name="registration_please_wait">Registrace selhala: Zkuste znovu později</string>
+  <string name="registration_password_too_weak">Registrace selhala: Příliš slabé heslo</string>
   <string name="create_conference">Vytvořit konferenci</string>
   <string name="join_or_create_conference">Vytvořit nebo se připojit ke konferenci</string>
   <string name="conference_subject">Předmět</string>
@@ -631,4 +635,12 @@
   <string name="pref_theme_dark">Tmavý vzhled</string>
   <string name="pref_use_green_background">Zelené pozadí</string>
   <string name="pref_use_green_background_summary">Použít zelené pozadí pro přijaté zprávy</string>
+  <string name="unable_to_connect_to_keychain">Nelze se spojit s OpenKeychain</string>
+  <string name="this_device_is_no_longer_in_use">Tento přístoj již není používán</string>
+  <string name="type_pc">Počítač</string>
+  <string name="type_phone">Mobil</string>
+  <string name="type_tablet">Tablet</string>
+  <string name="type_web">Prohlížeč</string>
+  <string name="type_console">Konzole</string>
+  <string name="payment_required">Vyžadována platba</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 8500a2e5a..15241cde2 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">Möchtest du alle Nachrichten in dieser Unterhaltung löschen?\n\n<b>Achtung:</b> Dies beeinflusst nicht Nachrichten, die auf anderen Geräten oder Servern gespeichert sind.</string>
   <string name="delete_messages">Nachrichten löschen</string>
   <string name="also_end_conversation">Diese Unterhaltung danach beenden</string>
-  <string name="choose_presence">Ressource des Kontakts auswählen</string>
+  <string name="choose_presence">Gerät auswählen</string>
   <string name="send_unencrypted_message">Unverschlüsselt schreiben…</string>
   <string name="send_message_to_x">Sende Nachricht an %s</string>
   <string name="send_otr_message">OTR-verschlüsselt schreiben…</string>
@@ -218,6 +218,8 @@
   <string name="reception_failed">Empfang fehlgeschlagen</string>
   <string name="your_fingerprint">Dein Fingerabdruck</string>
   <string name="otr_fingerprint">OTR-Fingerabdruck</string>
+  <string name="otr_fingerprint_selected_message">OTR Fingerabdruck der Nachricht</string>
+  <string name="openpgp_key_id">OpenPGP Schlüssel-ID</string>
   <string name="omemo_fingerprint">OMEMO-Fingerabdruck</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO-Fingerabdruck</string>
   <string name="omemo_fingerprint_selected_message">OMEMO-Fingerabdruck der Nachricht</string>
@@ -356,8 +358,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Dienst im Vordergrund ausführen</string>
   <string name="pref_keep_foreground_service_summary">Verhindert, dass Android Conversations beendet und die Verbindung unterbricht</string>
-  <string name="pref_export_logs">Chats exportieren</string>
-  <string name="pref_export_logs_summary">Chats auf SD-Karte schreiben</string>
   <string name="notification_export_logs_title">Chats werden auf SD-Karte geschrieben</string>
   <string name="choose_file">Datei auswählen</string>
   <string name="receiving_x_file">Empfange %1$s (%2$d%% abgeschlossen)</string>
@@ -629,5 +629,12 @@
   <string name="pref_theme_dark">Dunkles Design</string>
   <string name="pref_use_green_background">Grüner Hintergrund</string>
   <string name="pref_use_green_background_summary">Für empfangene Nachrichten grünen Hintergrund verwenden</string>
+  <string name="unable_to_connect_to_keychain">Kann nicht mit OpenKeychain verbinden</string>
   <string name="this_device_is_no_longer_in_use">Dieses Gerät ist nicht länger in Benutzung</string>
+  <string name="type_pc">Computer</string>
+  <string name="type_phone">Mobiltelefon</string>
+  <string name="type_tablet">Tablet</string>
+  <string name="type_web">Webbrowser</string>
+  <string name="type_console">Kommandozeile</string>
+  <string name="payment_required">Bezahlung erforderlich</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 6377ac12d..a08ec2b89 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -72,7 +72,6 @@
   <string name="clear_conversation_history">Καθαρισμός ιστορικού Συζήτησης</string>
   <string name="clear_histor_msg">Θέλετε να σβήσετε όλα τα μηνύματα αυτής της Συζήτησης;\n\n<b>Προειδοποίηση:</b> Αυτό δεν θα επηρεάσει τα μηνύματα που είναι αποθηκευμένα σε άλλες συσκευές ή άλλους διακομιστές.</string>
   <string name="delete_messages">Διαγραφή μηνυμάτων</string>
-  <string name="choose_presence">Επιλέξτε παρουσία για επικοινωνία</string>
   <string name="send_otr_message">Αποστολή κρυπτογραφημένου μηνύματος OTR</string>
   <string name="send_pgp_message">Αποστολή κρυπτογραφημένου μηνύματος OpenPGP</string>
   <string name="your_nick_has_been_changed">Το ψευδώνυμό σας έχει αλλάξει</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index e37366d33..a598cdec2 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string>
   <string name="delete_messages">Borrar mensajes</string>
   <string name="also_end_conversation">Además, terminar esta conversación</string>
-  <string name="choose_presence">Selecciona recurso del contacto</string>
+  <string name="choose_presence">Seleccionar dispositivo</string>
   <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
   <string name="send_message_to_x">Enviar mensaje a %s</string>
   <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
@@ -360,8 +360,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Servicio en primer plano</string>
   <string name="pref_keep_foreground_service_summary">Mantener el servicio en primer plano previene que el sistema cierre la conexión</string>
-  <string name="pref_export_logs">Exportar logs</string>
-  <string name="pref_export_logs_summary">Escribir logs en la tarjeta SD</string>
   <string name="notification_export_logs_title">Escribiendo logs en la tarjeta SD</string>
   <string name="choose_file">Seleccionar archivo</string>
   <string name="receiving_x_file">Recibiendo %1$s (%2$d%% completado)</string>
@@ -636,4 +634,10 @@
   <string name="pref_use_green_background_summary">Usar fondo verde para mensajes recibidos</string>
   <string name="unable_to_connect_to_keychain">No se ha podido conectar a OpenKeychain</string>
   <string name="this_device_is_no_longer_in_use">Este dispositivo ya no está en uso</string>
+  <string name="type_pc">Ordenador</string>
+  <string name="type_phone">Teléfono móvil</string>
+  <string name="type_tablet">Tablet</string>
+  <string name="type_web">Navegador</string>
+  <string name="type_console">Consola</string>
+  <string name="payment_required">Pago requerido</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 61adf4a5c..1c93dc7f9 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -78,7 +78,6 @@
   <string name="clear_histor_msg">Elkarrizketa honetako mezu guztiak ezabatu nahi al dituzu?\n\n<b>Abisua:</b> Honek ez du beste gailu edo zerbitzarietan gordetako mezuetan eraginik izango.</string>
   <string name="delete_messages">Mezuak ezabatu</string>
   <string name="also_end_conversation">Elkarrizketa hau jarraian amaitu</string>
-  <string name="choose_presence">Hautatu agerpena kontaktuarentzat</string>
   <string name="send_unencrypted_message">Enkriptatu gabeko mezua bidali</string>
   <string name="send_message_to_x">%s(r)i mezua bidali</string>
   <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
@@ -360,8 +359,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Zerbitzua atzeko planoan mantendu</string>
   <string name="pref_keep_foreground_service_summary">Sistema eragileak zure konexioa hiltzea galarazten du</string>
-  <string name="pref_export_logs">Erregistroak esportatu</string>
-  <string name="pref_export_logs_summary">Erregistroak SD txartelean gorde</string>
   <string name="notification_export_logs_title">Erregistroak SD txartelean gordetzen</string>
   <string name="choose_file">Fitxategia aukeratu</string>
   <string name="receiving_x_file">%1$s jasotzen (%2$d%% osatua)</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 165727d98..88a2684d4 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -78,7 +78,6 @@
   <string name="clear_histor_msg">Voulez-vous supprimer tous les messages de cette conversation ?\n\n<b>Attention :</b> Les messages seront supprimés uniquement sur cet appareil.</string>
   <string name="delete_messages">Supprimer les messages</string>
   <string name="also_end_conversation">Fermer cette conversation ensuite</string>
-  <string name="choose_presence">Choisir la dispo. donnée au contact</string>
   <string name="send_unencrypted_message">Envoyer un message non chiffré</string>
   <string name="send_message_to_x">Envoyer un message à %s</string>
   <string name="send_otr_message">Envoyer un message chiffré avec OTR</string>
@@ -360,8 +359,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Garder le service au 1er plan</string>
   <string name="pref_keep_foreground_service_summary">Évite que le système ne ferme votre connexion.</string>
-  <string name="pref_export_logs">Exporter les historiques</string>
-  <string name="pref_export_logs_summary">Sauvegarder les historiques sur la carte SD</string>
   <string name="notification_export_logs_title">Sauvegarde des historiques sur la carte SD...</string>
   <string name="choose_file">Choix du fichier</string>
   <string name="receiving_x_file">Réception %1$s (%2$d%% complété)</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index fdf4b36e4..ea60f29c6 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -41,7 +41,6 @@
   <string name="clear_conversation_history">Limpar historial de conversa</string>
   <string name="clear_histor_msg">¿Queres borrar todas as mensaxes desta conversa?\n\n<b>Ollo:</b> Isto non afectará ás mensaxes gardadas noutros dispositivos ou servidores.</string>
   <string name="delete_messages">Borrar mensaxes</string>
-  <string name="choose_presence">Selecciona recurso del contacto</string>
   <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string>
   <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string>
   <string name="your_nick_has_been_changed">Modificouse o teu apodo</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index abbb9e7ee..880700e74 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -77,7 +77,6 @@
   <string name="clear_conversation_history">Hapus Riwayat Percakapan</string>
   <string name="clear_histor_msg">Apakah Anda ingin menghapus semua pesan dalam Percakapan ini\n\n<b>Peringatan:</b>ini tidak akan mempengaruhi pesan yang disimpan pada perangkat atau server lain.</string>
   <string name="delete_messages">Hapus pesan</string>
-  <string name="choose_presence">Pilih kehadiran untuk kontak</string>
   <string name="send_unencrypted_message">Kirim pesan tak-terenkripsi</string>
   <string name="send_otr_message">Kirim pesan terenskripsi OTR</string>
   <string name="send_pgp_message">Kirim pesan terenskripsi OpenPGP</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 7c395451e..75ca09fcc 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">Vuoi cancellare tutti i messaggi di questa Conversazione?\n\n<b>Attenzione:</b> Questo non influenzerà i messaggi presenti su altri dispositivi o server.</string>
   <string name="delete_messages">Elimina messaggi</string>
   <string name="also_end_conversation">Termina questa conversazione successivamente</string>
-  <string name="choose_presence">Choose presence to contact</string>
+  <string name="choose_presence">Scegli un dispositivo</string>
   <string name="send_unencrypted_message">Invia messaggio non cifrato</string>
   <string name="send_message_to_x">Invia messaggio a %s</string>
   <string name="send_otr_message">Messaggio OTR</string>
@@ -360,8 +360,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Mantieni il servizio in primo piano</string>
   <string name="pref_keep_foreground_service_summary">Evita che il sistema operativo chiuda la connessione</string>
-  <string name="pref_export_logs">Esporta Log</string>
-  <string name="pref_export_logs_summary">Scrivi i log su card SD</string>
   <string name="notification_export_logs_title">Scrittura log su card SD</string>
   <string name="choose_file">Scegli file</string>
   <string name="receiving_x_file">Ricezione di %1$s file (%2$d%% completato)</string>
@@ -635,4 +633,10 @@
   <string name="pref_use_green_background_summary">Usa sfondo verde per messaggi ricevuti</string>
   <string name="unable_to_connect_to_keychain">Impossibile connettersi a OpenKeychain</string>
   <string name="this_device_is_no_longer_in_use">Questo dispositivo non è più in uso</string>
+  <string name="type_pc">Computer</string>
+  <string name="type_phone">Cellulare</string>
+  <string name="type_tablet">Tablet</string>
+  <string name="type_web">Browser web</string>
+  <string name="type_console">Console</string>
+  <string name="payment_required">Necessario pagamento</string>
 </resources>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index e6145dc5e..22718d55c 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -75,7 +75,6 @@
   <string name="clear_histor_msg">האם ברצונך למחוק את כל ההודעות בשיחה זאת?\n\n<b>אזהרה:</b> פעולה זו לא תשפיע על הודעות מאוחסנות על מכשירים או שרתים אחרים.</string>
   <string name="delete_messages">מחק הודעות</string>
   <string name="also_end_conversation">סיים את השיחה לאחר מכן</string>
-  <string name="choose_presence">בחר נוכחות לאיש קשר</string>
   <string name="send_unencrypted_message">שלח הודעה בלתי מוצפנת</string>
   <string name="send_otr_message">שלח הודעה בהצפנת OTR</string>
   <string name="send_omemo_message">של הודעה בהצפנת OMEMO</string>
@@ -315,8 +314,6 @@
   <string name="no_otr_session_found">לא נמצא OTR Session תקין</string>
   <string name="pref_keep_foreground_service">השאר שירות ב Foreground</string>
   <string name="pref_keep_foreground_service_summary">מונע ממערכת ההפעלה לנתק את החיבור לשרת</string>
-  <string name="pref_export_logs">ייצא Logs</string>
-  <string name="pref_export_logs_summary">יצוא logs לכרטיס הזיכרון</string>
   <string name="notification_export_logs_title">מייצא logs לכרטיס זיכרון</string>
   <string name="choose_file">בחר קובץ</string>
   <string name="receiving_x_file">מקבל %1$s ( הושלם %2$d%% )</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index c58647069..ae6a96431 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">この会話のすべてのメッセージを削除しますか?\n\n<b>警告:</b> これは、他のデバイスやサーバーに保存されているメッセージには影響しません。</string>
   <string name="delete_messages">メッセージを削除</string>
   <string name="also_end_conversation">その後、この会話を終了</string>
-  <string name="choose_presence">連絡する参加を選択</string>
+  <string name="choose_presence">デバイスを選択</string>
   <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
   <string name="send_message_to_x">メッセージを %s に送信</string>
   <string name="send_otr_message">OTR 暗号化メッセージを送信</string>
@@ -360,8 +360,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">サービスをフォアグラウンドに保持</string>
   <string name="pref_keep_foreground_service_summary">オペレーティングシステムが接続を切断するのを防止します</string>
-  <string name="pref_export_logs">ログをエクスポート</string>
-  <string name="pref_export_logs_summary">ログを SD カードに書き込みます</string>
   <string name="notification_export_logs_title">ログを SD カードに書き込み中</string>
   <string name="choose_file">ファイルの選択</string>
   <string name="receiving_x_file">%1$s 受信中 (%2$d%% 完了)</string>
@@ -633,4 +631,10 @@
   <string name="pref_use_green_background_summary">受信したメッセージに緑の背景を使用します</string>
   <string name="unable_to_connect_to_keychain">OpenKeychain に接続できません</string>
   <string name="this_device_is_no_longer_in_use">このデバイスは、現在使用されていません</string>
+  <string name="type_pc">コンピューター</string>
+  <string name="type_phone">携帯電話</string>
+  <string name="type_tablet">タブレット</string>
+  <string name="type_web">Web ブラウザー</string>
+  <string name="type_console">コンソール</string>
+  <string name="payment_required">支払が必要です</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 8b6b9ef68..08ea1ca6f 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -76,7 +76,6 @@
   <string name="clear_histor_msg">이 대화의 모든 메세지를 삭제하시겠습니까? 경고: 이것은 다른 기기나 서버에 있는 메세지에는 영향을 미치지 않습니다. </string>
   <string name="delete_messages">메세지 삭제 </string>
   <string name="also_end_conversation">나중에 이 대화 끝내기 </string>
-  <string name="choose_presence">연락할 프레즌스 선택 </string>
   <string name="send_unencrypted_message">암호화하지 않은 메세지 전송</string>
   <string name="send_otr_message">OTR 암호화된 메세지 전송 </string>
   <string name="send_omemo_message">OMEMO로 암호화된 메세지</string>
@@ -326,8 +325,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">포어그라운드에서 서비스 유지 </string>
   <string name="pref_keep_foreground_service_summary">운영체제가 접속을 해제하지 못하도록 예방합니다 </string>
-  <string name="pref_export_logs">내보내기 기록</string>
-  <string name="pref_export_logs_summary">기록을 SD 카드에 쓰기</string>
   <string name="notification_export_logs_title">기록을 SD 카드에 쓰는 중</string>
   <string name="choose_file">파일 선택 </string>
   <string name="receiving_x_file">수신중 %1$s (%2$d%% 완료) </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index ce6597b30..424eb2e0f 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -76,7 +76,6 @@
   <string name="clear_histor_msg">Ønsker du å slette alle meldinger i denne samtalen?\n\n<b>Advarsel:</b> Dette har ingen innvirkning på meldinger lagret på andre enheter eller tjenere.</string>
   <string name="delete_messages">Slett meldinger</string>
   <string name="also_end_conversation">Avslutt denne samtalen etterpå</string>
-  <string name="choose_presence">Velg tilgjengelighetsoppdatering til kontakt</string>
   <string name="send_unencrypted_message">Send ukryptert melding</string>
   <string name="send_otr_message">Send OTR-kryptert melding</string>
   <string name="send_omemo_message">Send OMEMO-kryptert melding</string>
@@ -326,8 +325,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Behold tjenesten i forgrunnen</string>
   <string name="pref_keep_foreground_service_summary">Forhindrer operativsystemet fra å drepe tilkoblingen din</string>
-  <string name="pref_export_logs">Eksporter loggføringer</string>
-  <string name="pref_export_logs_summary">Skriv loggføringer til SD-kort</string>
   <string name="notification_export_logs_title">Skriver loggføringer til SD-kort</string>
   <string name="choose_file">Velg fil</string>
   <string name="receiving_x_file">Mottak av %1$s (%2$d%% fullført)</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 07ed042ac..e4f6ab4cb 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -78,7 +78,7 @@
   <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="choose_presence">Apparaat kiezen</string>
   <string name="send_unencrypted_message">Verstuur onversleuteld bericht</string>
   <string name="send_message_to_x">Bericht sturen naar %s</string>
   <string name="send_otr_message">Verstuur OTR-versleuteld bericht</string>
@@ -157,7 +157,9 @@
   <string name="account_status_regis_success">Registratie voltooid</string>
   <string name="account_status_regis_not_sup">Server ondersteunt geen registratie</string>
   <string name="account_status_security_error">Fout bij beveiliging</string>
+  <string name="account_status_policy_violation">Beleidsschending</string>
   <string name="account_status_incompatible_server">Incompatibele server</string>
+  <string name="account_status_stream_error">Fout bij stream</string>
   <string name="encryption_choice_unencrypted">Onversleuteld</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -218,6 +220,8 @@
   <string name="reception_failed">Ontvangen mislukt</string>
   <string name="your_fingerprint">Jouw vingerafdruk</string>
   <string name="otr_fingerprint">OTR-vingerafdruk</string>
+  <string name="otr_fingerprint_selected_message">OTR-vingerafdruk van bericht</string>
+  <string name="openpgp_key_id">OpenPGP-sleutel-ID</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>
@@ -356,8 +360,6 @@
   <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>
@@ -512,6 +514,7 @@
   <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="account_status_bind_failure">Bindingsfout</string>
+  <string name="account_status_host_unknown">Server niet verantwoordelijk voor domein</string>
   <string name="server_info_broken">Gebroken</string>
   <string name="pref_presence_settings">Aanwezigheid</string>
   <string name="pref_away_when_screen_off">Even weg wanneer scherm uit staat</string>
@@ -610,6 +613,7 @@
   <string name="device_does_not_support_battery_op">Je apparaat ondersteunt het uitschakelen van batterij-optimalisatie niet</string>
   <string name="show_password">Wachtwoord weergeven</string>
   <string name="registration_please_wait">Registratie mislukt: probeer later opnieuw</string>
+  <string name="registration_password_too_weak">Registratie mislukt: wachtwoord te zwak</string>
   <string name="create_conference">Groepsgesprek aanmaken</string>
   <string name="join_or_create_conference">Deelnemen aan groepsgesprek of een aanmaken</string>
   <string name="conference_subject">Onderwerp</string>
@@ -628,4 +632,12 @@
   <string name="pref_theme_dark">Donker thema</string>
   <string name="pref_use_green_background">Groene achtergrond</string>
   <string name="pref_use_green_background_summary">Gebruik groene achtergrond voor ontvangen berichten</string>
+  <string name="unable_to_connect_to_keychain">Verbinden met OpenKeychain mislukt</string>
+  <string name="this_device_is_no_longer_in_use">Dit apparaat wordt niet meer gebruikt</string>
+  <string name="type_pc">Computer</string>
+  <string name="type_phone">GSM</string>
+  <string name="type_tablet">Tablet</string>
+  <string name="type_web">Webbrowser</string>
+  <string name="type_console">Console</string>
+  <string name="payment_required">Betaling vereist</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 955504d74..cc9ce2455 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -78,7 +78,6 @@
   <string name="clear_histor_msg">Czy na pewno usunąć wszystkie wiadomości powiązane z konwersacją?\n\n<b>Uwaga:</b> Działanie nie wpływa na wiadomości przechowywane na innych urządzeniach lub serwerach.</string>
   <string name="delete_messages">Usuń wiadomości</string>
   <string name="also_end_conversation">po czym zakończ tę rozmowę</string>
-  <string name="choose_presence">Wybierz widoczność dla kontaktu</string>
   <string name="send_unencrypted_message">Wyślij wiadomość bez szyfrowania</string>
   <string name="send_otr_message">Wyślij zaszyfrowaną wiadomość (OTR)</string>
   <string name="send_omemo_message">Wyślij wiadomość zaszyfrowaną OMEMO</string>
@@ -351,8 +350,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Usługa na pierwszym planie</string>
   <string name="pref_keep_foreground_service_summary">Uniemożliwia systemowi przerwanie połączenia</string>
-  <string name="pref_export_logs">Wyeksportuj historię rozmów</string>
-  <string name="pref_export_logs_summary">Zapisz historię na karcie SD</string>
   <string name="notification_export_logs_title">Zapisywanie historii na karcie SD...</string>
   <string name="choose_file">Wybierz plik</string>
   <string name="receiving_x_file">Odbieranie %1$s (ukończono %2$d%%)</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index ef7596008..a304a2e26 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">Deseja excluir todas as mensagens dessa conversa?\n\n<b>Atenção:</b> Isso não afetará mensagens armazenadas em outros dispositivos ou servidores.</string>
   <string name="delete_messages">Excluir mensagens</string>
   <string name="also_end_conversation">Encerrar essa conversa em seguida</string>
-  <string name="choose_presence">Selecione a presença para esse contato</string>
+  <string name="choose_presence">Selecione o dispositivo</string>
   <string name="send_unencrypted_message">Enviar mensagem não criptografada</string>
   <string name="send_message_to_x">Enviar mensagem para %s</string>
   <string name="send_otr_message">Enviar mensagem criptografada via OTR</string>
@@ -157,7 +157,9 @@
   <string name="account_status_regis_success">Registro efetuado com sucesso</string>
   <string name="account_status_regis_not_sup">O servidor não aceita o registro</string>
   <string name="account_status_security_error">Erro de segurança</string>
+  <string name="account_status_policy_violation">Violação de política</string>
   <string name="account_status_incompatible_server">Servidor incompatível</string>
+  <string name="account_status_stream_error">Erro de fluxo</string>
   <string name="encryption_choice_unencrypted">Descriptografada</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -218,6 +220,8 @@
   <string name="reception_failed">A recepção falhou</string>
   <string name="your_fingerprint">Sua impressão digital</string>
   <string name="otr_fingerprint">Impressão digital OTR</string>
+  <string name="otr_fingerprint_selected_message">Impressão digital OTR da mensagem</string>
+  <string name="openpgp_key_id">ID da chave OpenPGP</string>
   <string name="omemo_fingerprint">Impressão digital OMEMO</string>
   <string name="omemo_fingerprint_x509">Impressão digital v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Impressão digital OMEMO da mensagem</string>
@@ -356,8 +360,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Manter o serviço em segundo plano</string>
   <string name="pref_keep_foreground_service_summary">Impede que o sistema operacional encerre sua conexão.</string>
-  <string name="pref_export_logs">Exportar registros</string>
-  <string name="pref_export_logs_summary">Escreve os registros no cartão SD.</string>
   <string name="notification_export_logs_title">Escrevendo os registros no cartão SD</string>
   <string name="choose_file">Selecione o arquivo</string>
   <string name="receiving_x_file">Recebendo %1$s (completou %2$d%%)</string>
@@ -512,6 +514,7 @@
   <string name="pref_use_white_background_summary">Exibe a mensagens recebidas como texto preto em um fundo branco.</string>
   <string name="account_status_tor_unavailable">Rede Tor não disponível</string>
   <string name="account_status_bind_failure">Falha na associação</string>
+  <string name="account_status_host_unknown">O servidor não responde por esse domínio</string>
   <string name="server_info_broken">Quebrado</string>
   <string name="pref_presence_settings">Presença</string>
   <string name="pref_away_when_screen_off">Afastado quando a tela estiver desligada</string>
@@ -610,6 +613,7 @@
   <string name="device_does_not_support_battery_op">Seu dispositivo não suporta a desativação da otimização de bateria</string>
   <string name="show_password">Exibir a senha</string>
   <string name="registration_please_wait">Não foi possível efetuar o registro. Por favor, tente novamente mais tarde</string>
+  <string name="registration_password_too_weak">Falha no registro: Senha muito fraca</string>
   <string name="create_conference">Criar uma conferência</string>
   <string name="join_or_create_conference">Entrar ou criar uma conferência</string>
   <string name="conference_subject">Assunto</string>
@@ -628,4 +632,12 @@
   <string name="pref_theme_dark">Tema escuro</string>
   <string name="pref_use_green_background">Fundo verde</string>
   <string name="pref_use_green_background_summary">Usa um fundo verde no recebimento de mensagens.</string>
+  <string name="unable_to_connect_to_keychain">Não foi possível conectar ao OpenKeychain</string>
+  <string name="this_device_is_no_longer_in_use">Este dispositivo não está mais em uso</string>
+  <string name="type_pc">Computador</string>
+  <string name="type_phone">Celular</string>
+  <string name="type_tablet">Tablet</string>
+  <string name="type_web">Navegador web</string>
+  <string name="type_console">Console</string>
+  <string name="payment_required">É necessário efetuar pagamento</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 4596dcb18..bc8167fff 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -78,7 +78,6 @@
   <string name="clear_histor_msg">Deseja remover todas as mensagens nesta conversa?\n\n&lt;b&gt;Aviso:&lt;b&gt; Isto não irá influenciar mensagens guardadas noutros dispositivos ou servidores.</string>
   <string name="delete_messages">Remover mensagens</string>
   <string name="also_end_conversation">Terminar esta conversa depois</string>
-  <string name="choose_presence">Escolha a presença do contacto</string>
   <string name="send_unencrypted_message">Enviar mensagem não cifrada</string>
   <string name="send_otr_message">Enviar mensagem cifrada com OTR</string>
   <string name="send_omemo_message">Enviar mensagem cifrada com OMEMO</string>
@@ -350,8 +349,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Manter o serviço em primeiro plano</string>
   <string name="pref_keep_foreground_service_summary">Previne o sistema operativo de terminar a sua conexão</string>
-  <string name="pref_export_logs">Exportar os Logs</string>
-  <string name="pref_export_logs_summary">Escrever os logs para o cartão SD</string>
   <string name="notification_export_logs_title">A escrever os logs para o cartão SD</string>
   <string name="choose_file">Escolher ficheiro</string>
   <string name="receiving_x_file">A receber %1$s (%2$d%% concluído)</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index e1c94f128..4710d8964 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">Doresti sa stergi toate mesajele din aceasta conversatie?\n\n<b>Atentie:</b> Aceasta actiune nu va influenta mesajele aflate pe alte telefoane/tabelete/servere.</string>
   <string name="delete_messages">Sterge mesajele</string>
   <string name="also_end_conversation">Dupa, incheie conversatia</string>
-  <string name="choose_presence">Alege prezenta pentru a contacta</string>
+  <string name="choose_presence">Alege dispozitiv</string>
   <string name="send_unencrypted_message">Trimite mesaje necriptate</string>
   <string name="send_message_to_x">Trimite mesaj catre %s</string>
   <string name="send_otr_message">Trimite mesaj criptat cu OTR</string>
@@ -360,8 +360,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Pastreaza serviciul activ in prim plan</string>
   <string name="pref_keep_foreground_service_summary">Previne inchiderea conexiunii de catre sistemul de operare.</string>
-  <string name="pref_export_logs">Exporta jurnale</string>
-  <string name="pref_export_logs_summary">Scrie jurnal pe card SD</string>
   <string name="notification_export_logs_title">Se scrie jurnal pe card SD</string>
   <string name="choose_file">Alege un fisier</string>
   <string name="receiving_x_file">Primesc %1$s (%2$d%% complet)</string>
@@ -546,8 +544,8 @@
   <string name="verified_omemo_key_with_certificate">Verifica cheia OMEMO cu un certificat</string>
   <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">Trimite toate conexiunile prin reteaua Tor. Necesita OrBot</string>
+  <string name="pref_use_tor">Conectare prin Tor</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>
@@ -640,4 +638,10 @@ Emitent</string>
   <string name="pref_use_green_background_summary">Foloseste la mesajele primite un fundal verde</string>
   <string name="unable_to_connect_to_keychain">Nu s-a putut contacta OpenKeychain</string>
   <string name="this_device_is_no_longer_in_use">Acest dispozitiv nu mai este in uz</string>
+  <string name="type_pc">PC</string>
+  <string name="type_phone">Telefon mobil</string>
+  <string name="type_tablet">Tableta</string>
+  <string name="type_web">Navigator internet</string>
+  <string name="type_console">Consola</string>
+  <string name="payment_required">Este necesara o plata</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index a1a69c061..5d25af215 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -78,7 +78,6 @@
   <string name="clear_histor_msg">Вы хотите удалить все сообщения в этой беседе?\n\n<b>Предупреждение:</b> Данная операция не повлияет на сообщения, хранящиеся на других устройствах.</string>
   <string name="delete_messages">Удалить сообщения</string>
   <string name="also_end_conversation">Закончить эту беседу впоследствии</string>
-  <string name="choose_presence">Укажите статус для контакта</string>
   <string name="send_unencrypted_message">Отправить нешифрованное сообщение</string>
   <string name="send_message_to_x">Отправить сообщение для %s</string>
   <string name="send_otr_message">Отправить OTR защифрованное сообщение</string>
@@ -356,8 +355,6 @@
   <string name="conversations_foreground_service">Диалоги</string>
   <string name="pref_keep_foreground_service">Оставить службу на переднем плане</string>
   <string name="pref_keep_foreground_service_summary">Не позволяет операционной системе закрыть ваше соединение</string>
-  <string name="pref_export_logs">Экспорт истории</string>
-  <string name="pref_export_logs_summary">Записать историю на SD карту</string>
   <string name="notification_export_logs_title">Запись истории на SD карту</string>
   <string name="choose_file">Выберите файл</string>
   <string name="receiving_x_file">Получение %1$s (%2$d%% выполнено)</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index c21e2a73f..a850e802e 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -73,7 +73,6 @@
   <string name="clear_histor_msg">Chcete vymazať všetky správy v tejto konverzácii?\n\n<b>Varovanie:</b> Toto neovplyvní správy uložené v iných zariadeniach alebo serveroch.</string>
   <string name="delete_messages">Vymazať správy</string>
   <string name="also_end_conversation">Neskôr ukončiť konverzáciu</string>
-  <string name="choose_presence">Vybrať aktualizáciu stavu pre kontakt</string>
   <string name="send_unencrypted_message">Poslať nezašifrovanú správu</string>
   <string name="send_otr_message">Poslať OTR šifrovanú správu</string>
   <string name="send_omemo_message">Poslať OMEMO šifrovanú správu</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 358f2b281..a0f6b746d 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">Желите ли да обришете све поруке ове преписке?\n\n<b>Упозорење:</b> Ово неће утицати на поруке складиштене на осталим уређајима или серверима.</string>
   <string name="delete_messages">Обриши поруке</string>
   <string name="also_end_conversation">Окончај ову преписку након тога</string>
-  <string name="choose_presence">Избор присутности за контакта</string>
+  <string name="choose_presence">Изаберите уређај</string>
   <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
   <string name="send_message_to_x">Пошаљи поруку за %s</string>
   <string name="send_otr_message">Пошаљи ОТР шифровану поруку</string>
@@ -360,8 +360,6 @@
   <string name="conversations_foreground_service">Конверзација</string>
   <string name="pref_keep_foreground_service">Држи сервис у првом плану</string>
   <string name="pref_keep_foreground_service_summary">Спречава оперативни систем да прекине вашу везу</string>
-  <string name="pref_export_logs">Извези записе</string>
-  <string name="pref_export_logs_summary">Упис записа на СД картицу</string>
   <string name="notification_export_logs_title">Уписујем записе на СД картицу</string>
   <string name="choose_file">Изабери фајл</string>
   <string name="receiving_x_file">Примам %1$s (%2$d%% завршено)</string>
@@ -638,4 +636,10 @@
   <string name="pref_use_green_background_summary">Зелена позадина за примљене поруке</string>
   <string name="unable_to_connect_to_keychain">Не могох да се повежем са Отвореним кључарником</string>
   <string name="this_device_is_no_longer_in_use">Овај уређај више није у употреби</string>
+  <string name="type_pc">Рачунар</string>
+  <string name="type_phone">Мобилни телефон</string>
+  <string name="type_tablet">Таблет</string>
+  <string name="type_web">Веб прегледач</string>
+  <string name="type_console">Конзола</string>
+  <string name="payment_required">Захтевано је плаћање</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index c02738661..d40d6821e 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">Vill du ta bort alla meddelanden i denna konversation?\n\n<b>Varning:</b> Detta kommer inte påverka meddelanden lagrade på andra enheter eller servrar.</string>
   <string name="delete_messages">Ta bort meddelanden</string>
   <string name="also_end_conversation">Avsluta denna konversation efteråt</string>
-  <string name="choose_presence">Välj tillgänglighet till kontakt</string>
+  <string name="choose_presence">Välj enhet</string>
   <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
   <string name="send_message_to_x">Skicka meddelande till %s</string>
   <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
@@ -360,8 +360,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Håll tjänst i förgrunden</string>
   <string name="pref_keep_foreground_service_summary">Förehindrar operativsystemet att ta ner uppkopplingen</string>
-  <string name="pref_export_logs">Exportera loggar</string>
-  <string name="pref_export_logs_summary">Skriv loggar till SD-kort</string>
   <string name="notification_export_logs_title">Skriver loggar till SD-kort</string>
   <string name="choose_file">Välj fil</string>
   <string name="receiving_x_file">Tar emot %1$s (%2$d%% klart)</string>
@@ -636,4 +634,10 @@
   <string name="pref_use_green_background_summary">Använd grön bakgrund för mottagna meddelanden</string>
   <string name="unable_to_connect_to_keychain">Kan inte ansluta till OpenKeychain</string>
   <string name="this_device_is_no_longer_in_use">Denna enhet används inte längre</string>
+  <string name="type_pc">Dator</string>
+  <string name="type_phone">Mobiltelefon</string>
+  <string name="type_tablet">Surfplatta</string>
+  <string name="type_web">Webbläsare</string>
+  <string name="type_console">Konsoll</string>
+  <string name="payment_required">Betalning krävs</string>
 </resources>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index bd3d7e2d7..13dcd8cf5 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear_histor_msg">Bu sohbetteki bütün iletileri silmek istiyor musunuz?\n\n<b>Uyarı:</b>Başka cihazlardaki ya da sunuculardaki iletiler bundan etkilenmeyecektir.</string>
   <string name="delete_messages">İletileri sil</string>
   <string name="also_end_conversation">Sonrasında bu sohbeti sonlandır</string>
-  <string name="choose_presence">Kaynak kişiyi seçin</string>
+  <string name="choose_presence">Cihaz seç</string>
   <string name="send_unencrypted_message">Şifrelenmemiş ileti gönder</string>
   <string name="send_message_to_x">%s kişisine mesaj gönder</string>
   <string name="send_otr_message">OTR ile şifrelenmiş ileti gönder</string>
@@ -360,8 +360,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Ön planda çalışmaya devam etsin</string>
   <string name="pref_keep_foreground_service_summary">İşletim sisteminin bağlantınızı koparmasına engel olur</string>
-  <string name="pref_export_logs">Kayıtları dışa aktar</string>
-  <string name="pref_export_logs_summary">Kayıtları SD karta yaz</string>
   <string name="notification_export_logs_title">Kayıtları SD karta yazıyor</string>
   <string name="choose_file">Dosya seç</string>
   <string name="receiving_x_file">%1$s alıyor/(%2$d%% tamamlandı)</string>
@@ -633,4 +631,10 @@
   <string name="pref_use_green_background_summary">Gelen iletiler için yeşil arka plan kullan</string>
   <string name="unable_to_connect_to_keychain">OpenKeychain\'e bağlanılamıyor</string>
   <string name="this_device_is_no_longer_in_use">Bu cihaz artık kullanılmıyor</string>
+  <string name="type_pc">Bilgisayar</string>
+  <string name="type_phone">Mobil telefon</string>
+  <string name="type_tablet">Tablet</string>
+  <string name="type_web">Web tarayıcı</string>
+  <string name="type_console">Konsol</string>
+  <string name="payment_required">Ödeme gerekli</string>
 </resources>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index a72c1c2b2..517af6f59 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -78,7 +78,6 @@
   <string name="clear_histor_msg">Бажаєте видалити всі повідомлення з цієї розмови?\n\n<b>Увага:</b> Це не вплине на повідомлення, які знаходяться на інших пристроях або серверах.</string>
   <string name="delete_messages">Видалити повідомлення</string>
   <string name="also_end_conversation">Завершити цю розмову опісля</string>
-  <string name="choose_presence">Вибрати присутність для контакту</string>
   <string name="send_unencrypted_message">Відправити незашифроване повідомлення</string>
   <string name="send_message_to_x">Відправити повідомлення до %s</string>
   <string name="send_otr_message">Відправити повідомлення, зашифроване OTR</string>
@@ -360,8 +359,6 @@
   <string name="conversations_foreground_service">Розмови</string>
   <string name="pref_keep_foreground_service">Підтримувати сервіс на першому плані</string>
   <string name="pref_keep_foreground_service_summary">Не дає операційній системі припиняти Ваш зв\'язок</string>
-  <string name="pref_export_logs">Експортувати журнали</string>
-  <string name="pref_export_logs_summary">Записати журнали на носій</string>
   <string name="notification_export_logs_title">Записую журнали на носій</string>
   <string name="choose_file">Вибрати файл</string>
   <string name="receiving_x_file">Отримання %1$s (%2$d%% завершено)</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index b015ade20..4e094fcb8 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -76,7 +76,6 @@
   <string name="clear_histor_msg">Bạn có muốn xoá toàn bộ tin nhắn trong hội thoại này?\n\n<b>Cảnh báo:</b> Thao tác này sẽ không ảnh hưởng đến tin nhắn đã lưu trên các thiết bị hoặc máy chủ khác.</string>
   <string name="delete_messages">Xoá tin nhắn</string>
   <string name="also_end_conversation">Dừng hội thoại này sau đó</string>
-  <string name="choose_presence">Chọn sự hiện diện đối với liên hệ</string>
   <string name="send_unencrypted_message">Gửi tin nhắn không mã hoá</string>
   <string name="send_otr_message">Gửi tin nhắn mã hoá OTR</string>
   <string name="send_omemo_message">Gửi tin nhắn mã hoá OMEMO</string>
@@ -326,8 +325,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Giữ dịch vụ luôn chạy</string>
   <string name="pref_keep_foreground_service_summary">Ngăn hệ điều hành ngắt kết nối của bạn</string>
-  <string name="pref_export_logs">Xuất nhật ký</string>
-  <string name="pref_export_logs_summary">Chép nhật ký vào thẻ SD</string>
   <string name="notification_export_logs_title">Đang chép nhật ký vào thẻ SD</string>
   <string name="choose_file">Chọn tập tin</string>
   <string name="receiving_x_file">Đang nhận %1$s (đã hoàn tất %2$d%%)</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 9e766e5fd..087b9e51f 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -78,7 +78,6 @@
   <string name="clear_histor_msg">删除该会话中所有信息？\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息。</string>
   <string name="delete_messages">删除消息</string>
   <string name="also_end_conversation">结束此会话以后</string>
-  <string name="choose_presence">添加在线用户至联系人</string>
   <string name="send_unencrypted_message">发送未加密的信息</string>
   <string name="send_message_to_x">发信息给 %s</string>
   <string name="send_otr_message">发送 OTR 加密信息</string>
@@ -356,8 +355,6 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">保持前台服务</string>
   <string name="pref_keep_foreground_service_summary">防止操作系统中断你的连接</string>
-  <string name="pref_export_logs">导出日志</string>
-  <string name="pref_export_logs_summary">将日志写入 SD 卡</string>
   <string name="notification_export_logs_title">正在将日志写入 SD 卡</string>
   <string name="choose_file">选择文件</string>
   <string name="receiving_x_file">接收中 %1$s (已完成 %2$d%%)</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 555a6bb15..7f48dd19b 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -56,7 +56,6 @@
   <string name="clear_conversation_history">清除對話記錄</string>
   <string name="clear_histor_msg">你確定要刪除該對話中所有訊息嗎？\n\n<b>警告:</b> 這將不會影響其他設備或伺服器儲存的訊息。</string>
   <string name="delete_messages">刪除訊息</string>
-  <string name="choose_presence">選擇狀態訊息</string>
   <string name="send_otr_message">發送 OTR 加密訊息</string>
   <string name="send_pgp_message">發送 OpenPGP 加密訊息</string>
   <string name="your_nick_has_been_changed">用戶名稱修改成功</string>