diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 9988b9dee..9ac857266 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -27,7 +27,9 @@
   <string name="minute_ago">преди 1 минута</string>
   <string name="minutes_ago">преди %d минути</string>
   <string name="unread_conversations">непрочетени разговори</string>
-  <string name="sending">изпращане...</string>
+  <string name="sending">изпращане…</string>
+  <string name="message_decrypting">Дешифроване на съобщението. Моля, изчакайте…</string>
+  <string name="pgp_message">Съобщение, шифр. чрез OpenPGP</string>
   <string name="nick_in_use">Псевдонимът вече се използва</string>
   <string name="admin">Администратор</string>
   <string name="owner">Собственик</string>
@@ -43,7 +45,7 @@
   <string name="remove_bookmark_text">Искате ли да премахнете отметката за %s? Разговорът, свързан с тази отметка, няма да бъде премахнат.</string>
   <string name="register_account">Регистриране на нов профил на сървъра</string>
   <string name="change_password_on_server">Промяна на паролата в сървъра</string>
-  <string name="share_with">Споделяне с...</string>
+  <string name="share_with">Споделяне с…</string>
   <string name="start_conversation">Започване на разговор</string>
   <string name="invite_contact">Канене на контакт</string>
   <string name="contacts">Контакти</string>
@@ -78,6 +80,7 @@
   <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
   <string name="send_otr_message">Изпр. на съобщение, шифр. чрез OTP</string>
   <string name="send_omemo_message">Изпр. на съобщение, шифр. чрез OMEMO</string>
+  <string name="send_omemo_x509_message">Изпр. на съобщение, шифр. чрез v\\OMEMO</string>
   <string name="send_pgp_message">Изпр. на съобщение, шифр. чрез OpenPGP</string>
   <string name="your_nick_has_been_changed">Псевдонимът Ви беше променен</string>
   <string name="send_unencrypted">Изпращане нешифровано</string>
@@ -86,17 +89,18 @@
   <string name="openkeychain_required_long">Conversations използва външно приложение с име <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="offering">предлагане…</string>
+  <string name="waiting">изчакване…</string>
   <string name="no_pgp_key">Не е открит OpenPGP ключ</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>
   <string name="pref_accept_files">Приемане на файлове</string>
-  <string name="pref_accept_files_summary">Автоматично приемане на файлове с размер, по-малък от...</string>
+  <string name="pref_accept_files_summary">Автоматично приемане на файлове с размер, по-малък от…</string>
   <string name="pref_notification_settings">Настройки за известията</string>
   <string name="pref_notifications">Известия</string>
   <string name="pref_notifications_summary">Известяване при получаване на ново съобщение</string>
@@ -170,6 +174,7 @@
   <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>
@@ -205,10 +210,13 @@
   <string name="your_fingerprint">Вашият отпечатък</string>
   <string name="otr_fingerprint">Отпечатък OTR</string>
   <string name="omemo_fingerprint">Отпечатък OMEMO</string>
+  <string name="omemo_fingerprint_x509">Отпечатък v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Отпечатък OMEMO на съобщението</string>
+  <string name="omemo_fingerprint_x509_selected_message">Отпечатък v\\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="done">Готово</string>
   <string name="verify">Потвърждаване</string>
   <string name="decrypt">Дешифроване</string>
@@ -238,7 +246,7 @@
   <string name="publish">Публикуване</string>
   <string name="touch_to_choose_picture">Докоснете аватара, за да изберете изображение от галерията</string>
   <string name="publish_avatar_explanation">Забележка: Всеки, абониран за актуализации на присъствието Ви, ще може да вижда тази снимка.</string>
-  <string name="publishing">Публикуване...</string>
+  <string name="publishing">Публикуване…</string>
   <string name="error_publish_avatar_server_reject">Сървърът отказа Вашето публикуване</string>
   <string name="error_publish_avatar_converting">Нещо се обърка при преобразуването на снимката Ви</string>
   <string name="error_saving_avatar">Неуспешно запазване на аватара на диска</string>
@@ -352,7 +360,7 @@
   <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="conference_with">Започване на беседа с…</string>
   <string name="no_conference_server_found">Не е открит сървър за беседата</string>
   <string name="conference_creation_failed">Неуспешно създаване на беседа!</string>
   <string name="conference_created">Беседата беше създадена!</string>
@@ -372,7 +380,7 @@
   <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="updating">Актуализиране…</string>
   <string name="password_changed">Паролата е променена!</string>
   <string name="could_not_change_password">Неуспешна промяна на паролата</string>
   <string name="otr_session_not_started">Изпратете съобщение, за да започнете нешифрован разговор</string>
@@ -438,6 +446,7 @@
   <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>
@@ -480,6 +489,7 @@
   <string name="download_failed_could_not_connect">Неуспешно сваляне: Неуспешна връзка със сървъра</string>
   <string name="pref_use_white_background">Използване на бял фон</string>
   <string name="pref_use_white_background_summary">Показване на получените съобщения с черен текст на бял фон</string>
+  <string name="account_status_tor_unavailable">Мрежата на TOR не е достъпна</string>
   <string name="server_info_broken">Повредено</string>
   <string name="pref_presence_settings">Настройки за присъствието</string>
   <string name="pref_away_when_screen_off">Отсъстващ, когато екранът е изключен</string>
@@ -495,4 +505,20 @@
   <string name="certificate_chain_is_not_trusted">Сертификатът не е потвърден</string>
   <string name="jid_does_not_match_certificate">Jabber идентификатора не съответства на сертификата</string>
   <string name="action_renew_certificate">Подновяване на сертификата</string>
+  <string name="error_fetching_omemo_key">Грешка при получаването на ключа за OMEMO!</string>
+  <string name="verified_omemo_key_with_certificate">Ключът за OMEMO беше потвърден със сертификат!</string>
+  <string name="device_does_not_support_certificates">Устройството Ви не поддържа избраните клиентски сертификати!</string>
+  <string name="pref_connection_options">Настройки за връзката</string>
+  <string name="pref_use_tor">Свързване през Tor</string>
+  <string name="pref_use_tor_summary">Всички връзки да минават през мрежата на TOR. Изисква Orbot</string>
+  <string name="account_settings_hostname">Име на сървър</string>
+  <string name="account_settings_port">Порт</string>
+  <string name="hostname_or_onion">Адрес на сървър или .onion</string>
+  <string name="not_a_valid_port">Това не е правилен номер на порт</string>
+  <string name="not_valid_hostname">Това не е правилно име на сървър</string>
+  <string name="connected_accounts">%1$d от %2$d свързани профила</string>
+  <plurals name="x_messages">
+    <item quantity="one">%d съобщение</item>
+    <item quantity="other">%d съобщения</item>
+  </plurals>
 </resources>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index eb80a2cec..9bf1c3b7c 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -28,6 +28,8 @@
   <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="message_decrypting">Dešifrování zprávy. Chvíli strpení...</string>
+  <string name="pgp_message">OpenPGP šifrovaná zpráva</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>
@@ -78,6 +80,7 @@
   <string name="send_unencrypted_message">Odeslat nešifrovanou zprávu</string>
   <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
   <string name="send_omemo_message">Poslat OMEMO šifrovanou zprávu</string>
+  <string name="send_omemo_x509_message">Odeslat v\\OMEMO šifrovanou zprávu</string>
   <string name="send_pgp_message">Poslat OpenPGP šifrovanou zprávu</string>
   <string name="your_nick_has_been_changed">Přezdívka byla změněna</string>
   <string name="send_unencrypted">Poslat nešifrované</string>
@@ -92,6 +95,7 @@
   <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>Obdržena šifrovaná zpráva. Dešifrovat dotykem.</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>
@@ -170,6 +174,7 @@
   <string name="passwords_do_not_match">Hesla nesouhlasí</string>
   <string name="invalid_jid">Toto není platné Jabber ID</string>
   <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
+  <string name="add_phone_book_text">Chcete přidat %s do svého seznamu kontaktů v přístroji?</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>
@@ -205,10 +210,13 @@
   <string name="your_fingerprint">Váš identifikátor</string>
   <string name="otr_fingerprint">OTR identifikátor</string>
   <string name="omemo_fingerprint">OMEMO otisk</string>
+  <string name="omemo_fingerprint_x509">v\\OMEMO otisk</string>
   <string name="omemo_fingerprint_selected_message">OMEMO otisk zprávy</string>
+  <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO otisk zprávy</string>
   <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ání klíčů...</string>
   <string name="done">Hotovo</string>
   <string name="verify">Ověřit</string>
   <string name="decrypt">Dešifrovat</string>
@@ -438,6 +446,7 @@
   <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>
@@ -482,6 +491,7 @@
   <string name="download_failed_could_not_connect">Stahování selhalo: Nelze se připojit k hostu</string>
   <string name="pref_use_white_background">Použít bílé pozadí</string>
   <string name="pref_use_white_background_summary">Zobrazovat přijaté zprávy jako černý text na bílém pozadí</string>
+  <string name="account_status_tor_unavailable">TOR síť nedostupná</string>
   <string name="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>
@@ -497,4 +507,21 @@
   <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>
+  <string name="error_fetching_omemo_key">Chyba získání OMEMO klíče!</string>
+  <string name="verified_omemo_key_with_certificate">OMEMO klíč ověřen certifikátem!</string>
+  <string name="device_does_not_support_certificates">Tento přístroj nepodporuje výběr klientského certifikátu!</string>
+  <string name="pref_connection_options">Možnosti připojení</string>
+  <string name="pref_use_tor">Připojit přes Tor</string>
+  <string name="pref_use_tor_summary">Posílat všechna spojení pomocí sítě TOR. Vyžaduje Orbot</string>
+  <string name="account_settings_hostname">Hostname</string>
+  <string name="account_settings_port">Port</string>
+  <string name="hostname_or_onion">Server- nebo .onion-adresa</string>
+  <string name="not_a_valid_port">Toto není platné číslo portu</string>
+  <string name="not_valid_hostname">Toto není platné hostname</string>
+  <string name="connected_accounts">%1$d z %2$d účtů připojeno</string>
+  <plurals name="x_messages">
+    <item quantity="one">%d zpráva</item>
+    <item quantity="few">%d zprávy</item>
+    <item quantity="other">%d zpráv</item>
+  </plurals>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index e457c46ca..0ed90f750 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -28,6 +28,8 @@
   <string name="minutes_ago">vor %d Minuten</string>
   <string name="unread_conversations">ungelesene Unterhaltungen</string>
   <string name="sending">senden…</string>
+  <string name="message_decrypting">Nachricht wird entschlüsselt. Bitte warten …</string>
+  <string name="pgp_message">OpenPGP-verschlüsselte Nachricht</string>
   <string name="nick_in_use">Nickname wird bereits verwendet</string>
   <string name="admin">Administrator</string>
   <string name="owner">Eigentümer</string>
@@ -78,6 +80,7 @@
   <string name="send_unencrypted_message">Unverschlüsselt schreiben…</string>
   <string name="send_otr_message">OTR-verschlüsselt schreiben…</string>
   <string name="send_omemo_message">OMEMO-verschlüsselt schreiben…</string>
+  <string name="send_omemo_x509_message">v\\OMEMO-verschlüsselte Nachricht senden</string>
   <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben…</string>
   <string name="your_nick_has_been_changed">Dein Nickname wurde geändert</string>
   <string name="send_unencrypted">Unverschlüsselt senden</string>
@@ -92,6 +95,7 @@
   <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.</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>
@@ -170,6 +174,7 @@
   <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>
@@ -205,10 +210,13 @@
   <string name="your_fingerprint">Dein Fingerabdruck</string>
   <string name="otr_fingerprint">OTR-Fingerabdruck</string>
   <string name="omemo_fingerprint">OMEMO-Fingerabdruck</string>
+  <string name="omemo_fingerprint_x509">v\\OMEMO-Fingerabdruck</string>
   <string name="omemo_fingerprint_selected_message">OMEMO-Fingerabdruck der Nachricht</string>
+  <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO-Fingerabdruck der Nachricht</string>
   <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 empfangen…</string>
   <string name="done">Erledigt</string>
   <string name="verify">Überprüfen</string>
   <string name="decrypt">Entschlüsseln</string>
@@ -438,6 +446,7 @@
   <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>
@@ -480,6 +489,7 @@
   <string name="download_failed_could_not_connect">Download fehlgeschlagen: keine Verbindung zum Host</string>
   <string name="pref_use_white_background">Weißen Hintergrund benutzen</string>
   <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string>
+  <string name="account_status_tor_unavailable">TOR-Netzwerk nicht verfügbar</string>
   <string name="server_info_broken">Fehlerhaft</string>
   <string name="pref_presence_settings">Status Einstellungen</string>
   <string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string>
@@ -495,4 +505,20 @@
   <string name="certificate_chain_is_not_trusted">Zertifikat wird nicht vertraut</string>
   <string name="jid_does_not_match_certificate">Jabber-ID stimmt nicht dem Zertifikat überein</string>
   <string name="action_renew_certificate">Zertifikat erneuern</string>
+  <string name="error_fetching_omemo_key">Kann OMEMO Schlüssel nicht empfangen!</string>
+  <string name="verified_omemo_key_with_certificate">OMEMO Schlüssel mit Zertifikat bestätigt!</string>
+  <string name="device_does_not_support_certificates">Dein Gerät unterstützt das Auswählen von Client-Zertifikaten nicht!</string>
+  <string name="pref_connection_options">Verbindungs-Optionen</string>
+  <string name="pref_use_tor">Mit TOR verbinden</string>
+  <string name="pref_use_tor_summary">Alle Verbindungen über das TOR-Netzwerk tunneln. Benötigt Orbot</string>
+  <string name="account_settings_hostname">Hostname</string>
+  <string name="account_settings_port">Port</string>
+  <string name="hostname_or_onion">Server- oder .onion-Adresse</string>
+  <string name="not_a_valid_port">Dies ist keine gültige Port-Nummer</string>
+  <string name="not_valid_hostname">Dies ist kein gültiger Hostname</string>
+  <string name="connected_accounts">%1$d von %2$d Konten verbunden</string>
+  <plurals name="x_messages">
+    <item quantity="one">%d Nachricht</item>
+    <item quantity="other">%d Nachrichten</item>
+  </plurals>
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 41e0a6668..598429395 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -28,6 +28,8 @@
   <string name="minutes_ago">hace %d min</string>
   <string name="unread_conversations">conversaciones por leer</string>
   <string name="sending">enviando…</string>
+  <string name="message_decrypting">Descifrando mensaje. Por favor, espera...</string>
+  <string name="pgp_message">Mensaje cifrado con OpenPGP</string>
   <string name="nick_in_use">El apodo ya está en uso</string>
   <string name="admin">Administrador</string>
   <string name="owner">Propietario</string>
@@ -78,6 +80,7 @@
   <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
   <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
   <string name="send_omemo_message">Enviar mensaje cifrado con OMEMO </string>
+  <string name="send_omemo_x509_message">Enviar mensaje cifrado v\\OMEMO</string>
   <string name="send_pgp_message">Enviar mensaje cifrado con OpenPGP</string>
   <string name="your_nick_has_been_changed">Tu apodo se ha modificado</string>
   <string name="send_unencrypted">Enviar sin cifrar</string>
@@ -86,12 +89,14 @@
   <string name="openkeychain_required_long">Conversations utiliza una aplicación de terceros llamada <b>OpenKeychain</b> para cifrar y descifrar mensajes y gestionar tus claves públicas.\n\nOpenKeychain está publicado bajo licencia GPLv3 y disponible on F-Droid y Google Play.\n\n<small>(Por favor, reinicie Conversations después.)</small></string>
   <string name="restart">Reiniciar</string>
   <string name="install">Instalar</string>
+  <string name="openkeychain_not_installed">Por favor, instala OpenKeyChain</string>
   <string name="offering">ofreciendo…</string>
   <string name="waiting">esperando…</string>
   <string name="no_pgp_key">Clave OpenPGP no encontrada</string>
   <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 descifrar.</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>
@@ -170,6 +175,7 @@
   <string name="passwords_do_not_match">Las contraseñas no coinciden</string>
   <string name="invalid_jid">El identificador no es un identificador Jabber válido</string>
   <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
+  <string name="add_phone_book_text">¿Quieres añadir a %s a tu lista de dispositivos?</string>
   <string name="contact_status_online">Disponible</string>
   <string name="contact_status_free_to_chat">Hablador</string>
   <string name="contact_status_away">Ausente</string>
@@ -205,10 +211,13 @@
   <string name="your_fingerprint">Tu huella digital</string>
   <string name="otr_fingerprint">Huella digital OTR</string>
   <string name="omemo_fingerprint">Huella digital OMEMO</string>
+  <string name="omemo_fingerprint_x509">Huella digital v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Huella digital OMEMO del mensaje</string>
+  <string name="omemo_fingerprint_x509_selected_message">huella digital v\\OMEMO del mensaje</string>
   <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>
@@ -438,6 +447,7 @@
   <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>
@@ -480,6 +490,7 @@
   <string name="download_failed_could_not_connect">Error al descargar: No se ha podido conectar con el servidor</string>
   <string name="pref_use_white_background">Usar fondo blanco</string>
   <string name="pref_use_white_background_summary">Mostrar mensajes recibidos en texto negro con fondo blanco</string>
+  <string name="account_status_tor_unavailable">Red Tor no disponible</string>
   <string name="server_info_broken">Error</string>
   <string name="pref_presence_settings">Opciones de presencia</string>
   <string name="pref_away_when_screen_off">Ausente con pantalla apagada</string>
@@ -495,4 +506,25 @@
   <string name="certificate_chain_is_not_trusted">La cadena de certificados no es de confianza</string>
   <string name="jid_does_not_match_certificate">El identificador Jabber no coincide con el del certificado</string>
   <string name="action_renew_certificate">Renovar certificado</string>
+  <string name="error_fetching_omemo_key">¡Error buscando clave OMEMO!</string>
+  <string name="verified_omemo_key_with_certificate">¡Clave OMEMO con certificado verificada!</string>
+  <string name="device_does_not_support_certificates">¡Tu dispositivo no soporta la elección de certificados de cliente!</string>
+  <string name="pref_connection_options">Opciones de conexión</string>
+  <string name="pref_use_tor">Conectar via Tor</string>
+  <string name="pref_use_tor_summary">Todas las conexiones se realizan a través de la red TOR. Requiere Orbot</string>
+  <string name="account_settings_hostname">Hostname</string>
+  <string name="account_settings_port">Puerto</string>
+  <string name="hostname_or_onion">Server- or .onion-Address</string>
+  <string name="not_a_valid_port">Éste no es un número de puerto válido</string>
+  <string name="not_valid_hostname">Éste no es un hostame válido</string>
+  <string name="connected_accounts">%1$d de %2$d cuentas conectadas</string>
+  <plurals name="x_messages">
+    <item quantity="one">%d mensaje</item>
+    <item quantity="other">%d mensajes</item>
+  </plurals>
+  <string name="shared_file_with_x">Archivo compartido con %s</string>
+  <string name="shared_image_with_x">Imagen compartida con %s</string>
+  <string name="no_storage_permission">Conversations necesita acceder al almacenamiento externo</string>
+  <string name="sync_with_contacts">Sincronizar contactos</string>
+  <string name="sync_with_contacts_long">Conversations quiere cruzar tu lista de contactos de XMPP con tus contactos del móvil para mostrar sus nombres completos y sus fotos de perfil.\n\nConversations solo leerá tus contactos y los cruzará localmente sin subirlos a tu servidor.\n\nEl sistema te preguntará para conceder los permisos de acceso a tus contactos del móvil.</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 28efc8d26..ed01ae56d 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -28,6 +28,8 @@
   <string name="minutes_ago">%d min lehenago</string>
   <string name="unread_conversations">irakurri gabeko elkarrizketak</string>
   <string name="sending">bidaltzen…</string>
+  <string name="message_decrypting">Mezua desenkriptatzen. Mesedez itxaron…</string>
+  <string name="pgp_message">OpenPGPz enkriptatutako mezua</string>
   <string name="nick_in_use">Ezizena erabilita dagoeneko</string>
   <string name="admin">Administratzailea</string>
   <string name="owner">Jabea</string>
@@ -78,6 +80,7 @@
   <string name="send_unencrypted_message">Enkriptatu gabeko mezua bidali</string>
   <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
   <string name="send_omemo_message">OMEMOz enkriptatutako mezua bidali</string>
+  <string name="send_omemo_x509_message">v\\OMEMOz enkriptatutako mezua bidali</string>
   <string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
   <string name="your_nick_has_been_changed">Zure ezizena aldatu da</string>
   <string name="send_unencrypted">Enkriptatu gabe bidali</string>
@@ -92,6 +95,7 @@
   <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 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>
@@ -170,6 +174,7 @@
   <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 gailuko 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>
@@ -205,10 +210,13 @@
   <string name="your_fingerprint">Zure hatz-marka</string>
   <string name="otr_fingerprint">OTR hatz-marka</string>
   <string name="omemo_fingerprint">OMEMO hatz-marka</string>
+  <string name="omemo_fingerprint_x509">v\\OMEMO hatz-marka</string>
   <string name="omemo_fingerprint_selected_message">Mezuaren OMEMO hatz-marka</string>
+  <string name="omemo_fingerprint_x509_selected_message">Mezuaren v\\OMEMO hatz-marka</string>
   <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>
@@ -438,6 +446,7 @@
   <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>
@@ -480,6 +489,7 @@
   <string name="download_failed_could_not_connect">Deskargak huts egin du: ezin izan da ostalarira konektatu</string>
   <string name="pref_use_white_background">Atzeko-planoan kolore zuria erabili</string>
   <string name="pref_use_white_background_summary">Jasotako mezuak testu beltza atzeko-plano zuri baten gainean bezala erakutsi</string>
+  <string name="account_status_tor_unavailable">TOR sarea ez dago eskuragarri</string>
   <string name="server_info_broken">Hondatuta</string>
   <string name="pref_presence_settings">Presentzia ezarpenak</string>
   <string name="pref_away_when_screen_off">Urrun pantaila itzalita dagoenean</string>
@@ -495,4 +505,20 @@
   <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>
+  <string name="error_fetching_omemo_key">Akatsa OMEMO gakoa eskuratzerakoan!</string>
+  <string name="verified_omemo_key_with_certificate">OMEMO gakoa ziurtagiriarekin egiaztatuta!</string>
+  <string name="device_does_not_support_certificates">Zure gailuak ez du bezero ziurtagiriak aukeratzea onartzen!</string>
+  <string name="pref_connection_options">Konexioaren aukerak</string>
+  <string name="pref_use_tor">Tor bidez konektatu</string>
+  <string name="pref_use_tor_summary">Konexio guztiak TOR sarean zehar igaro. Orbot behar du</string>
+  <string name="account_settings_hostname">Ostalariaren izena</string>
+  <string name="account_settings_port">Ataka</string>
+  <string name="hostname_or_onion">Zerbitzari- edo .onion-helbidea</string>
+  <string name="not_a_valid_port">Hau ez da ataka zenbaki balioduna</string>
+  <string name="not_valid_hostname">Hau ez da ostalari izen balioduna</string>
+  <string name="connected_accounts">%2$dtik %1$d kontu konektatuta</string>
+  <plurals name="x_messages">
+    <item quantity="one">mezu %d</item>
+    <item quantity="other">%d mezu</item>
+  </plurals>
 </resources>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 33e456710..58e7595dd 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -28,6 +28,8 @@
   <string name="minutes_ago">acum %d minute</string>
   <string name="unread_conversations">conversatii necitite</string>
   <string name="sending">trimitere...</string>
+  <string name="message_decrypting">Decriptez mesaj. Te rog asteapta...</string>
+  <string name="pgp_message">Mesaj criptat cu OpenPGP</string>
   <string name="nick_in_use">Nume utilizator este deja folosit.</string>
   <string name="admin">Administrator</string>
   <string name="owner">Proprietar</string>
@@ -78,6 +80,7 @@
   <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_omemo_x509_message">Trimite mesaj criptat cu v\\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>
@@ -92,6 +95,7 @@
   <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="encrypted_message_received"><i>Ai primit mesaj criptat. Apasa aici pentru a-l decripta.</i></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>
@@ -170,6 +174,7 @@
   <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="add_phone_book_text">Vrei sa adaugi pe %s in lista de contacte a dispozitivului?</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>
@@ -205,10 +210,13 @@
   <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_x509">Amprenta v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Amprenta OMEMO a mesajului</string>
+  <string name="omemo_fingerprint_x509_selected_message">Amprenta v\\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="fetching_keys">Se preiau cheile...</string>
   <string name="done">Gata</string>
   <string name="verify">Verifica</string>
   <string name="decrypt">Decripteaza</string>
@@ -438,6 +446,7 @@
   <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_is_typing">%s tasteaza...</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>
@@ -482,6 +491,7 @@
   <string name="download_failed_could_not_connect">Descarcarea a esuat. Nu s-a putut realiza conexiunea cu gazda.</string>
   <string name="pref_use_white_background">Foloseste un fundal alb</string>
   <string name="pref_use_white_background_summary">Arata mesajele primite cu negru pe fond alb</string>
+  <string name="account_status_tor_unavailable">Retea TOR indisponibila</string>
   <string name="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>
@@ -497,4 +507,21 @@
   <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>
+  <string name="error_fetching_omemo_key">Eroare la preluarea cheii OMEMO!</string>
+  <string name="verified_omemo_key_with_certificate">Verifica cheia OMEMO cu un certificat</string>
+  <string name="device_does_not_support_certificates">Dispozitivul nu permite selectia unui certificat pentru client!</string>
+  <string name="pref_connection_options">Optiuni conexiune</string>
+  <string name="pref_use_tor">Conectare prin TOR</string>
+  <string name="pref_use_tor_summary">Toate conexiunile trec prin TOR. Necesita Orbot.</string>
+  <string name="account_settings_hostname">Nume gazda</string>
+  <string name="account_settings_port">Port</string>
+  <string name="hostname_or_onion">Adresa server- sau .onion</string>
+  <string name="not_a_valid_port">Acesta nu este un numar de port valabil</string>
+  <string name="not_valid_hostname">Acesta nu este un nume de gazda valabila</string>
+  <string name="connected_accounts">%1$d din %2$d conturi conectate</string>
+  <plurals name="x_messages">
+    <item quantity="one">%d mesaj</item>
+    <item quantity="few">%d mesaje</item>
+    <item quantity="other">%d mesaje</item>
+  </plurals>
 </resources>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 9858950a4..b4d52b120 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -28,6 +28,8 @@
   <string name="minutes_ago">пре %d минута</string>
   <string name="unread_conversations">непрочитане преписке</string>
   <string name="sending">шаљем…</string>
+  <string name="message_decrypting">Дешифрујем поруку, сачекајте…</string>
+  <string name="pgp_message">ОпенПГП шифрована порука</string>
   <string name="nick_in_use">Надимак је већ у употреби</string>
   <string name="admin">Администратор</string>
   <string name="owner">Власник</string>
@@ -62,7 +64,7 @@
   <string name="send_never">Не питај више</string>
   <string name="problem_connecting_to_account">Не могу да се повежем са налогом</string>
   <string name="problem_connecting_to_accounts">Не могу да се повежем са више налога</string>
-  <string name="touch_to_fix">Додирните овде да бисте управљали вашим налозима</string>
+  <string name="touch_to_fix">Тапните овде да бисте управљали вашим налозима</string>
   <string name="attach_file">Приложи фајл</string>
   <string name="not_in_roster">Контакт није на вашем списку контаката. Желите ли да га додате?</string>
   <string name="add_contact">Додај контакт</string>
@@ -78,6 +80,7 @@
   <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
   <string name="send_otr_message">Пошаљи ОТР шифровану поруку</string>
   <string name="send_omemo_message">Пошаљи ОМЕМО шифровану поруку</string>
+  <string name="send_omemo_x509_message">Пошаљи v\\ОМЕМО шифровану поруку</string>
   <string name="send_pgp_message">Пошаљи ОпенПГП шифровану поруку</string>
   <string name="your_nick_has_been_changed">Ваш надимак је промењен</string>
   <string name="send_unencrypted">Пошаљи нешифровано</string>
@@ -92,6 +95,7 @@
   <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>
@@ -170,6 +174,7 @@
   <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>
@@ -205,10 +210,13 @@
   <string name="your_fingerprint">Ваш отисак</string>
   <string name="otr_fingerprint">ОТР отисак</string>
   <string name="omemo_fingerprint">ОМЕМО отисак</string>
+  <string name="omemo_fingerprint_x509">v\\ОМЕМО отисак</string>
   <string name="omemo_fingerprint_selected_message">ОМЕМО отисак поруке</string>
+  <string name="omemo_fingerprint_x509_selected_message">v\\ОМЕМО отисак поруке</string>
   <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>
@@ -236,7 +244,7 @@
   <string name="add_back">Додај га</string>
   <string name="contact_has_read_up_to_this_point">%s је прочитао довде</string>
   <string name="publish">Објави</string>
-  <string name="touch_to_choose_picture">Додирните аватар да изаберете слику из галерије</string>
+  <string name="touch_to_choose_picture">Тапните аватар да изаберете слику из галерије</string>
   <string name="publish_avatar_explanation">Имајте на уму: Свима који су претплаћени на ваше ажурирање присутности биће дозвољено да виде ову слику.</string>
   <string name="publishing">Објављујем…</string>
   <string name="error_publish_avatar_server_reject">Сервер је одбио вашу објаву</string>
@@ -432,12 +440,13 @@
   <string name="vcard">Контакт</string>
   <string name="received_x_file">Примљено %s</string>
   <string name="disable_foreground_service">Искључи сервис у првом плану</string>
-  <string name="touch_to_open_conversations">Додирните да отворите Конверзацију</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="contact_has_stopped_typing">%s престаде да куца</string>
   <string name="pref_chat_states">Обавештења о куцању</string>
   <string name="pref_chat_states_summary">Обзнаните контакту кад куцате нову поруку</string>
@@ -482,6 +491,7 @@
   <string name="download_failed_could_not_connect">Преузимање није успело: не могу да се повежем са домаћином</string>
   <string name="pref_use_white_background">Користи белу позадину</string>
   <string name="pref_use_white_background_summary">Приказ примљених порука црним текстом на белој позадини</string>
+  <string name="account_status_tor_unavailable">Тор мрежа недоступна</string>
   <string name="server_info_broken">Оштећен</string>
   <string name="pref_presence_settings">Поставке присутности</string>
   <string name="pref_away_when_screen_off">Одсутан кад је екран искључен</string>
@@ -493,4 +503,21 @@
   <string name="certificate_chain_is_not_trusted">Ланац сертификата није поуздан</string>
   <string name="jid_does_not_match_certificate">Џабер ИД не одговара сертификату</string>
   <string name="action_renew_certificate">Обнови сертификат</string>
+  <string name="error_fetching_omemo_key">Грешка добављања ОМЕМО кључа!</string>
+  <string name="verified_omemo_key_with_certificate">Оверен ОМЕМО кључ помоћу сертификата!</string>
+  <string name="device_does_not_support_certificates">Ваш уређај не подржава избор сертификата клијента!</string>
+  <string name="pref_connection_options">Опције повезивања</string>
+  <string name="pref_use_tor">Повежи се преко Тора</string>
+  <string name="pref_use_tor_summary">Тунеловање свих веза кроз Тор мрежу. Захтева Орбот</string>
+  <string name="account_settings_hostname">Име домаћина</string>
+  <string name="account_settings_port">Порт</string>
+  <string name="hostname_or_onion">Сервер или .onion адреса</string>
+  <string name="not_a_valid_port">Ово није исправан број порта</string>
+  <string name="not_valid_hostname">Ово није исправно име домаћина</string>
+  <string name="connected_accounts">%1$d од %2$d налога повезано</string>
+  <plurals name="x_messages">
+    <item quantity="one">%d порука</item>
+    <item quantity="few">%d поруке</item>
+    <item quantity="other">%d порука</item>
+  </plurals>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 33868fd4e..725297e9c 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -28,6 +28,8 @@
   <string name="minutes_ago">%d min sedan</string>
   <string name="unread_conversations">olästa konversationer</string>
   <string name="sending">skickar…</string>
+  <string name="message_decrypting">Avkrypterar meddelande. Vänta…</string>
+  <string name="pgp_message">OpenPGP-krypterat meddelande</string>
   <string name="nick_in_use">Nick används redan</string>
   <string name="admin">Admin</string>
   <string name="owner">Ägare</string>
@@ -78,6 +80,7 @@
   <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
   <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
   <string name="send_omemo_message">Skicka OMEMO-krypterat meddelande</string>
+  <string name="send_omemo_x509_message">Skicka v\\OMEMO-krypterat meddelande</string>
   <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
   <string name="your_nick_has_been_changed">Ditt nick har ändrats</string>
   <string name="send_unencrypted">Skicka okrypterat</string>
@@ -86,12 +89,14 @@
   <string name="openkeychain_required_long">Conversations använder en tredjeparts-applikation som heter <b>OpenKeychain</b> för att kryptera och avkryptera meddelanden och hantera dina publika nycklar.\n\nOpenKeychain är licensierad under GPLv3 och tillgänglig på F-Droid och Google Play.\n\n<small>(Starta om Conversations efter installation.)</small></string>
   <string name="restart">Starta om</string>
   <string name="install">Installera</string>
+  <string name="openkeychain_not_installed">Installera OpenKeychain</string>
   <string name="offering">erbjuder…</string>
   <string name="waiting">väntar…</string>
   <string name="no_pgp_key">Ingen OpenPGP-nyckel funnen</string>
   <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 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>
@@ -170,6 +175,7 @@
   <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 enhets 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>
@@ -205,10 +211,13 @@
   <string name="your_fingerprint">Ditt fingeravtryck</string>
   <string name="otr_fingerprint">OTR-fingeravtryck</string>
   <string name="omemo_fingerprint">OMEMO-fingeravtryck</string>
+  <string name="omemo_fingerprint_x509">v\\OMEMO-fingeravtryck</string>
   <string name="omemo_fingerprint_selected_message">Meddelandets OMEMO-fingeravtryck</string>
+  <string name="omemo_fingerprint_x509_selected_message">Meddelandets v\\OMEMO-fingeravtryck</string>
   <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>
@@ -438,6 +447,7 @@
   <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>
@@ -480,6 +490,7 @@
   <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_tor_unavailable">TOR-nätverk ej tillgängligt</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>
@@ -495,4 +506,25 @@
   <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>
+  <string name="error_fetching_omemo_key">Misslyckades med att hämta OMEMO-nyckel!</string>
+  <string name="verified_omemo_key_with_certificate">Verifierade OMEMO-nyckel med certifikat!</string>
+  <string name="device_does_not_support_certificates">Din enhet stödjer inte val av klientcertifikat!</string>
+  <string name="pref_connection_options">Anslutningsalternativ</string>
+  <string name="pref_use_tor">Ansluten via TOR</string>
+  <string name="pref_use_tor_summary">Tunnla alla anslutningar genom TOR-nätverket. Kräver Orbot</string>
+  <string name="account_settings_hostname">Servernamn</string>
+  <string name="account_settings_port">Port</string>
+  <string name="hostname_or_onion">Server- eller .onion-adress</string>
+  <string name="not_a_valid_port">Inte ett giltigt portnummer</string>
+  <string name="not_valid_hostname">Inte ett giltigt servernamn</string>
+  <string name="connected_accounts">%1$d av %2$d konton anslutna</string>
+  <plurals name="x_messages">
+    <item quantity="one">%d meddelande</item>
+    <item quantity="other">%d meddelanden</item>
+  </plurals>
+  <string name="shared_file_with_x">Delade fil med %s</string>
+  <string name="shared_image_with_x">Delade bild med %s</string>
+  <string name="no_storage_permission">Conversations behöver access till extern lagring</string>
+  <string name="sync_with_contacts">Synkronisera med kontakter</string>
+  <string name="sync_with_contacts_long">Conversations vill matcha din XMPP-kontaktlista med dina kontakter för att visa deras namn och profilbild.\n\nConversations läser endast dina kontakter för att matcha dem lokalt utan att ladda upp dem till din server.\n\nDu kommer nu få frågan om tillåtelse för att använda kontakterna.</string>
 </resources>