pulled new translations from transifex

26 files changed, 879 insertions, 285 deletions

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 586a58cf..08d1dcbe 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">دقائق %d منذ</string>
   <string name="unread_conversations">محادثات غير مقروءة</string>
   <string name="sending">ارسال</string>
-  <string name="encrypted_message">رسالة مشفّرة .. الرجاء الإنتظار</string>
   <string name="nick_in_use">اللقب مستخدم من قبل</string>
   <string name="admin">مدير</string>
   <string name="owner">مالك</string>
@@ -90,7 +89,6 @@
   <string name="contact_has_no_pgp_key">Conversations::لا يستطيع تشفير الرساله\n\n<small>من فضلك أخبر صديقك بتنصيب تطبيق OpenPGP.</small></string>
   <string name="no_pgp_keys">OpenPGP-لايوجد مفاتيح</string>
   <string name="contacts_have_no_pgp_keys">Conversations::لا يستطيع تشفير الرساله\n\n<small>من فضلك أخبر صديقك بتنصيب تطبيق OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>تلقيت رساله مشفّرة .. لمسه بأناملك لعرضها.</i></string>
   <string name="pref_general">عام</string>
   <string name="pref_xmpp_resource">الريسورس</string>
   <string name="pref_accept_files">ضبط استقبال الملفات</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 030432ad..9988b9de 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">преди %d минути</string>
   <string name="unread_conversations">непрочетени разговори</string>
   <string name="sending">изпращане...</string>
-  <string name="encrypted_message">Дешифроване на съобщението. Моля, изчакайте...</string>
   <string name="nick_in_use">Псевдонимът вече се използва</string>
   <string name="admin">Администратор</string>
   <string name="owner">Собственик</string>
@@ -93,7 +92,6 @@
   <string name="contact_has_no_pgp_key">Conversations не може да шифрова съобщенията Ви, тъй като Вашият контакт не обявява публичния си ключ.\n\n<small>Моля, помолете го/я да инсталира и настрои OpenPGP.</small></string>
   <string name="no_pgp_keys">Не са открити OpenPGP ключове</string>
   <string name="contacts_have_no_pgp_keys">Conversations не може да шифрова съобщенията Ви, тъй като Вашите контакти не обявяват публичните си ключове.\n\n<small>Моля, помолете го да инсталират и настроят OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Получено е шифровано съобщение. Докоснете, за да го прегледате и дешифровате.</i></string>
   <string name="pref_general">Общи</string>
   <string name="pref_xmpp_resource">XMPP ресурс</string>
   <string name="pref_xmpp_resource_summary">Името, с което се определя този клиент</string>
@@ -172,7 +170,6 @@
   <string name="passwords_do_not_match">Паролите са различни</string>
   <string name="invalid_jid">Това не е правилен Jabber идентификатор</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>
@@ -212,7 +209,6 @@
   <string name="this_device_omemo_fingerprint">Собствен отпечатък OMEMO</string>
   <string name="other_devices">Други устройства</string>
   <string name="trust_omemo_fingerprints">Доверяване на отпечатъци OMEMO</string>
-  <string name="fetching_keys">Изтегляне на ключовете...</string>
   <string name="done">Готово</string>
   <string name="verify">Потвърждаване</string>
   <string name="decrypt">Дешифроване</string>
@@ -442,7 +438,6 @@
   <string name="offering_x_file">Предлагане на %s</string>
   <string name="hide_offline">Скриване на тези извън линия</string>
   <string name="disable_account">Деактивиране на профила</string>
-  <string name="contact_is_typing">%s пише...</string>
   <string name="contact_has_stopped_typing">%s спря да пише</string>
   <string name="pref_chat_states">Известия за писането</string>
   <string name="pref_chat_states_summary">Позволяване на контакта Ви да вижда, когато пишете ново съобщение</string>
@@ -485,7 +480,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_dns_timeout">Време на изчакване на DNS</string>
   <string name="server_info_broken">Повредено</string>
   <string name="pref_presence_settings">Настройки за присъствието</string>
   <string name="pref_away_when_screen_off">Отсъстващ, когато екранът е изключен</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 806ed7a0..363eb20b 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%de minuts abans</string>
   <string name="unread_conversations">Converses sense llegir o no llegides</string>
   <string name="sending">enviant…</string>
-  <string name="encrypted_message">Desxifrant missatge. Espera si us plau…</string>
   <string name="nick_in_use">El sobrenom ja està en ús</string>
   <string name="admin">Administrador</string>
   <string name="owner">Propietari</string>
@@ -90,7 +89,6 @@
   <string name="contact_has_no_pgp_key">Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\n<small>Si us plau, demana al teu contacte que configuri OpenPGP.</small></string>
   <string name="no_pgp_keys">No hi ha claus OPENPGP trobades</string>
   <string name="contacts_have_no_pgp_keys">Coversations no és possible xifrar les teves converses perquè els teus contactes no han mostrat la seva clau pública.\n\n<small> Si us plau, pregunti als seus contactes per configurar OpenPGP .</small></string>
-  <string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string>
   <string name="pref_general">General</string>
   <string name="pref_xmpp_resource">Recursos XMPP</string>
   <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
@@ -165,7 +163,6 @@
   <string name="passwords_do_not_match">Contrasenyes no coincideixen</string>
   <string name="invalid_jid">Aquesta identificació de Jabber no és vàlida</string>
   <string name="error_out_of_memory">Fora de la capacitat de la mèmoria. L\'imatge és massa gran</string>
-  <string name="add_phone_book_text">Voleu afegir %s a la teva llista de contactes del telèfon?</string>
   <string name="contact_status_online">En línia</string>
   <string name="contact_status_free_to_chat">Lliure per xatejar</string>
   <string name="contact_status_away">Fora</string>
@@ -406,7 +403,6 @@
   <string name="offering_x_file">Oferint %s</string>
   <string name="hide_offline">Amaga el fora de línia</string>
   <string name="disable_account">Deshabilita el compte</string>
-  <string name="contact_is_typing">%s està escrivint...</string>
   <string name="contact_has_stopped_typing">%s ha deixat d\'escriure</string>
   <string name="pref_chat_states">Notificacions d\'escriptura</string>
   <string name="pref_chat_states_summary">Permet el teu contacte saber quan estàs escrivint un missatge nou</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 0c5dca55..eb80a2ce 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">před %d minutami</string>
   <string name="unread_conversations">nepřečtené konverzace</string>
   <string name="sending">odesílám…</string>
-  <string name="encrypted_message">Dešifruji zprávu. Chvíli strpení…</string>
   <string name="nick_in_use">Přezdívka se již používá</string>
   <string name="admin">Administrátor</string>
   <string name="owner">Vlastník</string>
@@ -74,6 +73,7 @@
   <string name="clear_conversation_history">Smaže historii konverzací</string>
   <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="send_unencrypted_message">Odeslat nešifrovanou zprávu</string>
   <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
@@ -92,7 +92,6 @@
   <string name="contact_has_no_pgp_key">Není možné zašifrovat zprávu v aplikaci Konverzace, protože druhá strana neoznamuje svůj veřejný klíč.\n\n<small>Požádejte svůj kontakt ať si nastaví OpenPGP.</small></string>
   <string name="no_pgp_keys">Nebyly nalezeny žádné OpenPGP klíče</string>
   <string name="contacts_have_no_pgp_keys">Není možné zašifrovat zprávy v aplikaci Konverzace, protože kontakty neoznamují svůj veřejný klíč.\n\n<small>Požádejte své kontakty ať si nastaví OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Byla přijata šifrovaná zpráva. Ťukni pro dešifrování a přečtení.</i></string>
   <string name="pref_general">Obecné</string>
   <string name="pref_xmpp_resource">XMPP zdroj</string>
   <string name="pref_xmpp_resource_summary">Jméno se kterým se tento klient identifikuje</string>
@@ -171,7 +170,6 @@
   <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 telefonního seznamu?</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>
@@ -211,7 +209,6 @@
   <string name="this_device_omemo_fingerprint">Můj OMEMO otisk</string>
   <string name="other_devices">Ostatní přístroje</string>
   <string name="trust_omemo_fingerprints">Věřit OMEMO otiskům</string>
-  <string name="fetching_keys">Získávám klíče...</string>
   <string name="done">Hotovo</string>
   <string name="verify">Ověřit</string>
   <string name="decrypt">Dešifrovat</string>
@@ -334,6 +331,9 @@
   <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>
   <string name="download_x_file">Stáhnout %s</string>
@@ -438,7 +438,6 @@
   <string name="offering_x_file">Nabízím %s</string>
   <string name="hide_offline">Skrýt offline</string>
   <string name="disable_account">Vypnout účet</string>
-  <string name="contact_is_typing">%s píše...</string>
   <string name="contact_has_stopped_typing">%s přestal(a) psát</string>
   <string name="pref_chat_states">Upozornění při psaní</string>
   <string name="pref_chat_states_summary">Oznamovat kontaktům že píšete novou zprávu</string>
@@ -483,6 +482,19 @@
   <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_dns_timeout">Vypršení v DNS</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 vypnutém zvuku 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>
+  <string name="captcha_ocr">Captcha text</string>
+  <string name="captcha_required">Captcha vyžadována</string>
+  <string name="captcha_hint">opište text z obrázku</string>
+  <string name="certificate_chain_is_not_trusted">Řetězec certifikátů není důvěryhodný</string>
+  <string name="jid_does_not_match_certificate">Jabber ID neodpovídá certifikátu</string>
+  <string name="action_renew_certificate">Obnovit certifikát</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index b7cc4440..e457c46c 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">vor %d Minuten</string>
   <string name="unread_conversations">ungelesene Unterhaltungen</string>
   <string name="sending">senden…</string>
-  <string name="encrypted_message">Nachricht wird entschlüsselt. Bitte warten …</string>
   <string name="nick_in_use">Nickname wird bereits verwendet</string>
   <string name="admin">Administrator</string>
   <string name="owner">Eigentümer</string>
@@ -42,9 +41,9 @@
   <string name="unblock_domain_text">Alle Kontakte von %s entsperren?</string>
   <string name="contact_blocked">Kontakt gesperrt</string>
   <string name="remove_bookmark_text">Möchtest du %s von deiner Kontaktliste entfernen? Die Unterhaltung mit dieser Konferenz wird dabei nicht entfernt.</string>
-  <string name="register_account">Neues Konto auf dem Server erstellen</string>
+  <string name="register_account">Neues Konto auf Server erstellen</string>
   <string name="change_password_on_server">Passwort ändern</string>
-  <string name="share_with">Teile mit…</string>
+  <string name="share_with">Teilen mit…</string>
   <string name="start_conversation">Unterhaltung beginnen</string>
   <string name="invite_contact">Kontakt einladen</string>
   <string name="contacts">Kontakte</string>
@@ -69,7 +68,7 @@
   <string name="add_contact">Kontakt hinzufügen</string>
   <string name="send_failed">Zustellung fehlgeschlagen</string>
   <string name="send_rejected">abgelehnt</string>
-  <string name="preparing_image">Bereite Bild für die Übertragung vor</string>
+  <string name="preparing_image">Bild wird für Übertragung vorbereitet</string>
   <string name="action_clear_history">Verlauf löschen</string>
   <string name="clear_conversation_history">Verlauf löschen</string>
   <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>
@@ -93,7 +92,6 @@
   <string name="contact_has_no_pgp_key">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil dein Kontakt seinen oder ihren Schlüssel nicht preisgibt.\n\n<small>Bitte sag deinem Kontakt, er oder sie möge OpenPGP einrichten.</small></string>
   <string name="no_pgp_keys">Keine OpenPGP-Schlüssel gefunden</string>
   <string name="contacts_have_no_pgp_keys">Conversations ist nicht in der Lage, deine Nachrichten zu verschlüsseln, weil deine Kontakte ihre Schlüssel nicht preisgeben.\n\n<small>Bitte sage deinen Kontakten, sie mögen OpenPGP einrichten.</small></string>
-  <string name="encrypted_message_received"><i>Verschlüsselte Nachricht erhalten. Drücke hier, um sie zu entschlüsseln und anzuzeigen.</i></string>
   <string name="pref_general">Allgemeines</string>
   <string name="pref_xmpp_resource">XMPP-Ressource</string>
   <string name="pref_xmpp_resource_summary">Der Name, mit dem sich der Client selbst identifiziert</string>
@@ -119,7 +117,7 @@
   <string name="openpgp_error">Fehler mit OpenKeychain</string>
   <string name="error_decrypting_file">Fehler beim Entschlüsseln der Datei</string>
   <string name="accept">Annehmen</string>
-  <string name="error">Ein unbekannter Fehler ist aufgetreten</string>
+  <string name="error">Ein Fehler ist aufgetreten</string>
   <string name="pref_grant_presence_updates">Online-Status</string>
   <string name="pref_grant_presence_updates_summary">Erlaube neu hinzugefügten Kontakten meinen Online-Status zu sehen und frage um Erlaubnis, ihren sehen zu dürfen</string>
   <string name="subscriptions">Abonnements</string>
@@ -172,7 +170,6 @@
   <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
   <string name="invalid_jid">Ungültige Jabber-ID</string>
   <string name="error_out_of_memory">Zu wenig Speicher vorhanden. Das Bild ist zu groß</string>
-  <string name="add_phone_book_text">Möchtest du %s zum Telefonbuch hinzufügen?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">bereit</string>
   <string name="contact_status_away">abwesend</string>
@@ -212,7 +209,6 @@
   <string name="this_device_omemo_fingerprint">Eigener OMEMO-Fingerabdruck</string>
   <string name="other_devices">Andere Geräte</string>
   <string name="trust_omemo_fingerprints">OMEMO-Fingerabdruck vertrauen</string>
-  <string name="fetching_keys">Schlüssel abrufen...</string>
   <string name="done">Erledigt</string>
   <string name="verify">Überprüfen</string>
   <string name="decrypt">Entschlüsseln</string>
@@ -250,7 +246,7 @@
   <string name="error_publish_avatar_no_server_support">Dein Server unterstützt die Veröffentlichung von Avataren nicht.</string>
   <string name="private_message">private Nachricht:</string>
   <string name="private_message_to">privat an %s:</string>
-  <string name="send_private_message_to">Sende private Nachricht an %s…</string>
+  <string name="send_private_message_to">Private Nachricht an %s senden…</string>
   <string name="connect">Verbinden</string>
   <string name="account_already_exists">Das Konto existiert bereits</string>
   <string name="next">Weiter</string>
@@ -285,7 +281,7 @@
   <string name="title_pref_enable_quiet_hours">Ruhige Stunden aktivieren</string>
   <string name="pref_quiet_hours_summary">Benachrichtigungen sind während der ruhigen Stunden stumm.</string>
   <string name="pref_use_larger_font">Schrift vergrößern</string>
-  <string name="pref_use_larger_font_summary">Größere Schrift verwenden</string>
+  <string name="pref_use_larger_font_summary">Größere Schriften für die gesamte App verwenden</string>
   <string name="pref_use_send_button_to_indicate_status">\"Senden\"-Schaltfläche zeigt Online-Status an</string>
   <string name="pref_use_indicate_received">Empfangsbestätigungen anfragen</string>
   <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häkchen markiert. Bitte beachte, dass dies nicht in allen Fällen funktioniert.</string>
@@ -333,21 +329,21 @@
   <string name="smp_requested">Kontakt fordert eine Überprüfung an</string>
   <string name="no_otr_session_found">Keine gültige OTR-Sitzung gefunden!</string>
   <string name="conversations_foreground_service">Conversations</string>
-  <string name="pref_keep_foreground_service">Den Dienst im Vordergrund ausführen.</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 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>
-  <string name="download_x_file">%s wird heruntergeladen</string>
+  <string name="receiving_x_file">Empfange %1$s (%2$d%% abgeschlossen)</string>
+  <string name="download_x_file">%s herunterladen</string>
   <string name="file">Datei</string>
   <string name="open_x_file">%s öffnen</string>
   <string name="sending_file">Senden (%1$d%% abgeschlossen)</string>
-  <string name="preparing_file">Datei wird für den Versand vorbereitet</string>
+  <string name="preparing_file">Datei wird für die Übertragung vorbereitet</string>
   <string name="x_file_offered_for_download">%s zum Herunterladen angeboten</string>
-  <string name="cancel_transmission">Datei-Übertragung abbrechen</string>
-  <string name="file_transmission_failed">Datei-Übertragung fehlgeschlagen</string>
+  <string name="cancel_transmission">Übertragung abbrechen</string>
+  <string name="file_transmission_failed">Übertragung fehlgeschlagen</string>
   <string name="file_deleted">Datei wurde gelöscht</string>
   <string name="no_application_found_to_open_file">Keine Anwendung zum Öffnen der Datei gefunden</string>
   <string name="could_not_verify_fingerprint">Fingerabdruck konnte nicht überprüft werden</string>
@@ -357,7 +353,7 @@
   <string name="pref_show_dynamic_tags_summary">Schreibgeschütze Tags unterhalb der Kontakte anzeigen</string>
   <string name="enable_notifications">Benachrichtigungen aktivieren</string>
   <string name="conference_with">Konferenz erstellen mit…</string>
-  <string name="no_conference_server_found">Konferenz-Server kann nicht gefunden werden</string>
+  <string name="no_conference_server_found">Kein Konferenz-Server gefunden</string>
   <string name="conference_creation_failed">Erstellen der Konferenz fehlgeschlagen!</string>
   <string name="conference_created">Konferenz erstellt!</string>
   <string name="secret_accepted">Schlüssel akzeptiert!</string>
@@ -435,14 +431,13 @@
   <string name="apk">Android App</string>
   <string name="vcard">Kontakt</string>
   <string name="received_x_file">%s empfangen</string>
-  <string name="disable_foreground_service">Vordergrund-Dienst beenden</string>
+  <string name="disable_foreground_service">Vordergrund-Dienst deaktivieren</string>
   <string name="touch_to_open_conversations">Antippen, um Conversations zu öffnen</string>
   <string name="avatar_has_been_published">Avatar wurde gespeichert</string>
   <string name="sending_x_file">%s wird gesendet</string>
   <string name="offering_x_file">%s wird angeboten</string>
   <string name="hide_offline">Offline verstecken</string>
   <string name="disable_account">Konto abschalten</string>
-  <string name="contact_is_typing">%s schreibt…</string>
   <string name="contact_has_stopped_typing">%s schreibt nicht mehr</string>
   <string name="pref_chat_states">Tipp-Benachrichtigung</string>
   <string name="pref_chat_states_summary">Informiere deine Kontakte, wenn du eine Nachricht eintippst.</string>
@@ -485,14 +480,13 @@
   <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_dns_timeout">Zeitüberschreitung bei der Namensauflösung</string>
   <string name="server_info_broken">Fehlerhaft</string>
   <string name="pref_presence_settings">Status Einstellungen</string>
-  <string name="pref_away_when_screen_off">Abwesend</string>
-  <string name="pref_away_when_screen_off_summary">Setze deinen Status auf abwesend, wenn dein Bildschirm abgeschaltet ist</string>
-  <string name="pref_xa_on_silent_mode">Nicht verfügbar</string>
-  <string name="pref_xa_on_silent_mode_summary">Setze deinen Status auf nicht verfügbar, wenn dein Gerät stumm geschaltet ist</string>
-  <string name="action_add_account_with_certificate">Kontakt mit Zertifikat hinzufügen</string>
+  <string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string>
+  <string name="pref_away_when_screen_off_summary">Setzt deinen Status auf \"abwesend\", solange dein Bildschirm abgeschaltet ist</string>
+  <string name="pref_xa_on_silent_mode">Nicht verfügbar bei Stummschaltung</string>
+  <string name="pref_xa_on_silent_mode_summary">Setzt deinen Status auf \"nicht verfügbar\", solange dein Gerät stummgeschaltet ist</string>
+  <string name="action_add_account_with_certificate">Konto mit Zertifikat hinzufügen</string>
   <string name="unable_to_parse_certificate">Zertifikat kann nicht gelesen werden</string>
   <string name="authenticate_with_certificate">Leer lassen, um mit Zertifikat anzumelden</string>
   <string name="captcha_ocr">Captcha Text</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index ed38d0c0..cd8f9e44 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">πριν από %d λεπτά</string>
   <string name="unread_conversations">μη αναγνωσμένες Συζητήσεις</string>
   <string name="sending">αποστολή...</string>
-  <string name="encrypted_message">Αποκρυπτογράφηση μηνύματος. Παρακαλώ περιμένετε...</string>
   <string name="nick_in_use">Το ψευδώνυμο είναι ήδη σε χρήση</string>
   <string name="admin">Διαχειριστής</string>
   <string name="owner">Κάτοχος</string>
@@ -90,7 +89,6 @@
   <string name="contact_has_no_pgp_key">Το Conversations αδυνατεί να κρυπτογραφήσει τα μηνύματά σας γιατί η επαφή σας δεν ανακοινώνει το δημόσιο κλειδί της.\n\n<small>Παρακαλώ ζητήστε από την επαφή σας να εγκαταστήσει το OpenPGP.</small></string>
   <string name="no_pgp_keys">Δεν βρέθηκαν κλειδιά OpenPGP</string>
   <string name="contacts_have_no_pgp_keys">Το Conversations αδυνατεί να κρυπτογραφήσει τα μηνύματά σας γιατί οι επαφές σας δεν ανακοινώνουν το δημόσιο κλειδί τους.\n\n<small>Παρακαλώ ζητήστε από τις επαφές σας να εγκαταστήσουν το OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Λήψη κρυπτογραφημένου μηνύματος. Επιλέξτε για ανάγνωση και αποκρυπτογράφηση.</i></string>
   <string name="pref_general">Γενικά</string>
   <string name="pref_xmpp_resource">πόρος XMPP</string>
   <string name="pref_xmpp_resource_summary">Το όνομα με το οποίο ταυτοποιείται αυτό το πρόγραμμα-πελάτης</string>
@@ -165,7 +163,6 @@
   <string name="passwords_do_not_match">Τα συνθηματικά δεν ταιριάζουν</string>
   <string name="invalid_jid">Αυτή δεν είναι έγκυρη ταυτότητα Jabber</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>
@@ -406,7 +403,6 @@
   <string name="offering_x_file">Προσφορά του %s</string>
   <string name="hide_offline">Απόκρυψη των εκτός σύνδεσης</string>
   <string name="disable_account">Απενεργοποίηση λογαριασμού</string>
-  <string name="contact_is_typing">Ο χρήστης %s γράφει...</string>
   <string name="contact_has_stopped_typing">Ο χρήστης %s σταμάτησε να γράφει</string>
   <string name="pref_chat_states">Ειδοποιήσεις πληκτρολόγησης</string>
   <string name="pref_chat_states_summary">Επιτρέψτε στην επαφή σας να γνωρίζει πότε γράφετε ένα νέο μήνυμα</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index cdddfb16..41e0a666 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">hace %d min</string>
   <string name="unread_conversations">conversaciones por leer</string>
   <string name="sending">enviando…</string>
-  <string name="encrypted_message">Descifrando mensaje. Espera por favor…</string>
   <string name="nick_in_use">El apodo ya está en uso</string>
   <string name="admin">Administrador</string>
   <string name="owner">Propietario</string>
@@ -74,7 +73,7 @@
   <string name="clear_conversation_history">Limpiar historial de conversación</string>
   <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">Terminar esta conversación después</string>
+  <string name="also_end_conversation">Además, terminar esta conversación</string>
   <string name="choose_presence">Selecciona recurso del contacto</string>
   <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
   <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
@@ -93,7 +92,6 @@
   <string name="contact_has_no_pgp_key">Conversations no ha podido cifrar tus mensajes porque tu contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
   <string name="no_pgp_keys">Claves OpenPGP no encontradas</string>
   <string name="contacts_have_no_pgp_keys">Conversations no ha podido cifrar tus mensajes porque tus contactos no están anunciando su clave publica.\n\n<small>Por favor, pide a tus contactos que configuren OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Mensaje cifrado recibido. Pulsa para ver.</i></string>
   <string name="pref_general">General</string>
   <string name="pref_xmpp_resource">Recurso</string>
   <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string>
@@ -172,7 +170,6 @@
   <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 del teléfono?</string>
   <string name="contact_status_online">Disponible</string>
   <string name="contact_status_free_to_chat">Hablador</string>
   <string name="contact_status_away">Ausente</string>
@@ -212,7 +209,6 @@
   <string name="this_device_omemo_fingerprint">Tu huella digital OMEMO</string>
   <string name="other_devices">Otros dispositivos</string>
   <string name="trust_omemo_fingerprints">Huellas digitales OMEMO de confianza</string>
-  <string name="fetching_keys">Buscando claves...</string>
   <string name="done">Hecho</string>
   <string name="verify">Verificar</string>
   <string name="decrypt">Descifrar</string>
@@ -442,7 +438,6 @@
   <string name="offering_x_file">Ofreciendo %s</string>
   <string name="hide_offline">Ocultar desconectados</string>
   <string name="disable_account">Deshabilitar Cuenta</string>
-  <string name="contact_is_typing">%s está escribiendo...</string>
   <string name="contact_has_stopped_typing">%s ha dejado de escribir</string>
   <string name="pref_chat_states">Notificación de escritura</string>
   <string name="pref_chat_states_summary">Permite a tus contactos saber cuando estás escribiendo un nuevo mensaje</string>
@@ -485,7 +480,6 @@
   <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_dns_timeout">Timeout en DNS</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>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 86f39b0f..28efc8d2 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d min lehenago</string>
   <string name="unread_conversations">irakurri gabeko elkarrizketak</string>
   <string name="sending">bidaltzen…</string>
-  <string name="encrypted_message">Mezua desenkriptatzen. Mesedez itxaron…</string>
   <string name="nick_in_use">Ezizena erabilita dagoeneko</string>
   <string name="admin">Administratzailea</string>
   <string name="owner">Jabea</string>
@@ -74,6 +73,7 @@
   <string name="clear_conversation_history">Elkarrizketa historia garbitu</string>
   <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_otr_message">OTRz enkriptatutako mezua bidali</string>
@@ -92,7 +92,6 @@
   <string name="contact_has_no_pgp_key">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\n<small>Mesedez eskatu ezaiozu zure kontaktuari openPGP konfigura dezan.</small></string>
   <string name="no_pgp_keys">Ez da OpenPGP gakorik aurkitu</string>
   <string name="contacts_have_no_pgp_keys">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktuak haien gako publikoa jakinarazten ez daudelako.\n\n<small>Mesedez eskatu ezaiezu zure kontakuei OpenPGP konfigura dezaten.</small></string>
-  <string name="encrypted_message_received"><i>Enkriptatutako mezua jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
   <string name="pref_general">Orokorrak</string>
   <string name="pref_xmpp_resource">XMPP baliabidea</string>
   <string name="pref_xmpp_resource_summary">Bezero honek bere burua aurkezteko erabiltzen duen izena</string>
@@ -171,7 +170,6 @@
   <string name="passwords_do_not_match">Pasahitzak ez dute bat egiten</string>
   <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
   <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
-  <string name="add_phone_book_text">%s zure telefono kontaktu zerrendara gehitu nahi al duzu?</string>
   <string name="contact_status_online">konektatuta</string>
   <string name="contact_status_free_to_chat">hitzegiteko aske</string>
   <string name="contact_status_away">kanpoan</string>
@@ -211,7 +209,6 @@
   <string name="this_device_omemo_fingerprint">Norberaren OMEMO hatz-marka</string>
   <string name="other_devices">Beste gailuak</string>
   <string name="trust_omemo_fingerprints">OMEMO hatz-marketaz fidatu</string>
-  <string name="fetching_keys">Gakoak eskuratzen...</string>
   <string name="done">Eginda</string>
   <string name="verify">Egiaztatu</string>
   <string name="decrypt">Desenkriptatu</string>
@@ -334,6 +331,9 @@
   <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>
   <string name="download_x_file">%s deskargatu</string>
@@ -438,7 +438,6 @@
   <string name="offering_x_file">%s eskeintzen...</string>
   <string name="hide_offline">Lineaz kanpokoak ezkutatu</string>
   <string name="disable_account">Kontua ezgaitu</string>
-  <string name="contact_is_typing">%s idazten ari da...</string>
   <string name="contact_has_stopped_typing">%s(e)k idazteari utzi dio</string>
   <string name="pref_chat_states">Idazketa jakinarazpenak</string>
   <string name="pref_chat_states_summary">Zure kontaktuak mezu berri bat noiz idazten ari zaren jakin dezan baimendu</string>
@@ -481,6 +480,19 @@
   <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_dns_timeout">DNSan denboraz kanpoko arazoa</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>
+  <string name="pref_away_when_screen_off_summary">Zure baliabidea urrun bezala markatzen du pantaila itzalita dagoenean</string>
+  <string name="pref_xa_on_silent_mode">Ez eskuragarri modu isilean</string>
+  <string name="pref_xa_on_silent_mode_summary">Zure baliabidea ez eskuragarri bezala markatzen du mugikorra modu isilean dagoenean</string>
+  <string name="action_add_account_with_certificate">Kontua ziurtagiriarekin gehitu</string>
+  <string name="unable_to_parse_certificate">Ezin izan da ziurtagiria aztertu</string>
+  <string name="authenticate_with_certificate">Utzi hutsik ziurtagiririk gabe autentifikatzeko</string>
+  <string name="captcha_ocr">Captcharen testua</string>
+  <string name="captcha_required">Captcha beharrezkoa da</string>
+  <string name="captcha_hint">Sartu irudiaren testua</string>
+  <string name="certificate_chain_is_not_trusted">Ziurtagiriaren katea ez da fidagarria</string>
+  <string name="jid_does_not_match_certificate">Jabber IDa ez du ziurtagiriarekin bat egiten</string>
+  <string name="action_renew_certificate">Ziurtagiria berriztu</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index b6c5f0da..a5a2d523 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">Il y a %d minutes</string>
   <string name="unread_conversations">Conversations non lues</string>
   <string name="sending">Envoi…</string>
-  <string name="encrypted_message">Déchiffrement du message. Veuillez patienter...</string>
   <string name="nick_in_use">Cet identifiant est déjà utilisé.</string>
   <string name="admin">Administrateur</string>
   <string name="owner">Propriétaire</string>
@@ -74,6 +73,7 @@
   <string name="clear_conversation_history">Vider l\'historique de la conversation</string>
   <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 le status de présence</string>
   <string name="send_unencrypted_message">Envoyer un message non chiffré</string>
   <string name="send_otr_message">Envoyer un message chiffré avec OTR</string>
@@ -92,26 +92,25 @@
   <string name="contact_has_no_pgp_key">Conversations ne peut pas chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\n<small>Demandez-lui de configurer OpenPGP.</small></string>
   <string name="no_pgp_keys">Aucune clef OpenPGP n\'a été trouvée.</string>
   <string name="contacts_have_no_pgp_keys">Conversations ne peut pas chiffrer votre message car vos contacts ne communiquent pas leur clef publique.\n\n<small>Demandez-leur de configurer OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Message chiffré reçu. Appuyez pour le déchiffrer.</i></string>
   <string name="pref_general">Général</string>
   <string name="pref_xmpp_resource">Ressource XMPP</string>
   <string name="pref_xmpp_resource_summary">Nom utilisé par ce client pour s\'identifier</string>
   <string name="pref_accept_files">Accepter les fichiers</string>
   <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que…</string>
-  <string name="pref_notification_settings">Paramètres de notification</string>
+  <string name="pref_notification_settings">Options de notification</string>
   <string name="pref_notifications">Notifications</string>
-  <string name="pref_notifications_summary">Notifier l\'arrivée d\'un message</string>
+  <string name="pref_notifications_summary">Notifier de l\'arrivée d\'un message.</string>
   <string name="pref_vibrate">Vibration</string>
-  <string name="pref_vibrate_summary">Vibrer lors de l\'arrivée d\'un message</string>
+  <string name="pref_vibrate_summary">Vibrer lors de l\'arrivée d\'un message.</string>
   <string name="pref_sound">Sonore</string>
-  <string name="pref_sound_summary">Jouer une sonnerie pour notifier</string>
-  <string name="pref_conference_notifications">Notifications dans les conférences publiques</string>
-  <string name="pref_conference_notifications_summary">Toujours notifier l\'arrivée d\'un message dans une conférence publique, même si votre nom n\'y apparaît pas</string>
+  <string name="pref_sound_summary">Jouer une sonnerie pour notifier.</string>
+  <string name="pref_conference_notifications">Notifications et conf. publiques</string>
+  <string name="pref_conference_notifications_summary">Toujours notifier de l\'arrivée d\'un message dans une conférence publique, même si votre nom n\'y apparaît pas.</string>
   <string name="pref_notification_grace_period">Période sans notification</string>
   <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
   <string name="pref_advanced_options">Options avancées</string>
-  <string name="pref_never_send_crash">Ne jamais envoyer de rapports d\'erreurs</string>
-  <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez au développement de Conversations.</string>
+  <string name="pref_never_send_crash">Ne pas envoyer de rapports d\'erreurs</string>
+  <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez le développement de Conversations.</string>
   <string name="pref_confirm_messages">Confirmation de lecture</string>
   <string name="pref_confirm_messages_summary">Informer le contact lorsque vous avez reçu et lu un message.</string>
   <string name="pref_ui_options">Options d\'interface</string>
@@ -119,14 +118,14 @@
   <string name="error_decrypting_file">Erreur d\'E/S lors du déchiffrement du fichier</string>
   <string name="accept">Accepter</string>
   <string name="error">Une erreur s\'est produite</string>
-  <string name="pref_grant_presence_updates">Accepter les mises à jour de présence</string>
-  <string name="pref_grant_presence_updates_summary">Demander et accepter par avance les mises à jour de présence des contacts créés.</string>
+  <string name="pref_grant_presence_updates">Autoriser les màj de présence</string>
+  <string name="pref_grant_presence_updates_summary">Autoriser et demander par avance les mises à jour de présence des contacts ajoutés.</string>
   <string name="subscriptions">Publications</string>
   <string name="your_account">Votre compte</string>
   <string name="keys">Clefs</string>
-  <string name="send_presence_updates">Envoyer les mises à jour de présence</string>
-  <string name="receive_presence_updates">Recevoir les mises à jour de présence</string>
-  <string name="ask_for_presence_updates">Demander les mises à jour de présence</string>
+  <string name="send_presence_updates">Envoyer mes màj de présence</string>
+  <string name="receive_presence_updates">Recevoir ses màj de présence</string>
+  <string name="ask_for_presence_updates">Demander les màj de présence</string>
   <string name="attach_choose_picture">Choisir une image</string>
   <string name="attach_take_picture">Prendre une photo</string>
   <string name="preemptively_grant">Accepter par avance les demandes de publication.</string>
@@ -171,7 +170,6 @@
   <string name="passwords_do_not_match">Les deux mots de passe ne correspondent pas.</string>
   <string name="invalid_jid">Cet identifiant n\'est pas valide.</string>
   <string name="error_out_of_memory">Plus de mémoire disponible. L\'image est trop volumineuse.</string>
-  <string name="add_phone_book_text">Voulez-vous ajouter %s aux contacts du téléphone ?</string>
   <string name="contact_status_online">En ligne</string>
   <string name="contact_status_free_to_chat">Disponible</string>
   <string name="contact_status_away">Absent</string>
@@ -189,8 +187,8 @@
   <string name="server_info_stream_management">XEP-0198 : Gestion des flux</string>
   <string name="server_info_pep">XEP-0163 : PEP (Avatars / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363 : Envoi de fichiers via HTTP</string>
-  <string name="server_info_available">disponible</string>
-  <string name="server_info_unavailable">indisponible</string>
+  <string name="server_info_available">supporté</string>
+  <string name="server_info_unavailable">non supporté</string>
   <string name="missing_public_keys">Aucune annonce de clef publique</string>
   <string name="last_seen_now">en ligne à l\'instant</string>
   <string name="last_seen_min">en ligne il y a 1 minute</string>
@@ -211,7 +209,6 @@
   <string name="this_device_omemo_fingerprint">Votre empreinte OMEMO</string>
   <string name="other_devices">Autres appareils</string>
   <string name="trust_omemo_fingerprints">Faire confiance aux empreintes OMEMO</string>
-  <string name="fetching_keys">Récupération des clefs...</string>
   <string name="done">Terminé</string>
   <string name="verify">Vérifier</string>
   <string name="decrypt">Déchiffrer</string>
@@ -269,35 +266,35 @@
   <string name="sure_delete_fingerprint">Etes-vous sûr de vouloir supprimer l\'empreinte ?</string>
   <string name="ignore">Ignorer</string>
   <string name="without_mutual_presence_updates"><b>Attention :</b> peut poser problème si l\'un des deux correspondants n\'a pas activé les mises à jour de présence.\n\n<small>Vérifiez dans les détails du contact que vous y avez bien souscrit.</small></string>
-  <string name="pref_encryption_settings">Paramètres de chiffrement</string>
+  <string name="pref_encryption_settings">Options de chiffrement</string>
   <string name="pref_force_encryption">Forcer le chiffrement de bout en bout</string>
   <string name="pref_force_encryption_summary">Toujours envoyer des messages chiffrés (sauf pour les conférences)</string>
-  <string name="pref_dont_save_encrypted">Ne pas sauvegarder les messages chiffrés</string>
-  <string name="pref_dont_save_encrypted_summary">Attention : peut provoquer la perte de messages</string>
-  <string name="pref_expert_options">Options avancées</string>
-  <string name="pref_expert_options_summary">À utiliser avec précaution</string>
+  <string name="pref_dont_save_encrypted">Messages chiffrés non sauvegardés</string>
+  <string name="pref_dont_save_encrypted_summary">Attention : peut provoquer la perte de messages.</string>
+  <string name="pref_expert_options">Paramètres expert</string>
+  <string name="pref_expert_options_summary">À utiliser avec précaution.</string>
   <string name="title_activity_about">À propos</string>
   <string name="pref_about_conversations_summary">Informations sur la version et les licenses</string>
   <string name="title_pref_quiet_hours">Heures tranquilles</string>
   <string name="title_pref_quiet_hours_start_time">Heure de début</string>
   <string name="title_pref_quiet_hours_end_time">Heure de fin</string>
   <string name="title_pref_enable_quiet_hours">Activer les heures tranquilles</string>
-  <string name="pref_quiet_hours_summary">Les notifications seront muettes pendant les heures tranquilles</string>
+  <string name="pref_quiet_hours_summary">Les notifications seront muettes pendant les heures tranquilles.</string>
   <string name="pref_use_larger_font">Augmenter la taille du texte</string>
-  <string name="pref_use_larger_font_summary">Augmenter la taille du texte partout dans l\'application</string>
-  <string name="pref_use_send_button_to_indicate_status">Le bouton Envoyer permet d\'indiquer le statut</string>
-  <string name="pref_use_indicate_received">Demander des accusés de réception</string>
-  <string name="pref_use_indicate_received_summary">Les messages reçus seront marqués d\'une coche verte (si supporté)</string>
-  <string name="pref_use_send_button_to_indicate_status_summary">Changer la couleur du bouton Envoyer pour indiquer le statut du contact</string>
+  <string name="pref_use_larger_font_summary">Augmenter la taille du texte partout dans l\'application.</string>
+  <string name="pref_use_send_button_to_indicate_status">Statut sur le bouton Envoyer</string>
+  <string name="pref_use_indicate_received">Accusés de réception</string>
+  <string name="pref_use_indicate_received_summary">Les messages reçus seront marqués d\'une coche verte (si supporté).</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Le bouton Envoyer change de couleur pour indiquer le statut du contact.</string>
   <string name="pref_expert_options_other">Autres</string>
   <string name="pref_conference_name">Nom de la conférence </string>
-  <string name="pref_conference_name_summary">Identifier les conférences par leur nom plutôt que leur JID</string>
+  <string name="pref_conference_name_summary">Identifier les conférences par leur sujet plutôt que leur JID.</string>
   <string name="toast_message_otr_fingerprint">Empreinte OTR copiée dans le presse-papier !</string>
   <string name="toast_message_omemo_fingerprint">Empreinte OMEMO copiée dans le presse-papier !</string>
   <string name="conference_banned">Vous êtes banni de cette conférence</string>
   <string name="conference_members_only">Cette conférence est réservée aux membres</string>
   <string name="conference_kicked">Vous avez été éjecté de cette conférence</string>
-  <string name="using_account">utiliser le compte %s</string>
+  <string name="using_account">avec le compte %s</string>
   <string name="checking_x">Vérification de %s sur l\'hôte HTTP</string>
   <string name="not_connected_try_again">Vous n\'êtes pas connecté. Essayez plus tard.</string>
   <string name="check_x_filesize">Vérification de la taille de %s</string>
@@ -317,7 +314,7 @@
   <string name="verify_otr">Vérifier l\'OTR</string>
   <string name="remote_fingerprint">Supprimer l\'empreinte</string>
   <string name="scan">Scanner</string>
-  <string name="or_touch_phones">(ou faites se toucher les combinés)</string>
+  <string name="or_touch_phones">(ou faites se toucher les appareils)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Indice ou question</string>
   <string name="shared_secret_secret">Secret partagé</string>
@@ -332,9 +329,12 @@
   <string name="smp_requested">Le contact requiert la vérification du SMP</string>
   <string name="no_otr_session_found">Aucune session OTR valide n\'a été trouvée !</string>
   <string name="conversations_foreground_service">Conversations</string>
-  <string name="pref_keep_foreground_service">Garder le service au premier-plan</string>
-  <string name="pref_keep_foreground_service_summary">Évite que le système ne ferme votre connexion</string>
-  <string name="choose_file">Choix le fichier</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 en cours...</string>
+  <string name="choose_file">Choix du fichier</string>
   <string name="receiving_x_file">Réception %1$s (%2$d%% complété)</string>
   <string name="download_x_file">Télécharger %s</string>
   <string name="file">fichier</string>
@@ -350,7 +350,7 @@
   <string name="manually_verify">Vérifier manuellement</string>
   <string name="are_you_sure_verify_fingerprint">Êtes-vous sûr de vouloir vérifier l\'empreinte OTR de vos contacts ?</string>
   <string name="pref_show_dynamic_tags">Afficher les tags dynamiques</string>
-  <string name="pref_show_dynamic_tags_summary">Afficher les tags en lecture-seule sous les contacts</string>
+  <string name="pref_show_dynamic_tags_summary">Afficher des tags en lecture seule en dessous des contacts.</string>
   <string name="enable_notifications">Activer les notifications</string>
   <string name="conference_with">Créer une conférence avec…</string>
   <string name="no_conference_server_found">Aucun serveur de conférence disponible</string>
@@ -420,10 +420,10 @@
   <string name="eight_hours">8 heures</string>
   <string name="until_further_notice">Jusqu\'à nouvel ordre</string>
   <string name="pref_input_options">Options de saisie</string>
-  <string name="pref_enter_is_send">Entrée permet d\'envoyer</string>
-  <string name="pref_enter_is_send_summary">Utiliser la touche Entrée pour envoyer un message</string>
+  <string name="pref_enter_is_send">Touche Entrée pour envoyer</string>
+  <string name="pref_enter_is_send_summary">Utiliser la touche Entrée pour envoyer un message.</string>
   <string name="pref_display_enter_key">Afficher la touche Entrée</string>
-  <string name="pref_display_enter_key_summary">Remplacer le bouton Émoticônes par un bouton Entrée</string>
+  <string name="pref_display_enter_key_summary">Remplacer le bouton des Émoticônes par un bouton Entrée.</string>
   <string name="audio">audio</string>
   <string name="video">vidéo</string>
   <string name="image">image</string>
@@ -431,17 +431,16 @@
   <string name="apk">Application Android</string>
   <string name="vcard">Contact</string>
   <string name="received_x_file">%s reçu(e)</string>
-  <string name="disable_foreground_service">Ne plus garder le service au premier plan</string>
+  <string name="disable_foreground_service">Ne plus garder le service au 1er plan</string>
   <string name="touch_to_open_conversations">Cliquez pour ouvrir Conversations</string>
   <string name="avatar_has_been_published">L\'avatar a été publié !</string>
   <string name="sending_x_file">%s en cours d\'envoi</string>
   <string name="offering_x_file">En train de proposer un(e) %s</string>
   <string name="hide_offline">Se cacher hors-ligne</string>
   <string name="disable_account">Désactiver le compte</string>
-  <string name="contact_is_typing">%s écrit un message...</string>
   <string name="contact_has_stopped_typing">%s a arrêté d\'écrire</string>
   <string name="pref_chat_states">Notifications d\'écriture</string>
-  <string name="pref_chat_states_summary">Permettre à votre contact de savoir que vous écrivez un message</string>
+  <string name="pref_chat_states_summary">Informer votre contact lorsque vous êtes en train d\'écrire un message.</string>
   <string name="send_location">Envoyer la position</string>
   <string name="show_location">Afficher la position</string>
   <string name="no_application_found_to_display_location">Aucune application trouvée pour afficher la position</string>
@@ -449,10 +448,10 @@
   <string name="received_location">Position reçue</string>
   <string name="title_undo_swipe_out_conversation">Conversation fermée</string>
   <string name="title_undo_swipe_out_muc">Conférence quittée</string>
-  <string name="pref_dont_trust_system_cas_title">Ne pas faire confiance aux CAs système</string>
-  <string name="pref_dont_trust_system_cas_summary">Tous les certificats doivent être approuvés manuellement</string>
+  <string name="pref_dont_trust_system_cas_title">Ne pas utiliser les CAs système</string>
+  <string name="pref_dont_trust_system_cas_summary">Tous les certificats doivent être approuvés manuellement.</string>
   <string name="pref_remove_trusted_certificates_title">Retirer les certificats</string>
-  <string name="pref_remove_trusted_certificates_summary">Supprimer les certificats approuvés manuellement</string>
+  <string name="pref_remove_trusted_certificates_summary">Supprimer les certificats approuvés manuellement.</string>
   <string name="toast_no_trusted_certs">Aucun certificat approuvé manuellement</string>
   <string name="dialog_manage_certs_title">Retirer les certificats</string>
   <string name="dialog_manage_certs_positivebutton">Supprimer la sélection</string>
@@ -465,7 +464,7 @@
     <item quantity="one">%d contact séléctionné</item>
     <item quantity="other">%d contacts séléctionnés</item>
   </plurals>
-  <string name="pref_quick_action_summary">Remplacer le bouton envoyer avec une action rapide</string>
+  <string name="pref_quick_action_summary">Remplacer le bouton Envoyer par une action rapide.</string>
   <string name="pref_quick_action">Action Rapide</string>
   <string name="none">Aucune</string>
   <string name="recently_used">Dernière utilisée</string>
@@ -480,7 +479,20 @@
   <string name="download_failed_file_not_found">Échec du téléchargement : impossible de trouver le fichier</string>
   <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_dns_timeout">Expiration dans le DNS</string>
+  <string name="pref_use_white_background_summary">Afficher les messages reçus en texte noir sur fond blanc.</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>
+  <string name="pref_away_when_screen_off_summary">Marquer cette ressource comme absente quand l\'écran est éteint.</string>
+  <string name="pref_xa_on_silent_mode">Indisponible en mode silencieux</string>
+  <string name="pref_xa_on_silent_mode_summary">Marque cette ressource comme indisponible quand l\'appareil est en mode silencieux</string>
+  <string name="action_add_account_with_certificate">Ajouter un compte avec un certificat</string>
+  <string name="unable_to_parse_certificate">Impossible d\'analyser le certificat</string>
+  <string name="authenticate_with_certificate">Laisser vide pour s\'identifier avec un certificat</string>
+  <string name="captcha_ocr">Texte du captcha</string>
+  <string name="captcha_required">Captcha obligatoire</string>
+  <string name="captcha_hint">Saisissez le texte dans l\'image</string>
+  <string name="certificate_chain_is_not_trusted">La chaîne de certificats n\'est pas digne de confiance</string>
+  <string name="jid_does_not_match_certificate">L\'identifiant ne correspond pas au certificat</string>
+  <string name="action_renew_certificate">Renouveler le certificat</string>
 </resources>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 019d4677..c0e0b9aa 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -14,7 +14,6 @@
   <string name="minutes_ago">min</string>
   <string name="unread_conversations">conversas sen ler</string>
   <string name="sending">enviando…</string>
-  <string name="encrypted_message">Descifrando mensaxe. Agarda uns intres…</string>
   <string name="nick_in_use">O apodo xa está en uso</string>
   <string name="moderator">Moderador</string>
   <string name="participant">Participante</string>
@@ -55,7 +54,6 @@
   <string name="offering">ofrecendo…</string>
   <string name="no_pgp_key">Clave OpenPGP non atopada</string>
   <string name="contact_has_no_pgp_key">Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\n<small>Por favor, pídelle ao teu contacto que configure OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Mensaxe cifrado recibido. Pulsa para ver.</i></string>
   <string name="pref_xmpp_resource">Recurso</string>
   <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
   <string name="pref_accept_files">Aceptar arquivos</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 894c18a7..47918d3c 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d min lalu</string>
   <string name="unread_conversations">Percakapan belum dibaca</string>
   <string name="sending">mengirim...</string>
-  <string name="encrypted_message">Menerjemahkan pesan. Tunggu sebentar...</string>
   <string name="nick_in_use">Nick ini sudah digunakan</string>
   <string name="admin">Administrator</string>
   <string name="owner">Pemilik</string>
@@ -90,7 +89,6 @@
   <string name="contact_has_no_pgp_key">Conversations tidak dapat mengenkripsi pesan Anda karena kontak tidak mengumumkan kunci publiknya.\n\n<small>Silakan meminta kontak Anda untuk menyetel OpenPGP</small></string>
   <string name="no_pgp_keys">Tidak ada kunci OpenPGP ditemukan</string>
   <string name="contacts_have_no_pgp_keys">Percakapan tidak dapat mengenkripsi pesan Anda karena kontak tidak mengumumkan kunci publik mereka.\n\n<small>Silakan meminta kontak Anda untuk setup OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Pesan terenkripsi diterima. Sentuh untuk membongkar dan melihatnya.</i></string>
   <string name="pref_general">Umum</string>
   <string name="pref_xmpp_resource">XMPP resource</string>
   <string name="pref_xmpp_resource_summary">Identifikasi nama klien ini dengan</string>
@@ -165,7 +163,6 @@
   <string name="passwords_do_not_match">Password tidak sama</string>
   <string name="invalid_jid">Jabber ID tidak valid</string>
   <string name="error_out_of_memory">Memori habis. Gambar terlalu besar</string>
-  <string name="add_phone_book_text">Apakah anda ingin menambahkan %s ke daftar kontak anda?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">bebas untuk chatting</string>
   <string name="contact_status_away">pergi</string>
@@ -411,7 +408,6 @@
   <string name="offering_x_file">Menawarkan %s</string>
   <string name="hide_offline">Sembunyikan Offline</string>
   <string name="disable_account">Nonaktifkan Akun</string>
-  <string name="contact_is_typing">%s sedang mengetik...</string>
   <string name="contact_has_stopped_typing">%s telah berhenti mengetik</string>
   <string name="pref_chat_states">Notifikasi ketik pesan</string>
   <string name="pref_chat_states_summary">Biarkan kontak Anda tahu ketika Anda sedang menulis pesan baru</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 97311427..f291db59 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d min fa</string>
   <string name="unread_conversations">Conversazioni non lette</string>
   <string name="sending">invio…</string>
-  <string name="encrypted_message">Decifrazione del messaggio. Attendere prego…</string>
   <string name="nick_in_use">Nome utente già in uso</string>
   <string name="admin">Amministratore</string>
   <string name="owner">Proprietario</string>
@@ -90,7 +89,6 @@
   <string name="contact_has_no_pgp_key">Conversations non è in grado di cifrare i tuoi messaggi perché il contatto non sta annunciando la sua chiave pubblica.\n\n<small>Per favore chiedi al tuo contatto di configurare OpenPGP.</small></string>
   <string name="no_pgp_keys">Nessuna chiave OpenPGP trovata</string>
   <string name="contacts_have_no_pgp_keys">Conversations non è in grado di cifrare i tuoi messaggi perché i contatti non stanno annunciando la propria chiave pubblica.\n\n<small>Per favore chiedi ai tuoi contatti di configurare OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Messaggio cifrato ricevuto. Tocca per decifrare.</i></string>
   <string name="pref_general">Generale</string>
   <string name="pref_xmpp_resource">Risorsa XMPP</string>
   <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string>
@@ -165,7 +163,6 @@
   <string name="passwords_do_not_match">Le Password non corrispondono</string>
   <string name="invalid_jid">Questo non è un ID Jabber valido</string>
   <string name="error_out_of_memory">Memoria esaurita. L’immagine è tropppo grande</string>
-  <string name="add_phone_book_text">Vuoi aggiungere %s alla rubrica del telefono?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">vuole chattare</string>
   <string name="contact_status_away">assente</string>
@@ -407,7 +404,6 @@
   <string name="offering_x_file">Inviando %s</string>
   <string name="hide_offline">Nascondi i contatti offline</string>
   <string name="disable_account">Disabilita l\'account</string>
-  <string name="contact_is_typing">%s sta digitando...</string>
   <string name="contact_has_stopped_typing">%s ha smesso di digitare</string>
   <string name="pref_chat_states_summary">Permetti al tuo contatto di vedere quando stai digitando</string>
   <string name="send_location">Invia la posizione</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index d5fda1c2..fe25a42c 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -9,7 +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_add_phone_book">הוסף לפנקס הטלפונים</string>
   <string name="action_delete_contact">מחק מרשימת אנשי הקשר</string>
   <string name="action_block_contact">חסום איש קשר</string>
   <string name="action_unblock_contact">בטל חסימת איש קשר</string>
@@ -28,7 +28,6 @@
   <string name="minutes_ago">לפני %d דקות</string>
   <string name="unread_conversations">שיחות שלא נקראו</string>
   <string name="sending">שולח...</string>
-  <string name="encrypted_message">מפענח הודעה. אנא המתן…</string>
   <string name="nick_in_use">שם כינוי כבר בשימוש</string>
   <string name="admin">מנהל</string>
   <string name="owner">בעלים</string>
@@ -36,10 +35,10 @@
   <string name="participant">משתתף</string>
   <string name="visitor">מבקר</string>
   <string name="remove_contact_text">האם ברצונך להסיר את %s מתוך רשימת אנשי הקשר? השיחה המשוייכת עם איש קשר זה לא תוסר.</string>
-  <string name="block_contact_text">האם ברצונך לחסום קבלת הודעות מ- %s?</string>
-  <string name="unblock_contact_text">האם ברצונך לבטל את החסימה ולאפשר קבלת הודעות מ- %s?</string>
-  <string name="block_domain_text">לחסום את כל האנשים מ- %s?</string>
-  <string name="unblock_domain_text">לבטל את חסימת כל האנשים מ- %s?</string>
+  <string name="block_contact_text">האם ברצונך לחסום קבלת הודעות מאת %s?</string>
+  <string name="unblock_contact_text">האם ברצונך לבטל את החסימה ולאפשר קבלת הודעות מאת %s?</string>
+  <string name="block_domain_text">לחסום את כל האנשים מתוך %s?</string>
+  <string name="unblock_domain_text">לבטל את חסימת כל האנשים מתוך %s?</string>
   <string name="contact_blocked">איש קשר נחסם</string>
   <string name="remove_bookmark_text">האם ברצונך להסיר את %s בתור סימנייה? הדיונים אשר משוייכים עם סימנייה זו לא יוסרו.</string>
   <string name="register_account">צור חשבון חדש בשרת</string>
@@ -49,6 +48,7 @@
   <string name="invite_contact">הזמן איש קשר</string>
   <string name="contacts">אנשי קשר</string>
   <string name="cancel">ביטול</string>
+  <string name="set">הגדר</string>
   <string name="add">הוסף</string>
   <string name="edit">ערוך</string>
   <string name="delete">מחק</string>
@@ -57,7 +57,7 @@
   <string name="save">שמור</string>
   <string name="ok">אישור</string>
   <string name="crash_report_title">Conversations קרסה</string>
-  <string name="crash_report_message">על ידי שליחת Stacktraces אתה עוזר להתקדמות הפיתוח של Conversations\n<b>אזהרה:</b> פעולה זו תעשה שימוש בחשבון ה- XMPP שלך כדי לשלוח עקבות מחסנית אל המפתח.</string>
+  <string name="crash_report_message">על ידי שליחת Stacktraces אתה עוזר להתקדמות הפיתוח של Conversations\n<b>אזהרה:</b> פעולה זו תעשה שימוש בחשבון XMPP שלך כדי לשלוח עקבות מחסנית אל המפתח.</string>
   <string name="send_now">שלח עכשיו</string>
   <string name="send_never">לעולם אל תשאל שוב</string>
   <string name="problem_connecting_to_account">התחברות לחשבון נכשלה</string>
@@ -73,6 +73,7 @@
   <string name="clear_conversation_history">נקה היסטוריית שיחה</string>
   <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>
@@ -91,10 +92,9 @@
   <string name="contact_has_no_pgp_key">Conversations אינה מסוגלת להצפין את הודעותיך משום שאיש הקשר שלך אינו מכריז על המפתח הפומבי שלו או שלה.\n\n<small>אנא בקש מאיש הקשר שלך להגדיר את OpenPGP.</small></string>
   <string name="no_pgp_keys">לא נמצאו מפתחות OpenPGP</string>
   <string name="contacts_have_no_pgp_keys">Conversations אינה מסוגלת להצפין את הודעותיך משום שאנשי הקשר שלך אינם מכריזים על המפתח הפומבי שלהם.\n\n<small>אנא בקש מאנשי הקשר שלך לארגן OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>הודעה מוצפנת התקבלה. לחץ כדי לצפות ולפענח.</i></string>
   <string name="pref_general">כללי</string>
-  <string name="pref_xmpp_resource">XMPP resource</string>
-  <string name="pref_xmpp_resource_summary">השם שאפליקציה זו שולחת לשרת</string>
+  <string name="pref_xmpp_resource">משאב XMPP</string>
+  <string name="pref_xmpp_resource_summary">השם שבעזרתו לקוח זה מזהה את עצמו</string>
   <string name="pref_accept_files">קבל קבצים</string>
   <string name="pref_accept_files_summary">קבל אוטומטית קבצים שגודלם קטן מ…</string>
   <string name="pref_notification_settings">הגדרות התראות</string>
@@ -170,7 +170,6 @@
   <string name="passwords_do_not_match">סיסמאות לא תואמות</string>
   <string name="invalid_jid">מזהה ה Jabber אינו תקין</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>
@@ -210,7 +209,6 @@
   <string name="this_device_omemo_fingerprint">טביעת אצבע OMEMO שלי</string>
   <string name="other_devices">מכשירים אחרים</string>
   <string name="trust_omemo_fingerprints">סמוך על טביעות אצבע OMEMO</string>
-  <string name="fetching_keys">משיג מפתחות...</string>
   <string name="done">בוצע</string>
   <string name="verify">אמת</string>
   <string name="decrypt">פענח</string>
@@ -330,6 +328,9 @@
   <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>
   <string name="download_x_file">הורד %s</string>
@@ -433,7 +434,6 @@
   <string name="offering_x_file">מציע %s</string>
   <string name="hide_offline">הסתר בלתי מקוונים</string>
   <string name="disable_account">השבת חשבון</string>
-  <string name="contact_is_typing">%s מקליד...</string>
   <string name="contact_has_stopped_typing">%s הפסיק/ה להקליד</string>
   <string name="pref_chat_states">התראות הקלדה</string>
   <string name="pref_chat_states_summary">אפשר לאנשי הקשר שלך לדעת כאשר אתה מקליד הודעה חדשה</string>
@@ -448,7 +448,7 @@
   <string name="pref_dont_trust_system_cas_summary">כל החתימות הדיגטליות יצטרכו לעבור אימות ידני</string>
   <string name="pref_remove_trusted_certificates_title">מחק חתימות דיגטליות</string>
   <string name="pref_remove_trusted_certificates_summary">מחק חתימות דיגטליות שאומתו באופן ידני</string>
-  <string name="toast_no_trusted_certs">אין חתימת דיגטליות שאושרו ידנית</string>
+  <string name="toast_no_trusted_certs">אין חתימות דיגטליות שאושרו ידנית</string>
   <string name="dialog_manage_certs_title">מחק חתימות דיגטליות</string>
   <string name="dialog_manage_certs_positivebutton">מחק פריטים שנבחרו</string>
   <string name="dialog_manage_certs_negativebutton">ביטול</string>
@@ -476,6 +476,19 @@
   <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_dns_timeout">Timeout in DNS</string>
   <string name="server_info_broken">לא עובד</string>
+  <string name="pref_presence_settings">הגדרות נוכחות Presence</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">הוסף חשבון עם certificate</string>
+  <string name="unable_to_parse_certificate">תקלה בקריאת ה- certificate</string>
+  <string name="authenticate_with_certificate">השאר ריק כדי להזדהות ללא certificate</string>
+  <string name="captcha_ocr">טקסט Captcha</string>
+  <string name="captcha_required">דרוש טקסט Captcha</string>
+  <string name="captcha_hint">נא להזין את הטקסט שבתמונה</string>
+  <string name="certificate_chain_is_not_trusted">שרשרת תעודה אינה מהימנה</string>
+  <string name="jid_does_not_match_certificate">אין התאמה בין ה- JID לבין ה- certificate</string>
+  <string name="action_renew_certificate">חידוש certificate</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 45c67940..4679c6b3 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d 分前</string>
   <string name="unread_conversations">未読の会話</string>
   <string name="sending">送信中…</string>
-  <string name="encrypted_message">メッセージを復号しています。しばらくお待ちください…</string>
   <string name="nick_in_use">ニックネームは既に使用されています</string>
   <string name="admin">管理者</string>
   <string name="owner">オーナー</string>
@@ -74,6 +73,7 @@
   <string name="clear_conversation_history">会話履歴をクリア</string>
   <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>
@@ -92,7 +92,6 @@
   <string name="contact_has_no_pgp_key">連絡先が公開鍵を通知しないため、Conversations はあなたのメッセージを暗号化することができません。\n\n<small>連絡先に OpenPGP をセットアップするように依頼してください。</small></string>
   <string name="no_pgp_keys">OpenPGP の鍵はありません</string>
   <string name="contacts_have_no_pgp_keys">連絡先が公開鍵を通知しないため、Conversations はあなたのメッセージを暗号化することができません。\n\n<small>連絡先に OpenPGP をセットアップするように依頼してください。</small></string>
-  <string name="encrypted_message_received"><i>暗号化されたメッセージを受信しました。タッチすると、表示および復号化します。</i></string>
   <string name="pref_general">全般</string>
   <string name="pref_xmpp_resource">XMPP リソース</string>
   <string name="pref_xmpp_resource_summary">自分自身を識別するこのクライアントの名前</string>
@@ -171,7 +170,6 @@
   <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>
@@ -211,7 +209,6 @@
   <string name="this_device_omemo_fingerprint">自分の OMEMO フィンガープリント</string>
   <string name="other_devices">他のデバイス</string>
   <string name="trust_omemo_fingerprints">OMEMO フィンガープリントを信頼</string>
-  <string name="fetching_keys">鍵の取得中...</string>
   <string name="done">完了</string>
   <string name="verify">検証</string>
   <string name="decrypt">復号化</string>
@@ -334,6 +331,9 @@
   <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>
   <string name="download_x_file">%s のダウンロード</string>
@@ -438,7 +438,6 @@
   <string name="offering_x_file">%s の依頼中</string>
   <string name="hide_offline">オフラインを非表示にする</string>
   <string name="disable_account">アカウントを無効にする</string>
-  <string name="contact_is_typing">%s は入力中...</string>
   <string name="contact_has_stopped_typing">%s は入力を停止しました</string>
   <string name="pref_chat_states">入力中通知</string>
   <string name="pref_chat_states_summary">あなたが新しいメッセージを書いている時に、連絡先に知らせます</string>
@@ -479,6 +478,19 @@
   <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_dns_timeout">DNS でタイムアウト</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>
+  <string name="captcha_ocr">キャプチャ テキスト</string>
+  <string name="captcha_required">キャプチャが必要です</string>
+  <string name="captcha_hint">画像からテキストを入力してください</string>
+  <string name="certificate_chain_is_not_trusted">証明書チェーンは信頼済ではありません</string>
+  <string name="jid_does_not_match_certificate">Jabber ID が証明書と一致しません</string>
+  <string name="action_renew_certificate">証明書を更新</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 6f654dcf..d8c28b70 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d 분 전 </string>
   <string name="unread_conversations">읽지 않은 대화 </string>
   <string name="sending">보내는중... </string>
-  <string name="encrypted_message">메세지 복호화중입니다. 기다리세요...</string>
   <string name="nick_in_use">사용중인 별명입니다 </string>
   <string name="admin">관리자 </string>
   <string name="owner">소유자 </string>
@@ -90,7 +89,6 @@
   <string name="contact_has_no_pgp_key">당신의 연락처가 그들의 공개 키를 선언하지 않고 있기 때문에 Conversations는 당신의 메세지를 암호화할 수 없습니다. OpenPGP를 설정하도록 당신의 연락처에게 물어보세요. </string>
   <string name="no_pgp_keys">OpenPGP 키가 발견되지 않음 </string>
   <string name="contacts_have_no_pgp_keys">당신의 연락처가 그들의 공개 키를 선언하지 않고 있기 때문에 Conversations는 당신의 메세지를 암호화할 수 없습니다. OpenPGP를 설정하도록 당신의 연락처에게 물어보세요.  </string>
-  <string name="encrypted_message_received">암호화된 메세지 수신됨. 터치해서 복호화 및 열람하세요. </string>
   <string name="pref_general">일반 </string>
   <string name="pref_xmpp_resource">XMPP 자원 </string>
   <string name="pref_xmpp_resource_summary">이 클라이언트가 자신을 알아보는 이름</string>
@@ -165,7 +163,6 @@
   <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>
@@ -406,7 +403,6 @@
   <string name="offering_x_file">%s 제공중 </string>
   <string name="hide_offline">오프라인 숨기기 </string>
   <string name="disable_account">계정 해제 </string>
-  <string name="contact_is_typing">%s 이(가) 입력중입니다... </string>
   <string name="contact_has_stopped_typing">%s 이(가) 입력을 중단했습니다 </string>
   <string name="pref_chat_states">입력 알림 </string>
   <string name="pref_chat_states_summary">새 메세지를 작성할 때 이를 연락처에게 알립니다 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index dee41b7b..0b4d13c2 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -5,17 +5,21 @@
   <string name="action_accounts">Kontobehandling</string>
   <string name="action_end_conversation">Avslutt denne samtalen</string>
   <string name="action_contact_details">Kontaktdetaljer</string>
+  <string name="action_muc_details">Konferansedetaljer</string>
   <string name="action_secure">Sikret samtale</string>
   <string name="action_add_account">Legg til samtale</string>
   <string name="action_edit_contact">Rediger navn</string>
   <string name="action_add_phone_book">Legg til i telefonbok</string>
+  <string name="action_delete_contact">Fjern fra kontaktliste</string>
   <string name="action_block_contact">Blokker kontakt</string>
   <string name="action_unblock_contact">Avblokker kontakt</string>
   <string name="action_block_domain">Blokker domene</string>
   <string name="action_unblock_domain">Avblokker domene</string>
   <string name="title_activity_manage_accounts">Kontobehandling</string>
   <string name="title_activity_settings">Innstillinger</string>
+  <string name="title_activity_conference_details">Konferansedetaljer</string>
   <string name="title_activity_contact_details">Kontaktdetaljer</string>
+  <string name="title_activity_sharewith">Del med Conversation</string>
   <string name="title_activity_start_conversation">Start samtale</string>
   <string name="title_activity_choose_contact">Velg kontakt</string>
   <string name="title_activity_block_list">Blokkeringsliste</string>
@@ -24,13 +28,13 @@
   <string name="minutes_ago">%d minutter siden</string>
   <string name="unread_conversations">uleste samtaler</string>
   <string name="sending">sender...</string>
-  <string name="encrypted_message">Dekrypterer melding. Vent...</string>
   <string name="nick_in_use">Kallenavn allerede i bruk</string>
   <string name="admin">Admin</string>
   <string name="owner">Eier</string>
   <string name="moderator">Moderator</string>
   <string name="participant">Deltager</string>
   <string name="visitor">Besøkende</string>
+  <string name="remove_contact_text">Bekreft fjerning av %s fra din kontaktliste. Samtalen med denne kontakten vil ikke bli fjernet.</string>
   <string name="block_contact_text">Vil du forhindre %s fra å sende deg meldinger?</string>
   <string name="unblock_contact_text">Ønsker du å avblokkere %s og tillate dem å sende deg meldinger?</string>
   <string name="block_domain_text">Blokker alle kontakter fra %s?</string>
@@ -62,6 +66,7 @@
   <string name="preparing_image">Forbereder bilde for forsendelse</string>
   <string name="action_clear_history">Tøm historikk</string>
   <string name="clear_conversation_history">Tøm samtalehistorikk</string>
+  <string name="delete_messages">Slett meldinger</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>
@@ -75,7 +80,6 @@
   <string name="waiting">venter...</string>
   <string name="no_pgp_key">Ingen OpenPGP-nøkkel funnet</string>
   <string name="no_pgp_keys">Ingen OpenPGP-nøkler funnet</string>
-  <string name="encrypted_message_received"><i>Kryptert melding mottatt. Trykk for å se og dekrypterte.</i></string>
   <string name="pref_xmpp_resource">XMPP-ressurs</string>
   <string name="pref_accept_files">Godta filer</string>
   <string name="pref_accept_files_summary">Automatisk godkjenning av filer mindre enn...</string>
@@ -98,6 +102,8 @@
   <string name="keys">Nøkler</string>
   <string name="attach_choose_picture">Velg bilde</string>
   <string name="attach_take_picture">Ta bilde</string>
+  <string name="error_file_not_found">Finner ikke filen</string>
+  <string name="error_io_exception">Generell I/O-feil. Har du sluppet opp for lagringsplass?</string>
   <string name="account_status_unknown">Ukjent</string>
   <string name="account_status_disabled">Midlertidig avskrudd</string>
   <string name="account_status_online">Pålogget</string>
@@ -107,6 +113,8 @@
   <string name="account_status_regis_fail">Registrering feilet</string>
   <string name="account_status_regis_conflict">Brukernavn allerede i bruk</string>
   <string name="account_status_regis_success">Registrering fullført</string>
+  <string name="account_status_security_error">Sikkerhetsfeil</string>
+  <string name="account_status_incompatible_server">Ukompatibel tjener</string>
   <string name="encryption_choice_unencrypted">Ukryptert</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -122,13 +130,13 @@
   <string name="attach_record_voice">Ta opp stemme</string>
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="account_settings_password">Passord</string>
+  <string name="account_settings_example_jabber_id">brukernavn@eksempel.no</string>
   <string name="account_settings_confirm_password">Bekreft passord</string>
   <string name="password">Passord</string>
   <string name="confirm_password">Bekreft passord</string>
   <string name="passwords_do_not_match">Passordene samsvarer ikke</string>
   <string name="invalid_jid">Dette er ikke en gyldig Jabber-ID</string>
   <string name="error_out_of_memory">Slapp opp for minne, bildet er for stort</string>
-  <string name="add_phone_book_text">Ønsker du å legge til %s til din telefons kontaktliste?</string>
   <string name="contact_status_online">pålogget</string>
   <string name="contact_status_free_to_chat">tilgjengelig for sludring</string>
   <string name="contact_status_away">fraværende</string>
@@ -150,9 +158,11 @@
   <string name="never_seen">aldri sett</string>
   <string name="install_openkeychain">Kryptert melding. Installer OpenKeychain for å dekryptere.</string>
   <string name="unknown_otr_fingerprint">Ukjent OTR-fingeravtrykk</string>
+  <string name="reception_failed">Mottak  mislyktes</string>
   <string name="otr_fingerprint">OTR-fingeravtrykk</string>
-  <string name="fetching_keys">Henter nøkler...</string>
+  <string name="other_devices">Andre enheter</string>
   <string name="done">Ferdig</string>
+  <string name="verify">Bekreft</string>
   <string name="decrypt">Dekrypter</string>
   <string name="conferences">Konferanser</string>
   <string name="search">Søk</string>
@@ -162,7 +172,9 @@
   <string name="view_contact_details">Vis kontaktdetaljer</string>
   <string name="block_contact">Blokker kontakt</string>
   <string name="unblock_contact">Avblokker kontakt</string>
+  <string name="create">Lag</string>
   <string name="contact_already_exists">Kontakten finnes allerede</string>
+  <string name="join">Ta del i</string>
   <string name="conference_address">Konferanse-adresse</string>
   <string name="conference_address_example">rom@konferanse.eksempel.no</string>
   <string name="save_as_bookmark">Lagre som bokmerke</string>
@@ -171,6 +183,43 @@
   <string name="you">Deg</string>
   <string name="action_edit_subject">Rediger temaet for konferansen</string>
   <string name="conference_not_found">Fant ikke konferansen</string>
+  <string name="leave">Forlat</string>
+  <string name="contact_added_you">Kontakt la deg til i sin liste</string>
+  <string name="add_back">Gjengjeld tjenesten</string>
+  <string name="private_message">hvisket</string>
+  <string name="private_message_to">til %s</string>
+  <string name="send_private_message_to">Send privat melding til %s</string>
+  <string name="connect">Koble til</string>
+  <string name="account_already_exists">Denne kontoen finnes allerede</string>
+  <string name="next">Neste</string>
+  <string name="additional_information">Ytterligere informasjon</string>
+  <string name="skip">Hopp over</string>
+  <string name="disable_notifications">Skru av varslinger</string>
+  <string name="disable_notifications_for_this_conversation">Skru av varslinger for denne samtalen</string>
+  <string name="notifications_disabled">Varslinger avskrudd</string>
+  <string name="enable">Skru på</string>
+  <string name="conference_requires_password">Konferansen krever passord</string>
+  <string name="enter_password">Skriv inn passord</string>
+  <string name="missing_presence_updates">Mangler tilgjengelighetsoppdateringer fra kontakt</string>
+  <string name="delete_fingerprint">Slett fingeravtrykk</string>
+  <string name="sure_delete_fingerprint">Bekreft fjerning av fingeravtrykk.</string>
+  <string name="ignore">Ignorer</string>
+  <string name="pref_encryption_settings">Krypteringsinnstillinger</string>
+  <string name="pref_force_encryption">Krev ende-til-ende-kryptering</string>
+  <string name="pref_dont_save_encrypted_summary">Advarsel: Dette kan føre til at meldinger går tapt</string>
+  <string name="pref_expert_options">Ekspertinnstillinger</string>
+  <string name="pref_expert_options_summary">Vær forsiktig med disse</string>
+  <string name="title_activity_about">Om Conversations</string>
+  <string name="pref_about_conversations_summary">Utgave og lisensinformasjon</string>
+  <string name="title_pref_quiet_hours">Stille tidsavgrensning</string>
+  <string name="title_pref_quiet_hours_start_time">Oppstart</string>
+  <string name="title_pref_quiet_hours_end_time">Avslutning</string>
+  <string name="title_pref_enable_quiet_hours">Aktiver stille tidsavgrensning</string>
+  <string name="pref_quiet_hours_summary">Varslinger blir ikke spilt under stilletid</string>
+  <string name="pref_use_larger_font">Øk tekststørrelse</string>
+  <string name="pref_use_larger_font_summary">Bruk større tekststørrelser i hele programmet</string>
+  <string name="pref_use_send_button_to_indicate_status">Forsendelsesknappen indikerer status</string>
+  <string name="pref_use_indicate_received">Forespørr meldingskvitteringer</string>
   <string name="audio">lyd</string>
   <string name="video">film</string>
   <string name="image">stillbilde</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 61d57b26..c5647159 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d min. geleden</string>
   <string name="unread_conversations">ongelezen gesprekken</string>
   <string name="sending">versturen…</string>
-  <string name="encrypted_message">Bericht aan het ontsleutelen. Even geduld…</string>
   <string name="nick_in_use">Naam is al in gebruik</string>
   <string name="admin">Beheerder</string>
   <string name="owner">Eigenaar</string>
@@ -92,7 +91,6 @@
   <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 bekijken en 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>
@@ -171,7 +169,6 @@
   <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 de contactenlijst op je telefoon?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">beschikbaar</string>
   <string name="contact_status_away">weg</string>
@@ -211,7 +208,6 @@
   <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">Ophalen van de sleutels...</string>
   <string name="done">Klaar</string>
   <string name="verify">Bevestigen</string>
   <string name="decrypt">Ontsleutelen</string>
@@ -438,7 +434,6 @@
   <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>
@@ -481,6 +476,6 @@
   <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_dns_timeout">Time-out in DNS</string>
   <string name="server_info_broken">Gebroken</string>
+  <string name="jid_does_not_match_certificate">Jabber-ID komt niet overeen met certificaat</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 408672ca..6fc57f30 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d minut temu</string>
   <string name="unread_conversations">nieprzeczytanych konwersacji</string>
   <string name="sending">wysyłanie...</string>
-  <string name="encrypted_message">Deszyfrowanie wiadomości. Proszę czekać...</string>
   <string name="nick_in_use">Nazwa jest już w użyciu</string>
   <string name="admin">Admin</string>
   <string name="owner">Właściciel</string>
@@ -92,7 +91,6 @@
   <string name="contact_has_no_pgp_key">Conversations nie może zaszyfrować wiadomości, ponieważ kontakt nie udostępnia klucza publicznego.\n\n<small>Zasugeruj rozmówcy instalację OpenPGP.</small></string>
   <string name="no_pgp_keys">Nie znaleziono kluczy OpenPGP</string>
   <string name="contacts_have_no_pgp_keys">Conversations nie może zaszyfrować wiadomości, ponieważ kontakty nie udostępniają kluczy publicznych.\n\n<small>Zasugeruj rozmówcom instalację OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Otrzymano zaszyfrowaną wiadomość. Dotknij, aby odszyfrować i wyświetlić.</i></string>
   <string name="pref_general">Główne</string>
   <string name="pref_xmpp_resource">Zasób XMPP</string>
   <string name="pref_xmpp_resource_summary">Nazwa identyfikująca urządzenie</string>
@@ -171,7 +169,6 @@
   <string name="passwords_do_not_match">Hasła są niezgodne</string>
   <string name="invalid_jid">Wprowadzono niepoprawny Jabber ID</string>
   <string name="error_out_of_memory">Brak pamięci, obraz jest za duży</string>
-  <string name="add_phone_book_text">Czy chcesz dodać kontakt %s do książki telefonicznej?</string>
   <string name="contact_status_online">dostępny</string>
   <string name="contact_status_free_to_chat">chętny do rozmowy</string>
   <string name="contact_status_away">zaraz wracam</string>
@@ -211,7 +208,6 @@
   <string name="this_device_omemo_fingerprint">Własny odcisk OMEMO</string>
   <string name="other_devices">Pozostałe urządzenia</string>
   <string name="trust_omemo_fingerprints">Zaufane odciski OMEMO</string>
-  <string name="fetching_keys">Pobieranie kluczy...</string>
   <string name="done">Ukończono</string>
   <string name="verify">Weryfikuj</string>
   <string name="decrypt">Odszyfruj</string>
@@ -438,7 +434,6 @@
   <string name="offering_x_file">Oferowanie %s</string>
   <string name="hide_offline">Ukryj niedostępnych</string>
   <string name="disable_account">Wyłącz konto</string>
-  <string name="contact_is_typing">%s pisze...</string>
   <string name="contact_has_stopped_typing">%s przestał(a) pisać</string>
   <string name="pref_chat_states">Powiadomienia pisania</string>
   <string name="pref_chat_states_summary">Powiadamiaj rozmówcę, kiedy rozpoczynasz nową wiadomość</string>
@@ -483,6 +478,5 @@
   <string name="download_failed_could_not_connect">Pobieranie nieudane: Nie można połączyć z hostem</string>
   <string name="pref_use_white_background">Białe tło</string>
   <string name="pref_use_white_background_summary">Pokazuj otrzymane wiadomości jako czarny tekst na białym tle</string>
-  <string name="account_status_dns_timeout">DNS timeout</string>
   <string name="server_info_broken">Zepsute</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 57f9d7c6..917958f1 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -27,7 +27,6 @@
   <string name="minutes_ago">%d minutos atrás</string>
   <string name="unread_conversations">Conversas não lidas</string>
   <string name="sending">enviando...</string>
-  <string name="encrypted_message">Descriptografando mensagem. Por favor aguarde...</string>
   <string name="nick_in_use">O apelido já está em uso</string>
   <string name="admin">Administrador</string>
   <string name="owner">Dono</string>
@@ -154,7 +153,6 @@
   <string name="passwords_do_not_match">As senhas não combina</string>
   <string name="invalid_jid">Esse não é um ID Jabber válido</string>
   <string name="error_out_of_memory">Memória insuficiente. A imagem é muito grande</string>
-  <string name="add_phone_book_text">Você tem certeza que deseja adicionar %s à sua lista de contato do telefone?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">disponível para conversa</string>
   <string name="contact_status_away">fora</string>
@@ -281,7 +279,6 @@
   <string name="vcard">Contato</string>
   <string name="sending_x_file">Enviando %s</string>
   <string name="offering_x_file">Oferecendo %s</string>
-  <string name="contact_is_typing">%s está digitando...</string>
   <string name="contact_has_stopped_typing">%s parou de digitar</string>
   <string name="pref_chat_states">Notificações de digitação</string>
   <string name="send_location">Enviar localização</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 991201e5..33e45671 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="action_settings">Configuratie</string>
+  <string name="action_settings">Setari</string>
   <string name="action_add">Conversatie noua</string>
   <string name="action_accounts">Configureaza conturi</string>
   <string name="action_end_conversation">Termina conversatie</string>
@@ -19,18 +19,17 @@
   <string name="title_activity_settings">Configuratie</string>
   <string name="title_activity_conference_details">Detalii conferinta</string>
   <string name="title_activity_contact_details">Detalii contact</string>
-  <string name="title_activity_sharewith">Distribuie catre Conversatie</string>
-  <string name="title_activity_start_conversation">Porneste Conversatie</string>
+  <string name="title_activity_sharewith">Distribuie catre Conversations</string>
+  <string name="title_activity_start_conversation">Porneste conversatie</string>
   <string name="title_activity_choose_contact">Alege contact</string>
   <string name="title_activity_block_list">Blocheaza lista</string>
   <string name="just_now">in acest moment</string>
-  <string name="minute_ago">acuma 1 minut</string>
-  <string name="minutes_ago">acuma %d minute</string>
-  <string name="unread_conversations">Conversatii necitite</string>
+  <string name="minute_ago">acum un minut</string>
+  <string name="minutes_ago">acum %d minute</string>
+  <string name="unread_conversations">conversatii necitite</string>
   <string name="sending">trimitere...</string>
-  <string name="encrypted_message">Decriptez mesaj. Te rog asteapta...</string>
   <string name="nick_in_use">Nume utilizator este deja folosit.</string>
-  <string name="admin">Admin</string>
+  <string name="admin">Administrator</string>
   <string name="owner">Proprietar</string>
   <string name="moderator">Moderator</string>
   <string name="participant">Participant</string>
@@ -41,11 +40,12 @@
   <string name="block_domain_text">Blocheaza toate contactele de la %s?</string>
   <string name="unblock_domain_text">Deblocheaza toate contactele de la %s?</string>
   <string name="contact_blocked">Contact blocat</string>
-  <string name="remove_bookmark_text">Ai dori sa stergi pe %s ca semn de carte? Conversatia asociata cu acest semn de carte nu va fi stearsa.</string>
+  <string name="remove_bookmark_text">Ai dori sa stergi pe %s din semne de carte? Conversatia asociata cu acest semn de carte nu va fi stearsa.</string>
   <string name="register_account">Inregistreaza un cont nou pe server</string>
   <string name="change_password_on_server">Schimba parola pe server</string>
-  <string name="start_conversation">Porneste Conversatie</string>
-  <string name="invite_contact">Invita Contact</string>
+  <string name="share_with">Partajeaza cu...</string>
+  <string name="start_conversation">Porneste conversatie</string>
+  <string name="invite_contact">Invita contact</string>
   <string name="contacts">Contacte</string>
   <string name="cancel">Anuleaza</string>
   <string name="set">Seteaza</string>
@@ -56,35 +56,445 @@
   <string name="unblock">Deblocheaza</string>
   <string name="save">Salveaza</string>
   <string name="ok">DA</string>
-  <string name="crash_report_title">Conversatii s-a oprit neasteptat</string>
-  <string name="crash_report_message">Trimitand date ajuti la dezvoltarea aplicatiei Conversatii\n<b>Atentie:</b> Se va utiliza contul XMPP pentru a trimite informatii catre programatori.</string>
-  <string name="send_now">Trimie acum</string>
-  <string name="send_never">Nu mai intreba in viitor</string>
+  <string name="crash_report_title">Conversations s-a oprit neasteptat</string>
+  <string name="crash_report_message">Trimitand date ajuti la dezvoltarea aplicatiei Conversations\n<b>Atentie:</b> Se va utiliza contul XMPP pentru a trimite informatii catre programatori.</string>
+  <string name="send_now">Trimite acum</string>
+  <string name="send_never">Nu ma mai intreba</string>
   <string name="problem_connecting_to_account">Nu ma pot conecta la cont</string>
   <string name="problem_connecting_to_accounts">Nu ma pot conecta la conturi multiple</string>
   <string name="touch_to_fix">Apasa aici pentru a configura conturile tale</string>
   <string name="attach_file">Ataseaza fisier</string>
   <string name="not_in_roster">Contactul nu este in lista ta. Ai vrea sa il adaugi?</string>
   <string name="add_contact">Adauga contact</string>
-  <string name="send_failed">Trimitere esuata</string>
-  <string name="send_rejected">rejectat</string>
+  <string name="send_failed">trimitere esuata</string>
+  <string name="send_rejected">respins</string>
   <string name="preparing_image">Pregatesc imaginea pentru transmisie</string>
   <string name="action_clear_history">Sterge istoria</string>
   <string name="clear_conversation_history">Sterge istoria conversatiei</string>
-  <string name="clear_histor_msg">Doresti sa stergi toate mesajele din Conversatii?\n\n<b>Atentie:</b> Aceasta actiune nu va influenta mesajele aflate pe alte telefoane/tabelete/servere.</string>
+  <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="send_unencrypted_message">Trimite mesaje necriptate</string>
   <string name="send_otr_message">Trimite mesaj criptat cu OTR</string>
+  <string name="send_omemo_message">Trimite mesaj criptat cu OMEMO</string>
   <string name="send_pgp_message">Trimite mesaj criptat cu OpenPGP</string>
   <string name="your_nick_has_been_changed">Numele tau a fost schimbat</string>
   <string name="send_unencrypted">Trimite necriptat</string>
   <string name="decryption_failed">Decriptia a esuat. Poate nu ai cheia privata corecta.</string>
   <string name="openkeychain_required">OpenKeychain</string>
-  <string name="openkeychain_required_long">Coonversatii utilizeaza o aplicatia externa <b>OpenKeychain</b> pentru a cripta si decripta mesaje si a administra cheile publice.\n\nOpenKeychain este licentiat sub GPLv3 si se gaseste pentru copiere pe F-Droid si Google Play.\n\n<small>(Te rog sa repornesti Conversatii dupa.)</small></string>
+  <string name="openkeychain_required_long">Conversations utilizeaza o aplicatia externa <b>OpenKeychain</b> pentru a cripta si decripta mesaje si a administra cheile publice.\n\nOpenKeychain este licentiat sub GPLv3 si se gaseste pentru copiere pe F-Droid si Google Play.\n\n<small>(Te rog sa repornesti Conversations dupa)</small></string>
   <string name="restart">Reporneste</string>
   <string name="install">Instaleaza</string>
-  <string name="offering">Transmit...</string>
-  <string name="waiting">In asteptare...</string>
+  <string name="offering">transmit...</string>
+  <string name="waiting">in asteptare...</string>
   <string name="no_pgp_key">Nu am gasit cheie OpenPGP</string>
-  <string name="contact_has_no_pgp_key">Conversatii nu a putut sa cirpteze mesajele tale din cauza contactului care nu isi anunta cheia publica.\n\n<small>Roaga contactul sa isi configureze OpenPGP.</small></string>
+  <string name="contact_has_no_pgp_key">Conversations nu a putut sa cripteze mesajele tale din cauza contactului care nu isi anunta cheia publica.\n\n<small>Roaga contactul sa isi configureze OpenPGP.</small></string>
+  <string name="no_pgp_keys">Nu am gasit chei OpenPGP</string>
+  <string name="contacts_have_no_pgp_keys">Conversations nu poate cripta mesajele tale pentru contactele tale care nu isi anunta cheia publica.\n\n<small>Te rog cere contactelor sa configureze OpenPGP.</small></string>
+  <string name="pref_general">General</string>
+  <string name="pref_xmpp_resource">resursa XMPP</string>
+  <string name="pref_xmpp_resource_summary">Numele cu care acest client se identifica</string>
+  <string name="pref_accept_files">Accepta fisiere</string>
+  <string name="pref_accept_files_summary">Accepta automat fisiere mai mici decat...</string>
+  <string name="pref_notification_settings">Setari notificari</string>
+  <string name="pref_notifications">Notificari</string>
+  <string name="pref_notifications_summary">Notifica cand un nou mesaj este primit</string>
+  <string name="pref_vibrate">Vibreaza</string>
+  <string name="pref_vibrate_summary">Vibreaza cand un nou mesaj este primit</string>
+  <string name="pref_sound">Sunet</string>
+  <string name="pref_sound_summary">Ton de apel cu notificare</string>
+  <string name="pref_conference_notifications">Notificari in Conferintele Publice</string>
+  <string name="pref_conference_notifications_summary">Notifica cand un mesaj apare in conferintele publice in loc doar sa fie evidentiat</string>
+  <string name="pref_notification_grace_period">Perioada de gratie notificari </string>
+  <string name="pref_notification_grace_period_summary">Opreste notificari pentru o scurta perioada dupa ce o copie a mesajului a fost primita</string>
+  <string name="pref_advanced_options">Optiuni avansate</string>
+  <string name="pref_never_send_crash">Nu trimite rapoarte de errori</string>
+  <string name="pref_never_send_crash_summary">Trimitand date ajuti la dezvoltarea aplicatiei Conversations\n<b>Atentie:</b> Se va utiliza contul XMPP pentru a trimite informatii catre programatori.</string>
+  <string name="pref_confirm_messages">Confirma mesaje</string>
+  <string name="pref_confirm_messages_summary">Notifica contactul cand ai primit un mesaj si l-ai citit</string>
+  <string name="pref_ui_options">Optiuni interfata</string>
+  <string name="openpgp_error">OpenKeychain a raportat o eroare</string>
+  <string name="error_decrypting_file">Eroare I/O la decriptarea fisierului</string>
+  <string name="accept">Accepta</string>
+  <string name="error">A aparut o eroare</string>
+  <string name="pref_grant_presence_updates">Trimite actualizari de prezenta</string>
+  <string name="pref_grant_presence_updates_summary">Acorda si cere anticipat abonarea la actualizarile de prezenta pentru contactele create de tine</string>
+  <string name="subscriptions">Abonari</string>
+  <string name="your_account">Contul tau</string>
+  <string name="keys">Chei</string>
+  <string name="send_presence_updates">Trimite actualizari de prezenta</string>
+  <string name="receive_presence_updates">Primeste actualizari de prezenta</string>
+  <string name="ask_for_presence_updates">Cere actualizari de prezenta</string>
+  <string name="attach_choose_picture">Alege imagine</string>
+  <string name="attach_take_picture">Fa o poza</string>
+  <string name="preemptively_grant">Acorda anticipat cererea de abonare</string>
+  <string name="error_not_an_image_file">Fisierul selectat nu este o imagine</string>
+  <string name="error_compressing_image">Eroare la conversia fisierului de imagine</string>
+  <string name="error_file_not_found">Fisierul nu a fost gasit</string>
+  <string name="error_io_exception">Eroare I/O gemerala. Poate ai ramas fara spatiu liber?</string>
+  <string name="error_security_exception_during_image_copy">Aplicatia folosita pentru selectia acestei imagini nu a oferit destule permisiuni pentru a putea citi fisierul.\n\n<small>Foloseste un alt manager de fisiere pentru a alege o imagine</small></string>
+  <string name="account_status_unknown">Necunoscut</string>
+  <string name="account_status_disabled">Dezactivat temporar</string>
+  <string name="account_status_online">Conectat</string>
+  <string name="account_status_connecting">In curs de conectare\u2026</string>
+  <string name="account_status_offline">Deconectat</string>
+  <string name="account_status_unauthorized">Neautorizat</string>
+  <string name="account_status_not_found">Serverul nu a fost gasit</string>
+  <string name="account_status_no_internet">Fara conexiune</string>
+  <string name="account_status_regis_fail">Inregistrare esuata</string>
+  <string name="account_status_regis_conflict">Nume de utilizator deja alocat</string>
+  <string name="account_status_regis_success">Inregistrare completa</string>
+  <string name="account_status_regis_not_sup">Acest server nu permite inregistrarea</string>
+  <string name="account_status_security_error">Eroare de securitate</string>
+  <string name="account_status_incompatible_server">Server incompatibil</string>
+  <string name="encryption_choice_unencrypted">Ne criptat</string>
+  <string name="encryption_choice_otr">OTR</string>
+  <string name="encryption_choice_pgp">OpenGPG</string>
+  <string name="encryption_choice_omemo">OMEMO</string>
+  <string name="mgmt_account_edit">Editare cont</string>
+  <string name="mgmt_account_delete">Sterge cont</string>
+  <string name="mgmt_account_disable">Dezactivare temporara</string>
+  <string name="mgmt_account_publish_avatar">Publica avatar</string>
+  <string name="mgmt_account_publish_pgp">Publica cheia publica OpenPGP</string>
+  <string name="mgmt_account_enable">Activeaza cont</string>
+  <string name="mgmt_account_are_you_sure">Esti sigur?</string>
+  <string name="mgmt_account_delete_confirm_text">Daca iti stergi contul intregul istoric de conversatii va fi pierdut</string>
+  <string name="attach_record_voice">Inregistrare voce</string>
+  <string name="account_settings_jabber_id">ID-ul Jabber</string>
+  <string name="account_settings_password">Parola</string>
+  <string name="account_settings_example_jabber_id">username@example.com</string>
+  <string name="account_settings_confirm_password">Confirma parola</string>
+  <string name="password">Parola</string>
+  <string name="confirm_password">Confirma parola</string>
+  <string name="passwords_do_not_match">Parolele nu sunt identice</string>
+  <string name="invalid_jid">Acesta nu este un ID Jabber valabil</string>
+  <string name="error_out_of_memory">Memorie epuizata. Imaginea este prea mare.</string>
+  <string name="contact_status_online">conectat</string>
+  <string name="contact_status_free_to_chat">disponibil pentru conversatie</string>
+  <string name="contact_status_away">plecat</string>
+  <string name="contact_status_extended_away">plecat departe</string>
+  <string name="contact_status_do_not_disturb">nu deranja</string>
+  <string name="contact_status_offline">deconectat</string>
+  <string name="muc_details_conference">Conferinta</string>
+  <string name="muc_details_other_members">Alti membri</string>
+  <string name="server_info_show_more">Informatii server</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Copii indigo mesaje</string>
+  <string name="server_info_csi">XEP-0352: Indicator stare client</string>
+  <string name="server_info_blocking">XEP-0191: Comanda blocare</string>
+  <string name="server_info_roster_version">XEP-0237: Creare de versiuni lista</string>
+  <string name="server_info_stream_management">XEP-0198: Management flux</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatare / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: Incarcare fisiere prin HTTP</string>
+  <string name="server_info_available">disponibil</string>
+  <string name="server_info_unavailable">indisponibil</string>
+  <string name="missing_public_keys">Cheile publice ce nu au fost anuntate</string>
+  <string name="last_seen_now">vazut ultima data adineauri</string>
+  <string name="last_seen_min">vazut ultima data acum un minut</string>
+  <string name="last_seen_mins">vazut ultima data acum %d minute</string>
+  <string name="last_seen_hour">vazut ultima data acum o ora</string>
+  <string name="last_seen_hours">vazut ultima data acum %d ore</string>
+  <string name="last_seen_day">vazut ultima data acum o zi</string>
+  <string name="last_seen_days">vazut ultima data acum %d zile</string>
+  <string name="never_seen">niciodata vazut</string>
+  <string name="install_openkeychain">Mesaj criptat. Te rog instaleaza OpenKeychain pentru a-l putea decripta.</string>
+  <string name="unknown_otr_fingerprint">Amprenta OTR necunoscuta</string>
+  <string name="openpgp_messages_found">A fost gasit un mesaj criptat cu OpenPGP</string>
+  <string name="reception_failed">Receptie esuata</string>
+  <string name="your_fingerprint">Amprenta ta</string>
+  <string name="otr_fingerprint">Amprenta OTR</string>
+  <string name="omemo_fingerprint">Amprenta OMEMO</string>
+  <string name="omemo_fingerprint_selected_message">Amprenta OMEMO a mesajului</string>
+  <string name="this_device_omemo_fingerprint">Amprenta OMEMO proprie</string>
+  <string name="other_devices">Alte dispozitive</string>
+  <string name="trust_omemo_fingerprints">Amprente OMEMO de incredere</string>
+  <string name="done">Gata</string>
+  <string name="verify">Verifica</string>
+  <string name="decrypt">Decripteaza</string>
+  <string name="conferences">Conferinte</string>
+  <string name="search">Cauta</string>
+  <string name="create_contact">Adauga contact</string>
+  <string name="join_conference">Alatura-te conferintei</string>
+  <string name="delete_contact">Sterge contact</string>
+  <string name="view_contact_details">Arata detalii contact</string>
+  <string name="block_contact">Blocheaza contact</string>
+  <string name="unblock_contact">Deblocheaza contact</string>
+  <string name="create">Creeaza</string>
+  <string name="contact_already_exists">Contactul exista deja</string>
+  <string name="join">Alatura-te</string>
+  <string name="conference_address">Adresa conferinta</string>
+  <string name="conference_address_example">room@conference.example.com</string>
+  <string name="save_as_bookmark">Salveaza semn de carte</string>
+  <string name="delete_bookmark">Sterge semn de carte</string>
+  <string name="bookmark_already_exists">Acest semn de carte exista</string>
+  <string name="you">Tu</string>
+  <string name="action_edit_subject">Editeaza titlul conferintei</string>
+  <string name="conference_not_found">Conferinta nu a fost gasita</string>
+  <string name="leave">Paraseste</string>
+  <string name="contact_added_you">Contactul a fost adaugat in lista </string>
+  <string name="add_back">Adauga inapoi</string>
+  <string name="contact_has_read_up_to_this_point">%s a citit pana in acest loc</string>
+  <string name="publish">Publica</string>
+  <string name="touch_to_choose_picture">Atinge avatarul pentru a selecta o poza din galerie</string>
+  <string name="publish_avatar_explanation">Tine minte: Toti cei abonati la actualizarile tale de prezenta vor putea sa vada aceasta poza</string>
+  <string name="publishing">Se publica...</string>
+  <string name="error_publish_avatar_server_reject">Acest server v-a refuzat publicarea</string>
+  <string name="error_publish_avatar_converting">Ceva nu a mers bine in timpul conversiei imaginii</string>
+  <string name="error_saving_avatar">Nu s-a putut salva avatarul pe disc</string>
+  <string name="or_long_press_for_default">(Sau apasa indelung pentru a reseta la implicit)</string>
+  <string name="error_publish_avatar_no_server_support">Acest server nu permite publicarea de avatare</string>
+  <string name="private_message">sopteste</string>
+  <string name="private_message_to">catre %s</string>
+  <string name="send_private_message_to">Trimite mesaj privat catre %s</string>
+  <string name="connect">Conectare</string>
+  <string name="account_already_exists">Acest cont exista deja</string>
+  <string name="next">Urmatoarea</string>
+  <string name="server_info_session_established">Sesiune curenta stabilita</string>
+  <string name="additional_information">Informatii aditionale</string>
+  <string name="skip">Sari</string>
+  <string name="disable_notifications">Dezactiveaza notificari</string>
+  <string name="disable_notifications_for_this_conversation">Dezactiveaza notificarile pentru aceasta conversatie</string>
+  <string name="notifications_disabled">Notificari dezactivate</string>
+  <string name="enable">Activeaza</string>
+  <string name="conference_requires_password">Conferinta necesita parola</string>
+  <string name="enter_password">Introdu parola</string>
+  <string name="missing_presence_updates">Au lipsit actualizarile de prezenta de la contact</string>
+  <string name="request_presence_updates">Te rog mai intai cere actualizari de prezente de la contact.\n\n<small>Asta va fi folosita pentru a determina ce aplicatii client foloseste contactul tau</small></string>
+  <string name="request_now">Cere acum</string>
+  <string name="delete_fingerprint">Sterge amprenta</string>
+  <string name="sure_delete_fingerprint">Sigur vrei sa stergi amprenta</string>
+  <string name="ignore">Ignora</string>
+  <string name="without_mutual_presence_updates"><b>Atentie:</b> Trimitand aceasta fara actualizari de prezenta reciproce, ar putea produce probleme neprevazute.\n\n<small>Mergi la lista de contacte, la detalii, sa iti verifici abonarile la actualizarile de prezenta.</small></string>
+  <string name="pref_encryption_settings">Setari criptare</string>
+  <string name="pref_force_encryption">Forteaza criptarea conexiunii de la un capat la altul</string>
+  <string name="pref_force_encryption_summary">Trimite mereu mesajele criptate (exceptand conferintele)</string>
+  <string name="pref_dont_save_encrypted">Nu salva mesaje criptate</string>
+  <string name="pref_dont_save_encrypted_summary">Atentie: Asta poate duce la pierderea de mesaje</string>
+  <string name="pref_expert_options">Optiuni expert</string>
+  <string name="pref_expert_options_summary">Te rog sa fi atent cu astea</string>
+  <string name="title_activity_about">Despre Conversations</string>
+  <string name="pref_about_conversations_summary">Informatii despre versiune si licenta</string>
+  <string name="title_pref_quiet_hours">Ore de liniste</string>
+  <string name="title_pref_quiet_hours_start_time">Ora de pornire</string>
+  <string name="title_pref_quiet_hours_end_time">Ora de inchidere</string>
+  <string name="title_pref_enable_quiet_hours">Activeaza orar de liniste</string>
+  <string name="pref_quiet_hours_summary">Notificarile vor fi reduse la tacere in timpul orelor de liniste</string>
+  <string name="pref_use_larger_font">Mareste marimea literelor</string>
+  <string name="pref_use_larger_font_summary">Foloseste marimea mai mare de text in toata aplicatia</string>
+  <string name="pref_use_send_button_to_indicate_status">Butonul de trimitere indica startea</string>
+  <string name="pref_use_indicate_received">Cere raport de primire</string>
+  <string name="pref_use_indicate_received_summary">Mesajele primite vor fi marcate cu un semn verde daca este suportat</string>
+  <string name="pref_use_send_button_to_indicate_status_summary">Coloreaza butonul de trimitere pentru a indica starea contactului</string>
+  <string name="pref_expert_options_other">Altele</string>
+  <string name="pref_conference_name">Titlu conferinta</string>
+  <string name="pref_conference_name_summary">Foloseste subiectul camerei in locul JID pentru a identifica conferinta</string>
+  <string name="toast_message_otr_fingerprint">Amprenta OTR copiata in memorie</string>
+  <string name="toast_message_omemo_fingerprint">Amprenta OMEMO copiata in memorie!</string>
+  <string name="conference_banned">Ti-a fost interzis accesul la aceasta conferinta</string>
+  <string name="conference_members_only">Aceasta conferinta este rezervata membrilor</string>
+  <string name="conference_kicked">Ai fost dat afara din conferinta</string>
+  <string name="using_account">folosind cont %s</string>
+  <string name="checking_x">Verifica %s pe gazda HTTP</string>
+  <string name="not_connected_try_again">Nu esti conectat. Incearca din nou mai tarziu.</string>
+  <string name="check_x_filesize">Verifica marimea %s</string>
+  <string name="message_options">Optiuni mesaje</string>
+  <string name="copy_text">Copiaza text</string>
+  <string name="copy_original_url">Copiaza URL original</string>
+  <string name="send_again">Trimite din nou</string>
+  <string name="file_url">URL fisier</string>
+  <string name="message_text">Mesaj text</string>
+  <string name="url_copied_to_clipboard">URL copiat in memorie</string>
+  <string name="message_copied_to_clipboard">Mesaj copiat in memorie</string>
+  <string name="image_transmission_failed">Transmisia imaginii a esuat</string>
+  <string name="scan_qr_code">Scaneaza cod QR</string>
+  <string name="show_qr_code">Arata codul QR</string>
+  <string name="show_block_list">Arata lista blocata</string>
+  <string name="account_details">Detalii cont</string>
+  <string name="verify_otr">Verifica OTR</string>
+  <string name="remote_fingerprint">Amprenta la distanta</string>
+  <string name="scan">scaneaza</string>
+  <string name="or_touch_phones">(sau dispozitive touch)</string>
+  <string name="smp">Socialist Millionaire Protocol</string>
+  <string name="shared_secret_hint">Indiciu sau Intrebare</string>
+  <string name="shared_secret_secret">Secret impartasit</string>
+  <string name="confirm">Confirma</string>
+  <string name="in_progress">In desfasurare</string>
+  <string name="respond">Raspunde</string>
+  <string name="failed">Esuat</string>
+  <string name="secrets_do_not_match">Secretele nu se potrivesc</string>
+  <string name="try_again">Incearca din nou</string>
+  <string name="finish">Incheie</string>
+  <string name="verified">Verificat!</string>
+  <string name="smp_requested">Contactul a cerut verificare SMP</string>
+  <string name="no_otr_session_found">Nu s-a gasit nici o sesiune OTR valida</string>
+  <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>
+  <string name="download_x_file">Descarca %s</string>
+  <string name="file">fisier</string>
+  <string name="open_x_file">Deschide %s</string>
+  <string name="sending_file">trimit (%1$d%% complet)</string>
+  <string name="preparing_file">Pregatire fisier pentru transmisie</string>
+  <string name="x_file_offered_for_download">%s oferit spre descarcare</string>
+  <string name="cancel_transmission">Anuleaza transmisiunea</string>
+  <string name="file_transmission_failed">transmisie fisier esuata</string>
+  <string name="file_deleted">Fisierul a fost sters</string>
+  <string name="no_application_found_to_open_file">Nu s-a gasi nici o aplicatie care sa deschida fisierul</string>
+  <string name="could_not_verify_fingerprint">Nu s-a putut verifica amprenta</string>
+  <string name="manually_verify">Verifica manual</string>
+  <string name="are_you_sure_verify_fingerprint">Sigur vrei sa verifici amprenta OTR a persoanei de contact?</string>
+  <string name="pref_show_dynamic_tags">Arata etichetele dinamice</string>
+  <string name="pref_show_dynamic_tags_summary">Arata etichete doar pentru citire sub contacte </string>
+  <string name="enable_notifications">Activeaza notificari</string>
+  <string name="conference_with">Creeaza conferinta cu...</string>
+  <string name="no_conference_server_found">Serverul conferintei nu a fost gasita</string>
+  <string name="conference_creation_failed">Conferinta nu a putut fi creata!</string>
+  <string name="conference_created">Conferinta a fost creata!</string>
+  <string name="secret_accepted">Secret acceptat!</string>
+  <string name="reset">Reseteaza</string>
+  <string name="account_image_description">Avatar cont</string>
+  <string name="copy_otr_clipboard_description">Copiaza amprenta OTR in memorie</string>
+  <string name="copy_omemo_clipboard_description">Copiaza amprenta OMEMO in memorie</string>
+  <string name="regenerate_omemo_key">Genereaza din nou cheia OMEMO</string>
+  <string name="wipe_omemo_pep">Sterge alte dispozitive din PEP</string>
+  <string name="clear_other_devices">Curata lista dispozitive</string>
+  <string name="clear_other_devices_desc">Sigur vrei sa inlaturi toate celelalte dispozitive din mesajul de anunt OMEMO? Data viitoare cand dispozitivele se vor conecta, se vor anunta din nou, dar se poate ca ele sa nu fi primit mesajele trimise intre timp.</string>
+  <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">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>
+  <string name="no_more_history_on_server">Nu mai exista istoric pe server</string>
+  <string name="updating">Actualizez...</string>
+  <string name="password_changed">Parola schimbata</string>
+  <string name="could_not_change_password">Nu s-a putut schimba parola</string>
+  <string name="otr_session_not_started">Trimite un mesaj pentru a pornii o discutie criptata</string>
+  <string name="ask_question">Intreaba</string>
+  <string name="smp_explain_question">Tu si contactul tau aveti un secret in comun pe care nimeni altcineva nu il stie (cum ar fi o gluma sau ce ati mancat ultima data cand v-ati vazut) poti folosi acel secret ca sa va verificati amprenta fiecaruia.\n\nTu pui la dispozitie un indiciu sau o intrebare contactului iar el/ea va raspunde cu un mesaj sensibil la majuscule.</string>
+  <string name="smp_explain_answer">Contactul tau doreste sa iti verifice amprenta provocandu-te cu un secret partajat. Contactul tau a furnizat urmatorul indiciu sau intrebare legat de acel secret.</string>
+  <string name="shared_secret_hint_should_not_be_empty">Indiciul tau nu ar trebui sa fie gol</string>
+  <string name="shared_secret_can_not_be_empty">Secretul tau impartasit nu poate fi gol</string>
+  <string name="manual_verification_explanation">Compara cu grija amprenta afisata mai jos cu amprenta contactului.\nPoti folosi orice forma de comunicare de incredere precum un e-mail criptat sau o convorbire telefonica pentru a face schimb de amprente.</string>
+  <string name="change_password">Schimba parola</string>
+  <string name="current_password">Parola curenta</string>
+  <string name="new_password">Parola noua</string>
+  <string name="password_should_not_be_empty">Parola nu trebuie sa fie goala</string>
+  <string name="enable_all_accounts">Activeaza toate conturile</string>
+  <string name="disable_all_accounts">Dezactiveaza toate conturile</string>
+  <string name="perform_action_with">Efectuaza actiune cu</string>
+  <string name="no_affiliation">Fara afiliere</string>
+  <string name="no_role">Fara rol</string>
+  <string name="outcast">proscris</string>
+  <string name="member">Membru</string>
+  <string name="advanced_mode">Mod avansat</string>
+  <string name="grant_membership">Acorda calitatea de membru</string>
+  <string name="remove_membership">Abroga calitatea de membru</string>
+  <string name="grant_admin_privileges">Acorda privilegii de administrator</string>
+  <string name="remove_admin_privileges">Abroga privilegii de administrator</string>
+  <string name="remove_from_room">Inlatura din conferinta</string>
+  <string name="could_not_change_affiliation">Nu s-a putut schimba afilierea lui %s</string>
+  <string name="ban_from_conference">Interzice accesul la conferinta</string>
+  <string name="removing_from_public_conference">Incerci sa il inlaturi pe %s dintr-o conferinta publica. Singurul mod in care poti face asta este sa in blochezi pentru totdeauna.</string>
+  <string name="ban_now">Interzice accesul acum</string>
+  <string name="could_not_change_role">Nu s-a putut schimba rolul lui %s</string>
+  <string name="public_conference">Conferinta accesibila public</string>
+  <string name="private_conference">Conferinta privata, accesibila numai membrilor</string>
+  <string name="conference_options">Optiuni conferinta</string>
+  <string name="members_only">Privat, numai pentru membri</string>
+  <string name="non_anonymous">Ne anonim</string>
+  <string name="moderated">Monitorizata</string>
+  <string name="you_are_not_participating">Tu nu participi</string>
+  <string name="modified_conference_options">Optiuni conferinta modificate!</string>
+  <string name="could_not_modify_conference_options">Nu s-au putut modifca optiunile conferintei</string>
+  <string name="never">Niciodata</string>
+  <string name="thirty_minutes">30 minute</string>
+  <string name="one_hour">O ora</string>
+  <string name="two_hours">2 ore</string>
+  <string name="eight_hours">8 ore</string>
+  <string name="until_further_notice">Pana la noi ordine</string>
+  <string name="pref_input_options">Optiuni introducere</string>
+  <string name="pref_enter_is_send">ENTER trimite</string>
+  <string name="pref_enter_is_send_summary">Apasa tasta ENTER pentru a trimite mesajul</string>
+  <string name="pref_display_enter_key">Arata tasta ENTER</string>
+  <string name="pref_display_enter_key_summary">Preschimba tasta de zambilici in ENTER</string>
+  <string name="audio">audio</string>
+  <string name="video">video</string>
+  <string name="image">imagine</string>
+  <string name="pdf_document">document PDF</string>
+  <string name="apk">Aplicatie Android</string>
+  <string name="vcard">Contact</string>
+  <string name="received_x_file">Primit %s</string>
+  <string name="disable_foreground_service">Dezactiveaza serviciul in prim plan</string>
+  <string name="touch_to_open_conversations">Atinge pentru a deschide Conversations</string>
+  <string name="avatar_has_been_published">Avatarul a fost publicat!</string>
+  <string name="sending_x_file">Trimit %s</string>
+  <string name="offering_x_file">Ofer %s</string>
+  <string name="hide_offline">Ascunde deconectat</string>
+  <string name="disable_account">Dezactiveaza cont</string>
+  <string name="contact_has_stopped_typing">%s s-a oprit din scris</string>
+  <string name="pref_chat_states">Notificari cand cineva scrie</string>
+  <string name="pref_chat_states_summary">Anunta contactul cand scrii un mou mesa</string>
+  <string name="send_location">Trimite locatia</string>
+  <string name="show_location">Arata locatia</string>
+  <string name="no_application_found_to_display_location">Nu s-a gasit nici o aplicatie care sa afiseze locatia</string>
+  <string name="location">Locatie</string>
+  <string name="received_location">Locatie primita</string>
+  <string name="title_undo_swipe_out_conversation">Conversatie inchisa</string>
+  <string name="title_undo_swipe_out_muc">A parasit conferinta</string>
+  <string name="pref_dont_trust_system_cas_title">Nu ai incredere in CA din sistem</string>
+  <string name="pref_dont_trust_system_cas_summary">Toate certificatele trebuie aprobate manual</string>
+  <string name="pref_remove_trusted_certificates_title">Inlatura certificatele</string>
+  <string name="pref_remove_trusted_certificates_summary">Sterge certificate aprobate manual</string>
+  <string name="toast_no_trusted_certs">Nici un certificat aprobat manual</string>
+  <string name="dialog_manage_certs_title">Inlatura certificatele</string>
+  <string name="dialog_manage_certs_positivebutton">Sterge selectia</string>
+  <string name="dialog_manage_certs_negativebutton">Anuleaza</string>
+  <plurals name="toast_delete_certificates">
+    <item quantity="one">%d certificat sters</item>
+    <item quantity="few">%d certificate sterse</item>
+    <item quantity="other">%d certificate sterse</item>
+  </plurals>
+  <plurals name="select_contact">
+    <item quantity="one">Selecteaza %d contact</item>
+    <item quantity="few">Selecteaza %d contacte</item>
+    <item quantity="other">Selecteaza %d contacte</item>
+  </plurals>
+  <string name="pref_quick_action_summary">Inlocuieste butonul de trimitere cu actiune rapida</string>
+  <string name="pref_quick_action">Actiune rapida</string>
+  <string name="none">Nimic</string>
+  <string name="recently_used">Folosit recent</string>
+  <string name="choose_quick_action">Alege actiune rapida</string>
+  <string name="search_for_contacts_or_groups">Cauta contacte sau grupuri</string>
+  <string name="send_private_message">trimite mesaj privat</string>
+  <string name="user_has_left_conference">%s a parasit conferinta!</string>
+  <string name="username">Nume utilizator</string>
+  <string name="username_hint">Nume utilizator</string>
+  <string name="invalid_username">Acesta nu este un nume de utilizator valabil</string>
+  <string name="download_failed_server_not_found">Descarcarea a esuat: Serverul nu a fost gasit</string>
+  <string name="download_failed_file_not_found">Descarcare esuata: Fisierul nu a fost gasit</string>
+  <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="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>
+  <string name="pref_away_when_screen_off_summary">Marcheaza resursa drept plecata cand ecranul este oprit</string>
+  <string name="pref_xa_on_silent_mode">Indisponibil in mod silentios</string>
+  <string name="pref_xa_on_silent_mode_summary">Marcheaza resursa drept indisponibila cand dispozitivul este in mod silentios</string>
+  <string name="action_add_account_with_certificate">Adauga un cont cu certificat</string>
+  <string name="unable_to_parse_certificate">Nu se poate analiza certificatul</string>
+  <string name="authenticate_with_certificate">Lasa gol pentru a autentifica cu un certificat</string>
+  <string name="captcha_ocr">Text captcha de verificare</string>
+  <string name="captcha_required">Text captcha de verificare necesar</string>
+  <string name="captcha_hint">introdu textul din imagine</string>
+  <string name="certificate_chain_is_not_trusted">Seria de certificate nu este de incredere</string>
+  <string name="jid_does_not_match_certificate">ID-ul Jabber nu corespunde cu certificatul</string>
+  <string name="action_renew_certificate">Innoieste certificatul</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 4c5c205f..968d4f04 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d мин. назад</string>
   <string name="unread_conversations">непрочитанных сообщений</string>
   <string name="sending">отправка…</string>
-  <string name="encrypted_message">Расшифровка сообщения. Пожалуйста, подождите…</string>
   <string name="nick_in_use">Имя уже используется</string>
   <string name="admin">Администратор</string>
   <string name="owner">Владелец</string>
@@ -74,9 +73,11 @@
   <string name="clear_conversation_history">Очистить историю</string>
   <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>
   <string name="send_pgp_message">Отправить OpenPGP защифрованное сообщение</string>
   <string name="your_nick_has_been_changed">Ваш псевдоним был изменен</string>
   <string name="send_unencrypted">Отправить в незашифрованном виде</string>
@@ -91,7 +92,6 @@
   <string name="contact_has_no_pgp_key">Conversations не может зашифровать сообщение, потому что удаленный пользователь не анонсирует свой открытый ключ.\n\n<small>Пожалуйста, попросите удаленного пользователя тоже установить OpenPGP.</small></string>
   <string name="no_pgp_keys">Нет OpenPGP ключей</string>
   <string name="contacts_have_no_pgp_keys">Conversations не может зашифровать сообщения, потому что удаленные пользователи не анонсируют свои открытые ключи.\n\n<small>Пожалуйста, попросите удаленных пользователей тоже установить OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Зашифрованное сообщение получено. Нажмите здесь, чтобы расшифровать и посмотреть сообщение.</i></string>
   <string name="pref_general">Общие</string>
   <string name="pref_xmpp_resource">Название ресурса</string>
   <string name="pref_xmpp_resource_summary">Имя которым Conversations идентифицирует себя</string>
@@ -104,6 +104,8 @@
   <string name="pref_vibrate_summary">Использовать вибрацию когда приходят новые сообщения</string>
   <string name="pref_sound">Звуковой сигнал</string>
   <string name="pref_sound_summary">Выберите звуковой сигнал для сообщений</string>
+  <string name="pref_conference_notifications">Уведомления в публичных конференциях</string>
+  <string name="pref_conference_notifications_summary">Всегда уведомлять, когда сообщение появляется в публичной конференции вместо простого подсвечивания</string>
   <string name="pref_notification_grace_period">Отсрочка уведомлений</string>
   <string name="pref_notification_grace_period_summary">Не использовать уведомления, если вы прочитали сообщение на другом устройстве</string>
   <string name="pref_advanced_options">Дополнительные параметры</string>
@@ -149,6 +151,7 @@
   <string name="encryption_choice_unencrypted">Без шифра</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="encryption_choice_omemo">OMEMO</string>
   <string name="mgmt_account_edit">Редактировать аккаунт</string>
   <string name="mgmt_account_delete">Удалить</string>
   <string name="mgmt_account_disable">Отключить</string>
@@ -167,7 +170,6 @@
   <string name="passwords_do_not_match">Пароли не совпадают</string>
   <string name="invalid_jid">Недопустимый JID (Джаббер 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>
@@ -183,6 +185,8 @@
   <string name="server_info_blocking">XEP-0191:  Команда Блокирования</string>
   <string name="server_info_roster_version">XEP-0237: Управление версиями списков</string>
   <string name="server_info_stream_management">XEP-0198: Управление потоками</string>
+  <string name="server_info_pep">XEP-0163: PEP (Аватары / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: Загрузка файлов по HTTP</string>
   <string name="server_info_available">доступен</string>
   <string name="server_info_unavailable">недоступен</string>
   <string name="missing_public_keys">Отсутствие анонсирования открытых ключей</string>
@@ -200,12 +204,11 @@
   <string name="reception_failed">Прием не удался</string>
   <string name="your_fingerprint">Контрольная сумма</string>
   <string name="otr_fingerprint">OTR контрольная сумма</string>
-  <string name="omemo_fingerprint">OMEMO контрольная сумма</string>
-  <string name="omemo_fingerprint_selected_message">OMEMO контрольная сумма сообщения</string>
-  <string name="this_device_omemo_fingerprint">Собственная OMEMO контрольная сумма</string>
+  <string name="omemo_fingerprint">OMEMO отпечаток</string>
+  <string name="omemo_fingerprint_selected_message">OMEMO отпечаток сообщения</string>
+  <string name="this_device_omemo_fingerprint">Собственный OMEMO отпечаток</string>
   <string name="other_devices">Другие устройства</string>
-  <string name="trust_omemo_fingerprints">Доверенные контрольные суммы OMEMO</string>
-  <string name="fetching_keys">Получение ключей...</string>
+  <string name="trust_omemo_fingerprints">Доверенные отпечатки OMEMO</string>
   <string name="done">Готово</string>
   <string name="verify">Подтвердить</string>
   <string name="decrypt">Дешифровать</string>
@@ -287,15 +290,19 @@
   <string name="pref_conference_name">Название конференции</string>
   <string name="pref_conference_name_summary">Использовать тему беседы заместо JID для отображения конференций</string>
   <string name="toast_message_otr_fingerprint">OTR-отпечаток скопирован в буфер обмена!</string>
+  <string name="toast_message_omemo_fingerprint">OMEMO отпечаток скопирован в буфер обмена!</string>
   <string name="conference_banned">Вы заблокированы в этой конференции</string>
   <string name="conference_members_only">Эта конференция требует членства</string>
   <string name="conference_kicked">Вы были удалены из конференции</string>
   <string name="using_account">использовать учётную запись %s</string>
+  <string name="checking_x">Проверка %s на сервере HTTP</string>
   <string name="not_connected_try_again">Вы неподключены. Попробуйте позже</string>
+  <string name="check_x_filesize">Проверьте размер %s</string>
   <string name="message_options">Опции сообщения</string>
   <string name="copy_text">Копировать текст</string>
   <string name="copy_original_url">Копировать адрес ссылки</string>
   <string name="send_again">Отправить ещё раз</string>
+  <string name="file_url">URL файла</string>
   <string name="message_text">Текст сообщения</string>
   <string name="url_copied_to_clipboard">Ссылка скопирована в буфер обмена</string>
   <string name="message_copied_to_clipboard">Сообщение скопировано в буфер обмена</string>
@@ -324,6 +331,9 @@
   <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>
   <string name="download_x_file">Загружено %s</string>
@@ -355,6 +365,11 @@
   <string name="wipe_omemo_pep">Стереть другие устройства из PEP</string>
   <string name="clear_other_devices">Очистить устройства</string>
   <string name="clear_other_devices_desc">Вы уверены, что хотите очистить все остальные устройства из анонса ключей OMEMO? При соединении устройств в следующий раз новые ключи анонсируются автоматически, но устройства могут не получить сообщения, посланные до этого.</string>
+  <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">Для этого контакта не существует доступных ключей. Если вы очистили все его ключи, ему необходимо создать новые.</string>
+  <string name="error_trustkeys_title">Ошибка</string>
   <string name="fetching_history_from_server">Получение истории с сервера</string>
   <string name="no_more_history_on_server">На сервере больше нет истории</string>
   <string name="updating">Обновление...</string>
@@ -392,7 +407,10 @@
   <string name="public_conference">Публичная конференция</string>
   <string name="private_conference">Приватная конференция только для членов</string>
   <string name="conference_options">Настройки конференции</string>
+  <string name="members_only">Частная, только для участников</string>
   <string name="non_anonymous">Не анонимно </string>
+  <string name="moderated">Модерируемая</string>
+  <string name="you_are_not_participating">Вы не участвуете</string>
   <string name="modified_conference_options">Настройки конференции изменены!</string>
   <string name="could_not_modify_conference_options">Не удалось изменить настройки конференции</string>
   <string name="never">Никогда</string>
@@ -420,7 +438,6 @@
   <string name="offering_x_file">Предложен %s</string>
   <string name="hide_offline">Скрыть пользователей вне сети</string>
   <string name="disable_account">Отключить учётную запись</string>
-  <string name="contact_is_typing">%s набирает сообщение...</string>
   <string name="contact_has_stopped_typing">%s прекратил набор</string>
   <string name="pref_chat_states">Оповещения о наборе</string>
   <string name="pref_chat_states_summary">Позволяет вашим контактам видеть когда вы пишете новое сообщение</string>
@@ -456,4 +473,30 @@
   <string name="none">Нет</string>
   <string name="recently_used">Последнее выбранное</string>
   <string name="choose_quick_action">Выбрать быстрое действие</string>
+  <string name="search_for_contacts_or_groups">Поиск контактов или групп</string>
+  <string name="send_private_message">Отправить частное сообщение</string>
+  <string name="user_has_left_conference">%s покинул конференцию!</string>
+  <string name="username">Имя пользователя</string>
+  <string name="username_hint">Имя пользователя</string>
+  <string name="invalid_username">Недопустимое имя пользователя</string>
+  <string name="download_failed_server_not_found">Загрузка не удалась: сервер не найден</string>
+  <string name="download_failed_file_not_found">Загрузка не удалась: файл не найден</string>
+  <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="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>
+  <string name="captcha_ocr">Проверочный текст</string>
+  <string name="captcha_required">Необходима проверка</string>
+  <string name="captcha_hint">введите текст с картинки</string>
+  <string name="certificate_chain_is_not_trusted">Цепочка сертификата не доверена</string>
+  <string name="jid_does_not_match_certificate">Jabber ID не соответствует сертификату</string>
+  <string name="action_renew_certificate">Обновить сертификат</string>
 </resources>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index b0f982c2..c544d3b4 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -27,8 +27,7 @@
   <string name="minute_ago">pred 1 minútou</string>
   <string name="minutes_ago">pred %d minútami</string>
   <string name="unread_conversations">neprečítané konverzácie</string>
-  <string name="sending">odosielam…</string>
-  <string name="encrypted_message">Dešifrujem správu. Čakajte, prosím…</string>
+  <string name="sending">posielam...</string>
   <string name="nick_in_use">Prezývka už existuje</string>
   <string name="admin">Administrátor</string>
   <string name="owner">Vlastník</string>
@@ -74,8 +73,11 @@
   <string name="clear_conversation_history">Vymazať históriu konverzácií</string>
   <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>
   <string name="send_pgp_message">Poslať OpenPGP šifrovanú správu</string>
   <string name="your_nick_has_been_changed">Prezývka sa zmenila</string>
   <string name="send_unencrypted">Poslať nešifrované</string>
@@ -90,7 +92,6 @@
   <string name="contact_has_no_pgp_key">Nie je možné zašifrovať správu v aplikácii Conversations, pretože druhá strana neoznamuje svoj verejný kľúč.\n\n<small>Požiadajte svoj kontakt o nastavenie OpenPGP.</small></string>
   <string name="no_pgp_keys">Nenašli sa žiadne OpenPGP kľúče</string>
   <string name="contacts_have_no_pgp_keys">Nie je možné zašifrovať správy v aplikácii Conversations, pretože kontakty neoznamujú svoj verejný kľúč.\n\n<small>Požiadajte svoje kontakty o nastavenie OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Bola prijatá šifrovaná správa. Kliknite pre dešifrovanie a prečítanie.</i></string>
   <string name="pref_general">Všeobecné</string>
   <string name="pref_xmpp_resource">XMPP zdroj</string>
   <string name="pref_xmpp_resource_summary">Meno, ktorým sa tento klient identifikuje</string>
@@ -103,6 +104,8 @@
   <string name="pref_vibrate_summary">Vibrovať pri prijatí novej správy</string>
   <string name="pref_sound">Zvuk</string>
   <string name="pref_sound_summary">Prehrať zvuk spolu s upozornením</string>
+  <string name="pref_conference_notifications">Upozornenia vo verejných konverzáciách</string>
+  <string name="pref_conference_notifications_summary">Vždy upozorniť na prichádzajúcu správu vo verejnej konverzácii, nie len keď je zvýraznená</string>
   <string name="pref_notification_grace_period">Doba na prečítanie upozornenia</string>
   <string name="pref_notification_grace_period_summary">Neupozorňovať krátko po obdržaní kópie správy</string>
   <string name="pref_advanced_options">Rozšírené možnosti</string>
@@ -145,8 +148,10 @@
   <string name="account_status_regis_not_sup">Server nepodporuje registráciu</string>
   <string name="account_status_security_error">Bezpečnostná chyba</string>
   <string name="account_status_incompatible_server">Nekompatibilný server</string>
+  <string name="encryption_choice_unencrypted">Nezašifrovaný</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="encryption_choice_omemo">OMEMO</string>
   <string name="mgmt_account_edit">Upraviť účet</string>
   <string name="mgmt_account_delete">Vymazať účet</string>
   <string name="mgmt_account_disable">Dočasne vypnúť</string>
@@ -165,7 +170,6 @@
   <string name="passwords_do_not_match">Heslá nezodpovedajú</string>
   <string name="invalid_jid">Toto nie je platné Jabber ID</string>
   <string name="error_out_of_memory">Nedostatok pamäti. Obrázok je príliš veľký</string>
-  <string name="add_phone_book_text">Chcete pridať %s do svojho telefónneho zoznamu?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">dostupný pre chat</string>
   <string name="contact_status_away">preč</string>
@@ -181,6 +185,8 @@
   <string name="server_info_blocking">XEP-0191: Blocking Command</string>
   <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
+  <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
   <string name="server_info_available">dostupný</string>
   <string name="server_info_unavailable">nedostupný</string>
   <string name="missing_public_keys">Chýba oznámenie o verejnom kľúči</string>
@@ -198,6 +204,12 @@
   <string name="reception_failed">Príjem zlyhal</string>
   <string name="your_fingerprint">Váš identifikátor</string>
   <string name="otr_fingerprint">OTR identifikátor</string>
+  <string name="omemo_fingerprint">OMEMO identifikátor</string>
+  <string name="omemo_fingerprint_selected_message">OMEMO identifkátor správy</string>
+  <string name="this_device_omemo_fingerprint">Vlastný OMEMO identifikátor</string>
+  <string name="other_devices">Ostatné zariadenia</string>
+  <string name="trust_omemo_fingerprints">Dôverovať OMEMO identifikátoru</string>
+  <string name="done">Dokončený</string>
   <string name="verify">Overiť</string>
   <string name="decrypt">Dešifrovať</string>
   <string name="conferences">Skupinové konverzácie</string>
@@ -282,6 +294,7 @@
   <string name="conference_members_only">Táto konverzácia je iba pre členov</string>
   <string name="conference_kicked">Vyčlenili vás z tejto konverzácie</string>
   <string name="using_account">Používa sa účet %s</string>
+  <string name="checking_x">Overiť %s na HTTP host</string>
   <string name="not_connected_try_again">Nie ste pripojený. Skúste to neskôr</string>
   <string name="check_x_filesize">Overiť %s veľkosť</string>
   <string name="message_options">Možnosti správy</string>
@@ -343,6 +356,8 @@
   <string name="reset">Vymazať</string>
   <string name="account_image_description">Avatar účtu</string>
   <string name="copy_otr_clipboard_description">Skopírovať OTR identifikátor do schránky</string>
+  <string name="copy_omemo_clipboard_description">Skopírovať OMEMO identifikátor do schránky</string>
+  <string name="error_trustkeys_title">Chyba</string>
   <string name="fetching_history_from_server">Načítať históriu zo serveru</string>
   <string name="no_more_history_on_server">Na serveri nie je žiadna ďalšia história</string>
   <string name="updating">Aktualizujem...</string>
@@ -381,6 +396,7 @@
   <string name="private_conference">Súkromná konverzácia iba pre členov</string>
   <string name="conference_options">Možnosti skupinovej konverzácie</string>
   <string name="non_anonymous">Neanonymný</string>
+  <string name="you_are_not_participating">Nezúčastňujete sa</string>
   <string name="modified_conference_options">Možnosti skupinovej konverzácie nastavené!</string>
   <string name="could_not_modify_conference_options">Nepodarilo sa nastaviť možnosti skupinovej konverzácie</string>
   <string name="never">Nikdy</string>
@@ -408,7 +424,6 @@
   <string name="offering_x_file">Ponúkam %s</string>
   <string name="hide_offline">Skryť neprihlásených</string>
   <string name="disable_account">Vypnúť účet</string>
-  <string name="contact_is_typing">%s píše...</string>
   <string name="contact_has_stopped_typing">%s prestal písať</string>
   <string name="pref_chat_states">Upozornenia pri písaní</string>
   <string name="pref_chat_states_summary">Upozorniť kontakt, keď píšete novú správu</string>
@@ -445,4 +460,14 @@
   <string name="search_for_contacts_or_groups">Hľadať kontakty alebo skupiny</string>
   <string name="send_private_message">Poslať súkromnú správu</string>
   <string name="user_has_left_conference">%s opustil skupinovú konverzáciu!</string>
+  <string name="username">Užívateľské meno</string>
+  <string name="username_hint">Užívateľské meno</string>
+  <string name="invalid_username">Toto nie je platné užívateľské meno</string>
+  <string name="pref_xa_on_silent_mode">Nedostupný v tichom režime</string>
+  <string name="action_add_account_with_certificate">Pridať účet s certifikátom</string>
+  <string name="unable_to_parse_certificate">Neschopný analyzovať certifikát</string>
+  <string name="captcha_ocr">Text CAPTCHA</string>
+  <string name="captcha_required">Potrebný CAPTCHA</string>
+  <string name="captcha_hint">vložiť text z obrázku</string>
+  <string name="action_renew_certificate">Obnoviť certifikát</string>
 </resources>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 5cf49475..9858950a 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -5,7 +5,7 @@
   <string name="action_accounts">Управљај налозима</string>
   <string name="action_end_conversation">Окончај преписку</string>
   <string name="action_contact_details">Детаљи контакта</string>
-  <string name="action_muc_details">Детаљи конференције</string>
+  <string name="action_muc_details">Детаљи групног ћаскања</string>
   <string name="action_secure">Безбедна преписка</string>
   <string name="action_add_account">Додај налог</string>
   <string name="action_edit_contact">Уреди име</string>
@@ -17,7 +17,7 @@
   <string name="action_unblock_domain">Одблокирај домен</string>
   <string name="title_activity_manage_accounts">Управљање налозима</string>
   <string name="title_activity_settings">Поставке</string>
-  <string name="title_activity_conference_details">Детаљи конференције</string>
+  <string name="title_activity_conference_details">Детаљи групног ћаскања</string>
   <string name="title_activity_contact_details">Детаљи контакта</string>
   <string name="title_activity_sharewith">Подели са преписком</string>
   <string name="title_activity_start_conversation">Почни преписку</string>
@@ -28,7 +28,6 @@
   <string name="minutes_ago">пре %d минута</string>
   <string name="unread_conversations">непрочитане преписке</string>
   <string name="sending">шаљем…</string>
-  <string name="encrypted_message">Дешифрујем поруку, сачекајте…</string>
   <string name="nick_in_use">Надимак је већ у употреби</string>
   <string name="admin">Администратор</string>
   <string name="owner">Власник</string>
@@ -74,6 +73,7 @@
   <string name="clear_conversation_history">Брисање историјата преписки</string>
   <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">Пошаљи ОТР шифровану поруку</string>
@@ -92,7 +92,6 @@
   <string name="contact_has_no_pgp_key">Конверзација није могла да шифрује ваше поруке јер ваш контакт не објављује свој јавни кључ.\n\n<small>Замолите вашег контакта да постави ОпенПГП.</small></string>
   <string name="no_pgp_keys">Нема ОпенПГП кључева</string>
   <string name="contacts_have_no_pgp_keys">Конверзација није могла да шифрује ваше поруке јер ваши контакти не објављују свој јавни кључ.\n\n<small>Замолите ваше контакте да поставе ОпенПГП.</small></string>
-  <string name="encrypted_message_received"><i>Примљена је шифрована порука. Додирните за дешифровање и приказ.</i></string>
   <string name="pref_general">Опште</string>
   <string name="pref_xmpp_resource">ИксМПП ресурс</string>
   <string name="pref_xmpp_resource_summary">Име са којим се овај клијент идентификује</string>
@@ -105,10 +104,10 @@
   <string name="pref_vibrate_summary">Вибрирај кад стигне нова порука</string>
   <string name="pref_sound">Звук</string>
   <string name="pref_sound_summary">Звуци обавештења</string>
-  <string name="pref_conference_notifications">Обавештења у јавним конференцијама</string>
-  <string name="pref_conference_notifications_summary">Увек обавести кад стигне порука у конференцији уместо само кад је означена</string>
+  <string name="pref_conference_notifications">Обавештења у групним ћаскањима</string>
+  <string name="pref_conference_notifications_summary">Увек обавештавај кад стигне порука у групном ћаскању уместо само кад је означена</string>
   <string name="pref_notification_grace_period">Период одгоде обавештења</string>
-  <string name="pref_notification_grace_period_summary">Онемогући обавештења на кратко по примању карбон копије</string>
+  <string name="pref_notification_grace_period_summary">Искључи обавештења на кратко по примању карбон копије</string>
   <string name="pref_advanced_options">Напредне поставке</string>
   <string name="pref_never_send_crash">Никад не шаљи извештаје о паду</string>
   <string name="pref_never_send_crash_summary">Слањем контратрага помажете текући развој Конверзације</string>
@@ -136,7 +135,7 @@
   <string name="error_io_exception">Општа У/И грешка. Можда вам је нестало простора у складишту?</string>
   <string name="error_security_exception_during_image_copy">Апликација којом сте изабрали ову слику није дала довољне дозволе за читање фајла.\n\n<small>Користите други менаџер фајлова да изаберете слику</small></string>
   <string name="account_status_unknown">Непознато</string>
-  <string name="account_status_disabled">Привремено онемогућен</string>
+  <string name="account_status_disabled">Привремено искључен</string>
   <string name="account_status_online">На вези</string>
   <string name="account_status_connecting">Повезивање\u2026</string>
   <string name="account_status_offline">Ван везе</string>
@@ -155,10 +154,10 @@
   <string name="encryption_choice_omemo">ОМЕМО</string>
   <string name="mgmt_account_edit">Уреди налог</string>
   <string name="mgmt_account_delete">Обриши налог</string>
-  <string name="mgmt_account_disable">Привремено онемогући</string>
+  <string name="mgmt_account_disable">Привремено искључи</string>
   <string name="mgmt_account_publish_avatar">Објави аватар</string>
   <string name="mgmt_account_publish_pgp">Објави ОпенПГП јавни кључ</string>
-  <string name="mgmt_account_enable">Омогући налог</string>
+  <string name="mgmt_account_enable">Укључи налог</string>
   <string name="mgmt_account_are_you_sure">Да ли сте сигурни?</string>
   <string name="mgmt_account_delete_confirm_text">Ако обришете ваш налог изгубићете сав историјат преписке</string>
   <string name="attach_record_voice">Сними глас</string>
@@ -171,14 +170,13 @@
   <string name="passwords_do_not_match">Лозинке се не поклапају</string>
   <string name="invalid_jid">Ово није исправан Џабер ИД</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>
   <string name="contact_status_extended_away">продужено одсутан</string>
   <string name="contact_status_do_not_disturb">не узнемиравај</string>
   <string name="contact_status_offline">ван везе</string>
-  <string name="muc_details_conference">Конференција</string>
+  <string name="muc_details_conference">Групно ћаскање</string>
   <string name="muc_details_other_members">Остали чланови</string>
   <string name="server_info_show_more">Подаци о серверу</string>
   <string name="server_info_mam">XEP-0313: МАМ</string>
@@ -211,14 +209,13 @@
   <string name="this_device_omemo_fingerprint">Сопствени ОМЕМО отисак</string>
   <string name="other_devices">Остали уређаји</string>
   <string name="trust_omemo_fingerprints">Поуздај се у ОМЕМО отиске</string>
-  <string name="fetching_keys">Добављам кључеве...</string>
   <string name="done">Готово</string>
   <string name="verify">Овери</string>
   <string name="decrypt">Дешифруј</string>
-  <string name="conferences">Конференције</string>
+  <string name="conferences">Групна ћаскања</string>
   <string name="search">Тражи</string>
   <string name="create_contact">Направи контакт</string>
-  <string name="join_conference">Придружи се конференцији</string>
+  <string name="join_conference">Придружи се групном ћаскању</string>
   <string name="delete_contact">Обриши контакт</string>
   <string name="view_contact_details">Прикажи детаље контакта</string>
   <string name="block_contact">Блокирај контакт</string>
@@ -226,14 +223,14 @@
   <string name="create">Направи</string>
   <string name="contact_already_exists">Контакт већ постоји</string>
   <string name="join">Придружи се</string>
-  <string name="conference_address">Адреса конференције</string>
+  <string name="conference_address">Адреса групног ћаскања</string>
   <string name="conference_address_example">soba@konferencija.primer.com</string>
   <string name="save_as_bookmark">Сачувај као обележивач</string>
   <string name="delete_bookmark">Обриши обележивач</string>
   <string name="bookmark_already_exists">Овај обележивач већ постоји</string>
   <string name="you">Ви</string>
-  <string name="action_edit_subject">Уреди предмет конференције</string>
-  <string name="conference_not_found">Конференција није нађена</string>
+  <string name="action_edit_subject">Уреди предмет групног ћаскања</string>
+  <string name="conference_not_found">Групно ћаскање није нађено</string>
   <string name="leave">Напусти</string>
   <string name="contact_added_you">Контакт вас је додао на списак контаката</string>
   <string name="add_back">Додај га</string>
@@ -256,11 +253,11 @@
   <string name="server_info_session_established">Текућа сесија успостављена</string>
   <string name="additional_information">Додатни подаци</string>
   <string name="skip">Прескочи</string>
-  <string name="disable_notifications">Онемогући обавештења</string>
-  <string name="disable_notifications_for_this_conversation">Онемогући обавештења за ову преписку</string>
-  <string name="notifications_disabled">Обавештења су онемогућена</string>
-  <string name="enable">Омогући</string>
-  <string name="conference_requires_password">Конференција захтева лозинку</string>
+  <string name="disable_notifications">Искључи обавештења</string>
+  <string name="disable_notifications_for_this_conversation">Искључи обавештења за ову преписку</string>
+  <string name="notifications_disabled">Обавештења су искључена</string>
+  <string name="enable">Укључи</string>
+  <string name="conference_requires_password">Групно ћаскање захтева лозинку</string>
   <string name="enter_password">Унесите лозинку</string>
   <string name="missing_presence_updates">Нема ажуриране присутности од контакта</string>
   <string name="request_presence_updates">Најпре захтевајте ажурирање присутности од вашег контакта.\n\n<small>Ово ће омогућити да се одреди којег клијента ваш контакт користи.</small></string>
@@ -271,7 +268,7 @@
   <string name="without_mutual_presence_updates"><b>Упозорење:</b> Слање овога без узајамних ажурирања присутности би могло да узрокује неочекиване проблеме.\n\n<small>Идите на детаље контакта да бисте проверили претплате на присутности.</small></string>
   <string name="pref_encryption_settings">Поставке шифровања</string>
   <string name="pref_force_encryption">Присили крај-на-крај шифровање</string>
-  <string name="pref_force_encryption_summary">Увек шифруј поруке (осим за конференције)</string>
+  <string name="pref_force_encryption_summary">Увек шифруј поруке (осим за групна ћаскања)</string>
   <string name="pref_dont_save_encrypted">Не успремај шифроване поруке</string>
   <string name="pref_dont_save_encrypted_summary">Упозорење: Ово може да доведе до губитка порука</string>
   <string name="pref_expert_options">Опције за стручњаке</string>
@@ -281,8 +278,8 @@
   <string name="title_pref_quiet_hours">Тихи сати</string>
   <string name="title_pref_quiet_hours_start_time">Време почетка</string>
   <string name="title_pref_quiet_hours_end_time">Време завршетка</string>
-  <string name="title_pref_enable_quiet_hours">Омогући тихе сате</string>
-  <string name="pref_quiet_hours_summary">Обавештења ће бити утишана за време тихих сати</string>
+  <string name="title_pref_enable_quiet_hours">Укључи тихе сате</string>
+  <string name="pref_quiet_hours_summary">Обавештења ће бити ућуткана за време тихих сати</string>
   <string name="pref_use_larger_font">Повећај величину фонта</string>
   <string name="pref_use_larger_font_summary">Користи веће величине фонта за читаву апликацију</string>
   <string name="pref_use_send_button_to_indicate_status">Дугме слања показује стање</string>
@@ -290,13 +287,13 @@
   <string name="pref_use_indicate_received_summary">Означи примљене поруке зеленом квачицом, ако је подржано</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Боја дугмета за слање показује стање контакта</string>
   <string name="pref_expert_options_other">Остало</string>
-  <string name="pref_conference_name">Име конференције</string>
-  <string name="pref_conference_name_summary">Предмет собе уместо ЈИД-а идентификује конференцију</string>
+  <string name="pref_conference_name">Назив групног ћаскања</string>
+  <string name="pref_conference_name_summary">Предмет собе уместо ЈИД-а идентификује групно ћаскање</string>
   <string name="toast_message_otr_fingerprint">ОТР отисак копиран на клипборд!</string>
   <string name="toast_message_omemo_fingerprint">ОМЕМО отисак копиран на клипборд!</string>
-  <string name="conference_banned">Забрањени сте на овој конференцији</string>
-  <string name="conference_members_only">Ова конференција је само за чланове</string>
-  <string name="conference_kicked">Шутнути сте из ове конференције</string>
+  <string name="conference_banned">Забрањени сте на овом групном ћаскању</string>
+  <string name="conference_members_only">Ово групно ћаскање је само за чланове</string>
+  <string name="conference_kicked">Шутнути сте из овог групног ћаскања</string>
   <string name="using_account">преко налога %s</string>
   <string name="checking_x">Проверавам %s на ХТТП домаћину</string>
   <string name="not_connected_try_again">Нисте повезани. Покушајте поново касније</string>
@@ -334,6 +331,9 @@
   <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>
   <string name="download_x_file">Преузми %s</string>
@@ -351,11 +351,11 @@
   <string name="are_you_sure_verify_fingerprint">Желите ли заиста да оверите ОТР отисак вашег контакта?</string>
   <string name="pref_show_dynamic_tags">Прикажи динамичке ознаке</string>
   <string name="pref_show_dynamic_tags_summary">Приказ ознака испод контаката</string>
-  <string name="enable_notifications">Омогући обавештења</string>
-  <string name="conference_with">Направи конференцију са…</string>
-  <string name="no_conference_server_found">Сервер конференције није нађен</string>
-  <string name="conference_creation_failed">Прављење конференције није успело!</string>
-  <string name="conference_created">Конференција направљена!</string>
+  <string name="enable_notifications">Укључи обавештења</string>
+  <string name="conference_with">Направи групно ћаскање са…</string>
+  <string name="no_conference_server_found">Сервер групног ћаскања није нађен</string>
+  <string name="conference_creation_failed">Прављење групног ћаскања није успело!</string>
+  <string name="conference_created">Групно ћаскање направљено!</string>
   <string name="secret_accepted">Тајна прихваћена!</string>
   <string name="reset">Ресетуј</string>
   <string name="account_image_description">Аватар налога</string>
@@ -386,8 +386,8 @@
   <string name="current_password">Текућа лозинка</string>
   <string name="new_password">Нова лозинка</string>
   <string name="password_should_not_be_empty">Лозинка не може бити празна</string>
-  <string name="enable_all_accounts">Омогући све налоге</string>
-  <string name="disable_all_accounts">Онемогући све налоге</string>
+  <string name="enable_all_accounts">Укључи све налоге</string>
+  <string name="disable_all_accounts">Искључи све налоге</string>
   <string name="perform_action_with">Изврши радњу са</string>
   <string name="no_affiliation">Без припадности</string>
   <string name="no_role">Без улоге</string>
@@ -398,21 +398,21 @@
   <string name="remove_membership">Опозови чланство</string>
   <string name="grant_admin_privileges">Одобри админ. привилегије</string>
   <string name="remove_admin_privileges">Одобри админ. привилегије</string>
-  <string name="remove_from_room">Уклони из конференције</string>
+  <string name="remove_from_room">Уклони из групног ћаскања</string>
   <string name="could_not_change_affiliation">Не могу да изменим припадност за %s</string>
-  <string name="ban_from_conference">Забрани са конференције</string>
-  <string name="removing_from_public_conference">Покушавате да уклоните %s са јавне конференције. Једини начин да то урадите је да забраните тог корисника заувек.</string>
+  <string name="ban_from_conference">Забрани на групном ћаскању</string>
+  <string name="removing_from_public_conference">Покушавате да уклоните %s са групног ћаскања. Једини начин да то урадите је да забраните тог корисника заувек.</string>
   <string name="ban_now">Забрани одмах</string>
   <string name="could_not_change_role">Не могу да изменим улогу за %s</string>
-  <string name="public_conference">Јавно доступна конференција</string>
-  <string name="private_conference">Лична, само за чланове конференција</string>
-  <string name="conference_options">Опције конференције</string>
+  <string name="public_conference">Јавно доступно групно ћаскање</string>
+  <string name="private_conference">Лично, само за чланове</string>
+  <string name="conference_options">Опције групног ћаскања</string>
   <string name="members_only">Лична, само чланови</string>
   <string name="non_anonymous">Неанонимна</string>
   <string name="moderated">Уређивана</string>
   <string name="you_are_not_participating">Не учествујете</string>
-  <string name="modified_conference_options">Поставке конференције измењене!</string>
-  <string name="could_not_modify_conference_options">Не могу да изменим поставке конференције</string>
+  <string name="modified_conference_options">Поставке групног ћаскања измењене!</string>
+  <string name="could_not_modify_conference_options">Не могу да изменим поставке групног ћаскања</string>
   <string name="never">никад</string>
   <string name="thirty_minutes">30 минута</string>
   <string name="one_hour">1 сат</string>
@@ -431,14 +431,13 @@
   <string name="apk">Апликација за Андроид</string>
   <string name="vcard">Контакт</string>
   <string name="received_x_file">Примљено %s</string>
-  <string name="disable_foreground_service">Онемогући сервис у првом плану</string>
+  <string name="disable_foreground_service">Искључи сервис у првом плану</string>
   <string name="touch_to_open_conversations">Додирните да отворите Конверзацију</string>
   <string name="avatar_has_been_published">Аватар је објављен!</string>
   <string name="sending_x_file">Шаљем %s</string>
   <string name="offering_x_file">Нудим %s</string>
   <string name="hide_offline">Сакриј неповезане</string>
-  <string name="disable_account">Онемогући налог</string>
-  <string name="contact_is_typing">%s куца...</string>
+  <string name="disable_account">Искључи налог</string>
   <string name="contact_has_stopped_typing">%s престаде да куца</string>
   <string name="pref_chat_states">Обавештења о куцању</string>
   <string name="pref_chat_states_summary">Обзнаните контакту кад куцате нову поруку</string>
@@ -448,7 +447,7 @@
   <string name="location">Локација</string>
   <string name="received_location">Примљена локација</string>
   <string name="title_undo_swipe_out_conversation">Преписка затворена</string>
-  <string name="title_undo_swipe_out_muc">Напусти конференцију</string>
+  <string name="title_undo_swipe_out_muc">Напусти групно ћаскање</string>
   <string name="pref_dont_trust_system_cas_title">Не поуздај се у системска сертификациона тела</string>
   <string name="pref_dont_trust_system_cas_summary">Сви сертификати морају ручно да се одобре</string>
   <string name="pref_remove_trusted_certificates_title">Уклони сертификате</string>
@@ -474,7 +473,7 @@
   <string name="choose_quick_action">Изаберите брзу радњу</string>
   <string name="search_for_contacts_or_groups">Тражите контакте или групе</string>
   <string name="send_private_message">Пошаљи личну поруку</string>
-  <string name="user_has_left_conference">%s напусти конференцију!</string>
+  <string name="user_has_left_conference">%s напусти групно ћаскање!</string>
   <string name="username">Корисничко име</string>
   <string name="username_hint">Корисничко име</string>
   <string name="invalid_username">Ово није исправно корисничко име</string>
@@ -483,6 +482,15 @@
   <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_dns_timeout">Прековреме за ДНС</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="unable_to_parse_certificate">Не могу да рашчланим сертификат</string>
+  <string name="captcha_hint">унесите текст са слике</string>
+  <string name="certificate_chain_is_not_trusted">Ланац сертификата није поуздан</string>
+  <string name="jid_does_not_match_certificate">Џабер ИД не одговара сертификату</string>
+  <string name="action_renew_certificate">Обнови сертификат</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 90a0248e..33868fd4 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d min sedan</string>
   <string name="unread_conversations">olästa konversationer</string>
   <string name="sending">skickar…</string>
-  <string name="encrypted_message">Avkrypterar meddelande. Vänta…</string>
   <string name="nick_in_use">Nick används redan</string>
   <string name="admin">Admin</string>
   <string name="owner">Ägare</string>
@@ -74,6 +73,7 @@
   <string name="clear_conversation_history">Rensa konversationshistorik</string>
   <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="send_unencrypted_message">Skicka okrypterat meddelande</string>
   <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
@@ -92,7 +92,6 @@
   <string name="contact_has_no_pgp_key">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
   <string name="no_pgp_keys">Inga OpenPGP-nycklar funna</string>
   <string name="contacts_have_no_pgp_keys">Conversations kan inte avkryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Krypterat meddelande mottaget. Tryck för att se och avkryptera.</i></string>
   <string name="pref_general">Generellt</string>
   <string name="pref_xmpp_resource">XMPP resurs</string>
   <string name="pref_xmpp_resource_summary">Namnet som klienten identifierar sig med</string>
@@ -171,7 +170,6 @@
   <string name="passwords_do_not_match">Lösenorden är inte lika</string>
   <string name="invalid_jid">Detta är inte ett korrekt Jabber ID</string>
   <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
-  <string name="add_phone_book_text">Vill du lägga till %s i din telefons kontaktlista?</string>
   <string name="contact_status_online">online</string>
   <string name="contact_status_free_to_chat">tillgänglig</string>
   <string name="contact_status_away">borta</string>
@@ -211,7 +209,6 @@
   <string name="this_device_omemo_fingerprint">Eget OMEMO-fingeravtryck</string>
   <string name="other_devices">Andra enheter</string>
   <string name="trust_omemo_fingerprints">Lita på OMEMO-fingeravtryck</string>
-  <string name="fetching_keys">Hämtar nycklar...</string>
   <string name="done">Klar</string>
   <string name="verify">Verifiera</string>
   <string name="decrypt">Avkryptera</string>
@@ -334,6 +331,9 @@
   <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>
   <string name="download_x_file">Ladda ner %s</string>
@@ -438,7 +438,6 @@
   <string name="offering_x_file">Erbjuder %s</string>
   <string name="hide_offline">Dölj ej anslutna</string>
   <string name="disable_account">Deaktivera konton</string>
-  <string name="contact_is_typing">%s skriver...</string>
   <string name="contact_has_stopped_typing">%s har slutat skriva</string>
   <string name="pref_chat_states">Skriv-notifieringar</string>
   <string name="pref_chat_states_summary">Låter dina kontakter veta när du skriver ett nytt meddelande</string>
@@ -481,6 +480,19 @@
   <string name="download_failed_could_not_connect">Nerladdningen gick fel: Kunder inte ansluta till server</string>
   <string name="pref_use_white_background">Använd vit bakgrund</string>
   <string name="pref_use_white_background_summary">Visa mottagna meddelanden som svart text på vit bakgrund</string>
-  <string name="account_status_dns_timeout">Timeout för DNS</string>
   <string name="server_info_broken">Sönder</string>
+  <string name="pref_presence_settings">Tillgänglighetsinställningar</string>
+  <string name="pref_away_when_screen_off">Status borta när skärmen är av</string>
+  <string name="pref_away_when_screen_off_summary">Sätter din tillgänglighet till borta när skrämen är av</string>
+  <string name="pref_xa_on_silent_mode">Status ej tillgänglig i tyst läge</string>
+  <string name="pref_xa_on_silent_mode_summary">Sätter din tillgänglighet till ej tillgänglig när enheten är i tyst läge</string>
+  <string name="action_add_account_with_certificate">Lägg till konto med certifikat</string>
+  <string name="unable_to_parse_certificate">Kan inte läsa certifikat</string>
+  <string name="authenticate_with_certificate">Lämna tom för att för att logga in med certifikat</string>
+  <string name="captcha_ocr">Captcha text</string>
+  <string name="captcha_required">Captcha krävs</string>
+  <string name="captcha_hint">skriv in texten från bilden</string>
+  <string name="certificate_chain_is_not_trusted">Certifikatskedjan är inte betrodd</string>
+  <string name="jid_does_not_match_certificate">Jabber ID matchar inte certifikat</string>
+  <string name="action_renew_certificate">Förnya certifikat</string>
 </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 455d13a8..90839454 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -28,7 +28,6 @@
   <string name="minutes_ago">%d分钟前</string>
   <string name="unread_conversations">未读会话</string>
   <string name="sending">正在发送…</string>
-  <string name="encrypted_message">解密信息中. 请稍候…</string>
   <string name="nick_in_use">该名称已存在</string>
   <string name="admin">管理员</string>
   <string name="owner">所有者</string>
@@ -75,22 +74,23 @@
   <string name="clear_histor_msg">删除该会话中所有信息？\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息。</string>
   <string name="delete_messages">删除消息</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>
   <string name="send_pgp_message">发送 OpenPGP 加密信息</string>
   <string name="your_nick_has_been_changed">昵称修改成功</string>
   <string name="send_unencrypted">不加密发送</string>
   <string name="decryption_failed">解密失败，可能是私钥不正确。</string>
   <string name="openkeychain_required">OpenKeychain</string>
-  <string name="openkeychain_required_long">会话运用了第三方app，名为 <b>OpenKeychain</b> 用来加密、解密信息以及管理您的密钥。\n\nOpenKeychain 遵循 GPLv3 并且可以在 F-Droid 和 Google Play 上获取。\n\n<small>(之后请重启 conversations)</small></string>
+  <string name="openkeychain_required_long">Conversations 使用了第三方app <b>OpenKeychain</b> 来加密、解密信息并管理您的密钥。\n\nOpenKeychain 遵循 GPLv3 并且可以在 F-Droid 和 Google Play 上获取。\n\n<small>（之后请重启 Conversations）</small></string>
   <string name="restart">重启</string>
   <string name="install">安装</string>
   <string name="offering">输入…</string>
   <string name="waiting">等待…</string>
   <string name="no_pgp_key">未发现 OpenPGP 密钥</string>
-  <string name="contact_has_no_pgp_key">会话加密信息失败，因为联系人未提供他/她的公钥。\n\n<small>请通知联系人设置 OpenPGP。</small></string>
+  <string name="contact_has_no_pgp_key">Conversations 无法加密信息，因为联系人未提供他/她的公钥。\n\n<small>请通知联系人设置 OpenPGP。</small></string>
   <string name="no_pgp_keys">未找到 OpenPGP 密钥</string>
   <string name="contacts_have_no_pgp_keys">因您的联系人未公布公钥，Conversations未能成功加密您的信息.\n\n<small>请通知联系人设置OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>加密信息已接收。点击解密并查看。</i></string>
   <string name="pref_general">常规</string>
   <string name="pref_xmpp_resource">XMPP 资源</string>
   <string name="pref_xmpp_resource_summary">客户端标识名称</string>
@@ -145,8 +145,10 @@
   <string name="account_status_regis_not_sup">服务器不支持注册</string>
   <string name="account_status_security_error">安全错误</string>
   <string name="account_status_incompatible_server">服务器不兼容</string>
+  <string name="encryption_choice_unencrypted">未加密</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="encryption_choice_omemo">OMEMO</string>
   <string name="mgmt_account_edit">编辑账号</string>
   <string name="mgmt_account_delete">删除账号</string>
   <string name="mgmt_account_disable">暂时不可用</string>
@@ -165,7 +167,6 @@
   <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>
@@ -176,21 +177,20 @@
   <string name="muc_details_other_members">其他成员</string>
   <string name="server_info_show_more">服务器信息</string>
   <string name="server_info_mam">XEP-0313: MAM</string>
-  <string name="server_info_carbon_messages">XEP-0280: 消息碳</string>
   <string name="server_info_csi">XEP-0352: 客户端状态指示</string>
   <string name="server_info_blocking">XEP-0191: 屏蔽指令</string>
-  <string name="server_info_roster_version">XEP-0237: 花名册版本</string>
   <string name="server_info_stream_management">XEP-0198: 流管理</string>
+  <string name="server_info_http_upload">XEP-0363: HTTP 文件上传</string>
   <string name="server_info_available">有效</string>
   <string name="server_info_unavailable">无效</string>
   <string name="missing_public_keys">缺少公钥通知</string>
-  <string name="last_seen_now">最近一次查看为刚刚</string>
-  <string name="last_seen_min"> 最近一次查看为一分钟前</string>
-  <string name="last_seen_mins">最近一次查看为 %d 分钟前</string>
-  <string name="last_seen_hour">最近一次查看为一小时前</string>
-  <string name="last_seen_hours">最近一次查看为 %d 小时前</string>
-  <string name="last_seen_day">最近一次查看为一天前</string>
-  <string name="last_seen_days">最近一次查看为 %d天前</string>
+  <string name="last_seen_now">刚刚查看过</string>
+  <string name="last_seen_min">1 分钟前查看过</string>
+  <string name="last_seen_mins">%d 分钟前查看过</string>
+  <string name="last_seen_hour">1 小时前查看过</string>
+  <string name="last_seen_hours">%d 小时前查看过</string>
+  <string name="last_seen_day">1 天前查看过</string>
+  <string name="last_seen_days">%d 天前查看过</string>
   <string name="never_seen">未曾查看</string>
   <string name="install_openkeychain">加密信息. 请安装 OpenKeychain 以解密。</string>
   <string name="unknown_otr_fingerprint">未知 OTR 指纹</string>
@@ -198,6 +198,11 @@
   <string name="reception_failed">接收失败</string>
   <string name="your_fingerprint">你的指纹</string>
   <string name="otr_fingerprint">OTR 指纹</string>
+  <string name="omemo_fingerprint">OMEMO 指纹</string>
+  <string name="omemo_fingerprint_selected_message">消息的 OMEMO 指纹</string>
+  <string name="other_devices">其他设备</string>
+  <string name="trust_omemo_fingerprints">信任的 OMEMO 指纹</string>
+  <string name="done">完成</string>
   <string name="verify">验证</string>
   <string name="decrypt">解密</string>
   <string name="conferences">讨论组</string>
@@ -232,7 +237,7 @@
   <string name="error_saving_avatar">不能将头像保存至磁盘</string>
   <string name="or_long_press_for_default">(或长按按钮将返回默认头像)</string>
   <string name="error_publish_avatar_no_server_support">您的服务器不支持发布头像</string>
-  <string name="private_message">密谈</string>
+  <string name="private_message">私聊</string>
   <string name="private_message_to">至 %s</string>
   <string name="send_private_message_to">发送私密消息到 %s</string>
   <string name="connect">连接</string>
@@ -240,7 +245,7 @@
   <string name="next">下一步</string>
   <string name="server_info_session_established">当前会话已建立</string>
   <string name="additional_information">其他信息</string>
-  <string name="skip">Skip略过</string>
+  <string name="skip">忽略</string>
   <string name="disable_notifications">关闭通知</string>
   <string name="disable_notifications_for_this_conversation">关闭该会话消息</string>
   <string name="notifications_disabled">通知已关闭</string>
@@ -259,10 +264,10 @@
   <string name="pref_force_encryption_summary"> 总是发送加密信息(讨论组信息除外)</string>
   <string name="pref_dont_save_encrypted">不保存加密信息</string>
   <string name="pref_dont_save_encrypted_summary">警告:此操作将会导致信息丢失</string>
-  <string name="pref_expert_options">导出选项</string>
+  <string name="pref_expert_options">专家选项</string>
   <string name="pref_expert_options_summary">请谨慎使用</string>
   <string name="title_activity_about">关于 Conversations</string>
-  <string name="pref_about_conversations_summary">构建及许可证信息</string>
+  <string name="pref_about_conversations_summary">编译及许可证信息</string>
   <string name="title_pref_quiet_hours">静默时间段</string>
   <string name="title_pref_quiet_hours_start_time">开始时间</string>
   <string name="title_pref_quiet_hours_end_time">结束时间</string>
@@ -278,15 +283,19 @@
   <string name="pref_conference_name">讨论组名称</string>
   <string name="pref_conference_name_summary">用讨论组的主题来标示讨论组而不是 JID</string>
   <string name="toast_message_otr_fingerprint">OTR 指纹已拷贝到剪贴板！</string>
+  <string name="toast_message_omemo_fingerprint">OMEMO 指纹已拷贝到剪贴板！</string>
   <string name="conference_banned">你被此讨论组屏蔽</string>
   <string name="conference_members_only">此讨论组只允许成员加入</string>
   <string name="conference_kicked">你被从此讨论组踢出</string>
   <string name="using_account">用账户  %s</string>
+  <string name="checking_x">正在 HTTP 服务器中检查 %s</string>
   <string name="not_connected_try_again">你没有连接。请稍后重试</string>
+  <string name="check_x_filesize">检查 %s 大小</string>
   <string name="message_options">消息选项</string>
   <string name="copy_text">拷贝文本</string>
   <string name="copy_original_url">拷贝原始URL</string>
   <string name="send_again">再次发送</string>
+  <string name="file_url">文件  </string>
   <string name="message_text">消息文本</string>
   <string name="url_copied_to_clipboard">已经拷贝 URL 到剪贴板</string>
   <string name="message_copied_to_clipboard">消息已经拷贝到剪贴板</string>
@@ -315,7 +324,10 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">保持前台服务</string>
   <string name="pref_keep_foreground_service_summary">防止操作系统中断你的连接</string>
-  <string name="choose_file">关闭文件</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>
   <string name="download_x_file">下载 %s</string>
   <string name="file">文件</string>
@@ -330,7 +342,7 @@
   <string name="could_not_verify_fingerprint">不能验证指纹</string>
   <string name="manually_verify">手工验证</string>
   <string name="are_you_sure_verify_fingerprint">你确认验证你的联系人的 OTR 指纹？</string>
-  <string name="pref_show_dynamic_tags">现实动态标签</string>
+  <string name="pref_show_dynamic_tags">显示动态标签</string>
   <string name="pref_show_dynamic_tags_summary">在联系人下方显示只读标签</string>
   <string name="enable_notifications">启用通知</string>
   <string name="conference_with">与…创建讨论组</string>
@@ -341,12 +353,20 @@
   <string name="reset">重置</string>
   <string name="account_image_description">账户头像</string>
   <string name="copy_otr_clipboard_description">拷贝 OTR 指纹到剪贴板</string>
+  <string name="copy_omemo_clipboard_description">拷贝 OMEMO 指纹到剪贴板</string>
+  <string name="regenerate_omemo_key">重新生成 OMEMO 密钥</string>
+  <string name="wipe_omemo_pep">从 PEP 中清除其他设备</string>
+  <string name="clear_other_devices">清除设备</string>
+  <string name="purge_key">清除密钥</string>
+  <string name="purge_key_desc_part1">是否确认清除该密钥？</string>
+  <string name="error_no_keys_to_trust">他们没有密钥可用于此次会话。如果你曾经清除过他们的密钥，那么他们需要生成新的密钥。</string>
+  <string name="error_trustkeys_title">错误</string>
   <string name="fetching_history_from_server">从服务器获取历史记录</string>
   <string name="no_more_history_on_server">服务器上没有更多历史记录</string>
   <string name="updating">更新中…</string>
   <string name="password_changed">密码已修改！</string>
   <string name="could_not_change_password">不能修改密码</string>
-  <string name="otr_session_not_started">要启动加密聊天先发送一条消息</string>
+  <string name="otr_session_not_started">发送消息来开始加密聊天</string>
   <string name="ask_question">提出问题</string>
   <string name="smp_explain_question">如果你和你的联系人有一个共知的秘密(比如一个内部笑话或者仅仅只是上次见面时吃的午餐) 你可以使用这个秘密来验证彼此的指纹。\n\n你的联系人将以大小写敏感的方式给出答案，你可以给出提示或问题。</string>
   <string name="smp_explain_answer">你的联系人可以通过一个你们共知的秘密来验证指纹。你的联系人给出了如下的提示或问题。</string>
@@ -359,7 +379,7 @@
   <string name="password_should_not_be_empty">密码不能为空</string>
   <string name="enable_all_accounts">启用所有账户</string>
   <string name="disable_all_accounts">禁用所有账户</string>
-  <string name="perform_action_with">做一个动作和</string>
+  <string name="perform_action_with">选择一个操作</string>
   <string name="no_affiliation">没有从属关系</string>
   <string name="no_role">没有角色</string>
   <string name="outcast">抛弃</string>
@@ -378,7 +398,9 @@
   <string name="public_conference">公开访问的讨论组</string>
   <string name="private_conference">私密，只有成员可以加入的讨论组</string>
   <string name="conference_options">讨论组选项</string>
+  <string name="members_only">私密，只有成员可以加入</string>
   <string name="non_anonymous">非匿名</string>
+  <string name="you_are_not_participating">您尚未参与</string>
   <string name="modified_conference_options">讨论组选项已修改！</string>
   <string name="could_not_modify_conference_options">不能修改讨论组选项</string>
   <string name="never">从不</string>
@@ -399,14 +421,13 @@
   <string name="apk">Android App</string>
   <string name="vcard">联系人</string>
   <string name="received_x_file">已经收到 %s</string>
-  <string name="disable_foreground_service">禁用前端服务</string>
+  <string name="disable_foreground_service">禁用前台服务</string>
   <string name="touch_to_open_conversations">轻触打开 Conversations</string>
   <string name="avatar_has_been_published">头像已经发布！</string>
   <string name="sending_x_file">发送中 %s</string>
   <string name="offering_x_file">提供中 %s</string>
   <string name="hide_offline">隐藏离线联系人</string>
   <string name="disable_account">禁用账户</string>
-  <string name="contact_is_typing">%s 正在输入…</string>
   <string name="contact_has_stopped_typing">%s 已停止输入</string>
   <string name="pref_chat_states">键盘输入通知</string>
   <string name="pref_chat_states_summary">让对方知道你正在输入新消息</string>
@@ -436,4 +457,28 @@
   <string name="none">无</string>
   <string name="recently_used">最近使用过的</string>
   <string name="choose_quick_action">选择快速动作</string>
+  <string name="search_for_contacts_or_groups">搜索联系人或群组</string>
+  <string name="send_private_message">发送私密消息</string>
+  <string name="user_has_left_conference">%s 已离开讨论组！</string>
+  <string name="username">用户名</string>
+  <string name="username_hint">用户名</string>
+  <string name="invalid_username">该用户名无效</string>
+  <string name="download_failed_server_not_found">下载失败：未找到服务器</string>
+  <string name="download_failed_file_not_found">下载失败：未找到文件</string>
+  <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="server_info_broken">损坏</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="captcha_ocr">验证码</string>
+  <string name="captcha_required">需要验证码</string>
+  <string name="captcha_hint">输入图片中的文字</string>
+  <string name="certificate_chain_is_not_trusted">证书链不受信任</string>
+  <string name="jid_does_not_match_certificate">Jabber ID 与证书不匹配</string>
+  <string name="action_renew_certificate">更新证书</string>
 </resources>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 161d49db..19252c90 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -21,7 +21,6 @@
   <string name="minutes_ago">%d 分鐘前</string>
   <string name="unread_conversations">未讀對話</string>
   <string name="sending">正在發送…</string>
-  <string name="encrypted_message">正在解密訊息中，請稍候…</string>
   <string name="nick_in_use">該用戶名稱已被使用</string>
   <string name="admin">管理員</string>
   <string name="owner">擁有人</string>
@@ -74,7 +73,6 @@
   <string name="contact_has_no_pgp_key">Conversations 不能將你的訊息加密，因為聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
   <string name="no_pgp_keys">找不到多條 OpenPGP 鑰匙</string>
   <string name="contacts_have_no_pgp_keys">Conversations 不能將你的訊息加密，因為多位聯絡人沒有公佈他/她的公鑰。\n\n<small>請通知聯絡人設定 OpenPGP。</small></string>
-  <string name="encrypted_message_received"><i>已收到加密訊息，點擊進行解密和查看。</i></string>
   <string name="pref_general">一般</string>
   <string name="pref_xmpp_resource">XMPP 資源</string>
   <string name="pref_xmpp_resource_summary">客戶端標示名稱</string>
@@ -147,7 +145,6 @@
   <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>