From 24aefa109c1f4d673e826c83720233651a850467 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 6 Mar 2016 21:35:59 +0100
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-ar/strings.xml     |  1 -
 src/main/res/values-bg/strings.xml     | 14 ++++++--
 src/main/res/values-ca/strings.xml     |  1 -
 src/main/res/values-cs/strings.xml     |  8 +++--
 src/main/res/values-de/strings.xml     | 24 ++++++++-----
 src/main/res/values-el/strings.xml     |  1 -
 src/main/res/values-es/strings.xml     | 14 ++++++--
 src/main/res/values-eu/strings.xml     |  8 +++--
 src/main/res/values-fr/strings.xml     | 22 ++++++++----
 src/main/res/values-id/strings.xml     | 42 ++++++++++++++++++++--
 src/main/res/values-it/strings.xml     | 34 ++++++++++++++++--
 src/main/res/values-iw/strings.xml     |  2 --
 src/main/res/values-ja/strings.xml     |  8 +++--
 src/main/res/values-ko/strings.xml     |  2 --
 src/main/res/values-nb-rNO/strings.xml |  2 --
 src/main/res/values-nl/strings.xml     | 14 ++++++--
 src/main/res/values-pl/strings.xml     | 33 +++++++++++++++--
 src/main/res/values-pt-rBR/strings.xml |  8 +++--
 src/main/res/values-pt/strings.xml     |  1 -
 src/main/res/values-ro-rRO/strings.xml | 16 ++++++---
 src/main/res/values-ru/strings.xml     |  2 --
 src/main/res/values-sk/strings.xml     |  1 -
 src/main/res/values-sr/strings.xml     | 49 +++++++++++++++++++++-----
 src/main/res/values-sv/strings.xml     | 16 ++++++---
 src/main/res/values-tr-rTR/strings.xml | 14 ++++++--
 src/main/res/values-vi/strings.xml     |  2 --
 src/main/res/values-zh-rCN/strings.xml | 14 ++++++--
 src/main/res/values-zh-rTW/strings.xml |  1 -
 28 files changed, 272 insertions(+), 82 deletions(-)

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 2e59983c4..e3a71f697 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -176,7 +176,6 @@
   <string name="bookmark_already_exists">موجوده بالمفضلة سابقا</string>
   <string name="you">انت</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="publish">نشر</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 4f2a548c0..b75892445 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -96,7 +96,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>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Вече съществува такава отметка</string>
   <string name="you">Вие</string>
   <string name="action_edit_subject">Редактиране на темата на беседата</string>
-  <string name="conference_not_found">Беседата не е открита</string>
-  <string name="conference_unknown_error">Беше получена непозната грешка</string>
+  <string name="joining_conference">Присъединяване към беседата…</string>
   <string name="leave">Напускане</string>
   <string name="contact_added_you">Контактът е добавен във Вашия списък от контакти</string>
   <string name="add_back">Добавяне обратно</string>
@@ -308,10 +306,13 @@
   <string name="conference_banned">Достъпът Ви до тази беседа беше забранен</string>
   <string name="conference_members_only">Тази беседа е само за членове</string>
   <string name="conference_kicked">Бяхте изритан от тази конференция</string>
+  <string name="conference_shutdown">Беседата приключи</string>
+  <string name="conference_unknown_error">Вече не участвате в тази беседа</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="check_x_filesize_on_host">Проверете размера на %1$s на %2$s</string>
   <string name="message_options">Настройки за съобщенята</string>
   <string name="copy_text">Копиране на текста</string>
   <string name="copy_original_url">Копиране на оригиналния адрес</string>
@@ -490,6 +491,8 @@
   <string name="username">Потребителско име</string>
   <string name="username_hint">Потребителско име</string>
   <string name="invalid_username">Това не е правилно потребителско име</string>
+  <string name="conference_name">Име на беседата</string>
+  <string name="invalid_conference_name">Това не е правилно име на беседа</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>
@@ -502,6 +505,8 @@
   <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="pref_treat_vibrate_as_silent">Тих режим при режим на вибриране</string>
+  <string name="pref_treat_vibrate_as_silent_summary">Преминава в състояние „недостъпен“ когато устройството е в режим на вибриране.</string>
   <string name="pref_show_connection_options">Разширени настройки за връзката</string>
   <string name="pref_show_connection_options_summary">Показване на настройките за сървър и порт при установка на профил</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -565,4 +570,7 @@
   <string name="this_field_is_required">Това поле е задължително</string>
   <string name="correct_message">Поправяне на съобщението</string>
   <string name="send_corrected_message">Изпращане на поправеното съобщение</string>
+  <string name="no_keys_just_confirm">Вие вече имате доверие на този контакт. Избирайки „готово“, Вие просто потвърждавате, че %s е част от тази беседа.</string>
+  <string name="select_image_and_crop">Изберете изображение и изрежете</string>
+  <string name="this_account_is_disabled">Вие сте деактивирали този профил</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 6f48ab63d..1c06d9abf 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -211,7 +211,6 @@
   <string name="bookmark_already_exists">Aquesta llista de favorits ja existeix</string>
   <string name="you">Tu</string>
   <string name="action_edit_subject">Editar el tema de la sala</string>
-  <string name="conference_not_found">Sala no trobada</string>
   <string name="leave">Sortir</string>
   <string name="contact_added_you">Afegir un contacte a la llista de contactes</string>
   <string name="add_back">Afegir nou</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 107304900..8979f86fc 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -96,7 +96,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>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>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Tato záložka již existuje</string>
   <string name="you">Já</string>
   <string name="action_edit_subject">Upravit jméno konference</string>
-  <string name="conference_not_found">Konference nenalezena</string>
-  <string name="conference_unknown_error">Došlo k neznámé chybě</string>
+  <string name="joining_conference">Připojování ke konferenci...</string>
   <string name="leave">Odejít</string>
   <string name="contact_added_you">Kontakt přidán do seznamu</string>
   <string name="add_back">Opět přidat</string>
@@ -308,6 +306,8 @@
   <string name="conference_banned">Vstup do konference byl zakázán</string>
   <string name="conference_members_only">Tato konference je pouze pro členy</string>
   <string name="conference_kicked">Vykopli tě z této konference</string>
+  <string name="conference_shutdown">Konference byla ukončena</string>
+  <string name="conference_unknown_error">Již nejste v této konferenci</string>
   <string name="using_account">za použití účtu %s</string>
   <string name="checking_x">Ověřuji %s na HTTP hostiteli</string>
   <string name="not_connected_try_again">Bez připojení. Zkus znovu později</string>
@@ -492,6 +492,8 @@
   <string name="username">Uživatelské jméno</string>
   <string name="username_hint">Uživatelské jméno</string>
   <string name="invalid_username">Toto není platné uživatelské jméno</string>
+  <string name="conference_name">Jméno konferenc</string>
+  <string name="invalid_conference_name">Toto není platné jméno konference</string>
   <string name="download_failed_server_not_found">Stahování selhalo: Server nenalezen</string>
   <string name="download_failed_file_not_found">Stahování selhalo: Soubor nenalezen</string>
   <string name="download_failed_could_not_connect">Stahování selhalo: Nelze se připojit k hostu</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 0968a5f73..454c87916 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -96,7 +96,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. Antippen zum 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>
@@ -160,7 +159,7 @@
   <string name="mgmt_account_disable">Vorübergehend abschalten</string>
   <string name="mgmt_account_publish_avatar">Avatar veröffentlichen</string>
   <string name="mgmt_account_publish_pgp">Öffentlichen OpenPGP-Schlüssel veröffentlichen</string>
-  <string name="mgmt_account_enable">Anschalten</string>
+  <string name="mgmt_account_enable">Aktivieren </string>
   <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string>
   <string name="mgmt_account_delete_confirm_text">Wenn du dein Konto löschst, gehen alle Gesprächsverläufe verloren</string>
   <string name="attach_record_voice">Sprache aufzeichnen</string>
@@ -217,7 +216,7 @@
   <string name="other_devices">Andere Geräte</string>
   <string name="trust_omemo_fingerprints">OMEMO-Fingerabdruck vertrauen</string>
   <string name="fetching_keys">Schlüssel werden abgerufen …</string>
-  <string name="done">Erledigt</string>
+  <string name="done">Fertig</string>
   <string name="verify">Überprüfen</string>
   <string name="decrypt">Entschlüsseln</string>
   <string name="conferences">Konferenzen</string>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string>
   <string name="you">Du</string>
   <string name="action_edit_subject">Konferenz-Thema bearbeiten</string>
-  <string name="conference_not_found">Konferenz nicht gefunden</string>
-  <string name="conference_unknown_error">Unbekannter Fehler</string>
+  <string name="joining_conference">Konferenz wird betreten…</string>
   <string name="leave">Verlassen</string>
   <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
   <string name="add_back">Auch hinzufügen</string>
@@ -301,17 +299,20 @@
   <string name="pref_expert_options_other">Sonstiges</string>
   <string name="pref_conference_name">Konferenz-Name</string>
   <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Namen verwenden</string>
-  <string name="pref_autojoin">Unterhaltung automatisch beitreten</string>
+  <string name="pref_autojoin">Konferenzen automatisch beitreten</string>
   <string name="pref_autojoin_summary">Autojoin-Flag in Konferenzlesezeichen beachten</string>
   <string name="toast_message_otr_fingerprint">OTR-Fingerabdruck in die Zwischenablage kopiert!</string>
   <string name="toast_message_omemo_fingerprint">OMEMO-Fingerabdruck in die Zwischenablage kopiert!</string>
   <string name="conference_banned">Du wurdest von der Konferenz ausgeschlossen</string>
   <string name="conference_members_only">Die Konferenz ist nur für Mitglieder</string>
   <string name="conference_kicked">Du wurdest aus der Konferenz geworfen</string>
+  <string name="conference_shutdown">Konferenz wurde geschlossen</string>
+  <string name="conference_unknown_error">Du bist nicht länger in dieser Konferenz</string>
   <string name="using_account">Verwendetes Konto: %s</string>
   <string name="checking_x">%s auf HTTP-Host wird überprüft</string>
   <string name="not_connected_try_again">Nicht verbunden, bitte später versuchen</string>
   <string name="check_x_filesize">%s-Größe prüfen</string>
+  <string name="check_x_filesize_on_host">%1$s-Größe auf %2$s prüfen</string>
   <string name="message_options">Nachrichtenoptionen</string>
   <string name="copy_text">Text kopieren</string>
   <string name="copy_original_url">Original-URL kopieren</string>
@@ -400,7 +401,7 @@
   <string name="current_password">Aktuelles Passwort</string>
   <string name="new_password">Neues Passwort</string>
   <string name="password_should_not_be_empty">Das Passwort darf nicht leer sein</string>
-  <string name="enable_all_accounts">Alle Konten anschalten</string>
+  <string name="enable_all_accounts">Alle Konten aktiveren</string>
   <string name="disable_all_accounts">Alle Konten abschalten</string>
   <string name="perform_action_with">Aktion durchführen mit</string>
   <string name="no_affiliation">Keine Zugehörigkeit</string>
@@ -490,6 +491,8 @@
   <string name="username">Benutzername</string>
   <string name="username_hint">Benutzername</string>
   <string name="invalid_username">Ungültiger Benutzername</string>
+  <string name="conference_name">Konferenz-Name</string>
+  <string name="invalid_conference_name">Dies ist kein gültiger Konferenz-Name</string>
   <string name="download_failed_server_not_found">Download fehlgeschlagen: Server nicht gefunden</string>
   <string name="download_failed_file_not_found">Download fehlgeschlagen: Datei nicht gefunden</string>
   <string name="download_failed_could_not_connect">Download fehlgeschlagen: keine Verbindung zum Host</string>
@@ -501,7 +504,9 @@
   <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 Telefon lautlos ist</string>
+  <string name="pref_xa_on_silent_mode_summary">Setzt deinen Status auf \"nicht verfügbar\", solange dein Gerät lautlos ist</string>
+  <string name="pref_treat_vibrate_as_silent">Behandle Vibration als Stumm</string>
+  <string name="pref_treat_vibrate_as_silent_summary">Setze deinen Status auf \"nicht verfügbar\" solange dein Gerät auf \"vibrieren\" ist.</string>
   <string name="pref_show_connection_options">Erweiterte Verbindungs-Optionen</string>
   <string name="pref_show_connection_options_summary">Hostname- und Port-Optionen bei Kontoeinrichtung anzeigen</string>
   <string name="hostname_example">xmpp.domain.de</string>
@@ -565,4 +570,7 @@
   <string name="this_field_is_required">Dieses Feld ist erforderlich</string>
   <string name="correct_message">Nachricht korrigieren</string>
   <string name="send_corrected_message">Korrigierte Nachricht senden</string>
+  <string name="no_keys_just_confirm">Du vertraust diesem Kontakt bereits. In dem du \'Fertig\' auswählst bestätigst Du, dass %s Teil dieser Konferenz ist.</string>
+  <string name="select_image_and_crop">Bild auswählen und zuschneiden</string>
+  <string name="this_account_is_disabled">Du hast diesen Account deaktiviert</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 0bdc6a5e4..804a2146f 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -211,7 +211,6 @@
   <string name="bookmark_already_exists">Αυτός ο σελιδοδείκτης υπάρχει ήδη</string>
   <string name="you">Εσείς</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>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 84df18504..f630f7cac 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -96,7 +96,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 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>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Este marcador ya existe</string>
   <string name="you">Tú</string>
   <string name="action_edit_subject">Editar asunto de la conversación</string>
-  <string name="conference_not_found">Conversación no encontrada</string>
-  <string name="conference_unknown_error">Error desconocido</string>
+  <string name="joining_conference">Uniéndose a conversación...</string>
   <string name="leave">Salir</string>
   <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
   <string name="add_back">Añadir contacto</string>
@@ -308,10 +306,13 @@
   <string name="conference_banned">Tu entrada a esta conversación ha sido prohibida</string>
   <string name="conference_members_only">Esta conversación es solo para miembros</string>
   <string name="conference_kicked">Has sido expulsado de esta conversación</string>
+  <string name="conference_shutdown">La conversación ha sido cerrada</string>
+  <string name="conference_unknown_error">Ya no estás dentro de esta conversación</string>
   <string name="using_account">Usando cuenta %s</string>
   <string name="checking_x">Comprobando %s en servidor HTTP</string>
   <string name="not_connected_try_again">No estás conectado. Inténtalo más tarde</string>
   <string name="check_x_filesize">Comprobar tamaño de %s</string>
+  <string name="check_x_filesize_on_host">Comprobar tamaño de %1$s en %2$s</string>
   <string name="message_options">Opciones de mensaje</string>
   <string name="copy_text">Copiar texto</string>
   <string name="copy_original_url">Copiar URL original</string>
@@ -490,6 +491,8 @@
   <string name="username">Usuario</string>
   <string name="username_hint">Usuario</string>
   <string name="invalid_username">Esto no es un usuario válido</string>
+  <string name="conference_name">Nombre de la conversación</string>
+  <string name="invalid_conference_name">Nombre de conversación no válido</string>
   <string name="download_failed_server_not_found">Error al descargar: Servidor no encontrado</string>
   <string name="download_failed_file_not_found">Error al descargar: Archivo no encontrado</string>
   <string name="download_failed_could_not_connect">Error al descargar: No se ha podido conectar con el servidor</string>
@@ -502,6 +505,8 @@
   <string name="pref_away_when_screen_off_summary">Cambia tu estado a ausente cuando la pantalla está apagada</string>
   <string name="pref_xa_on_silent_mode">No disponible en modo silencio</string>
   <string name="pref_xa_on_silent_mode_summary">Cambia tu estado a no disponible cuando el dispositivo está en modo silencio</string>
+  <string name="pref_treat_vibrate_as_silent">Modo vibración como modo silencio</string>
+  <string name="pref_treat_vibrate_as_silent_summary">Cambia tu estado a no disponible cuando el dispositivo está en modo vibración</string>
   <string name="pref_show_connection_options">Opciones de conexión</string>
   <string name="pref_show_connection_options_summary">Mostrar el hostname y el puerto cuando se está creando una cuenta</string>
   <string name="hostname_example">xmpp.ejemplo.com</string>
@@ -565,4 +570,7 @@
   <string name="this_field_is_required">Este campo es requerido</string>
   <string name="correct_message">Corregir mensaje</string>
   <string name="send_corrected_message">Enviar mensaje corregido</string>
+  <string name="no_keys_just_confirm">Ya confías en este contacto. Seleccionando \'hecho\', estás confirmando que %s es parte de esta conversación.</string>
+  <string name="select_image_and_crop">Seleccionar imagen y recortar</string>
+  <string name="this_account_is_disabled">Has deshabilitado esta cuenta</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index ea91da79d..27bbf42fb 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -96,7 +96,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 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>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string>
   <string name="you">Zu</string>
   <string name="action_edit_subject">Konferentziaren gaia editatu</string>
-  <string name="conference_not_found">Konferentzia ez da aurkitu</string>
-  <string name="conference_unknown_error">Akats ezezaguna jaso da</string>
+  <string name="joining_conference">Konferentziara batzen...</string>
   <string name="leave">Alde egin</string>
   <string name="contact_added_you">Kontaktuak bere zerrendara gehitu zaitu</string>
   <string name="add_back">Bera gehitu</string>
@@ -308,6 +306,8 @@
   <string name="conference_banned">Konferentzia honetara sartzea debekatuta duzu</string>
   <string name="conference_members_only">Konferentzia hau kideentzat da soilik</string>
   <string name="conference_kicked">Konferentzia honetatik kanporatua izan zara</string>
+  <string name="conference_shutdown">Konferentzia itzali egin da</string>
+  <string name="conference_unknown_error">Ez zaude dagoeneko konferentzia honetan</string>
   <string name="using_account">%s kontua erabiltzen</string>
   <string name="checking_x">%s egiaztatzen HTTP ostalarian</string>
   <string name="not_connected_try_again">Ez zaude konektatuta. Saiatu beranduago berriz</string>
@@ -490,6 +490,8 @@
   <string name="username">Erabiltzaile izena</string>
   <string name="username_hint">Erabiltzaile izena</string>
   <string name="invalid_username">Hau ez da erabiltzaile izen baliodun bat</string>
+  <string name="conference_name">Konferentziaren izena</string>
+  <string name="invalid_conference_name">Hau ez da konferentzia batentzako izen balioduna</string>
   <string name="download_failed_server_not_found">Deskargak huts egin du: zerbitzaria ez da aurkitu</string>
   <string name="download_failed_file_not_found">Deskargak huts egin du: fitxategia ez da aurkitu</string>
   <string name="download_failed_could_not_connect">Deskargak huts egin du: ezin izan da ostalarira konektatu</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 4105dad36..488a4b582 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -79,8 +79,8 @@
   <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>
-  <string name="send_omemo_message">Envoyé un message chiffré avec OMEMO</string>
-  <string name="send_omemo_x509_message">Envoyé un message chiffré avec \\OMEMO</string>
+  <string name="send_omemo_message">Envoyer un message chiffré avec OMEMO</string>
+  <string name="send_omemo_x509_message">Envoyer un message chiffré avec \\OMEMO</string>
   <string name="send_pgp_message">Envoyer un message chiffré avec OpenPGP</string>
   <string name="your_nick_has_been_changed">Votre identifiant a été changé</string>
   <string name="send_unencrypted">Envoyer en clair</string>
@@ -96,7 +96,6 @@
   <string name="contact_has_no_pgp_key">Conversations ne peut pas chiffrer vos messages car votre contact 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 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>
@@ -171,7 +170,7 @@
   <string name="password">Mot de passe</string>
   <string name="confirm_password">Confirmer le mot de passe</string>
   <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="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 à votre carnet d\'adresses ?</string>
   <string name="contact_status_online">En ligne</string>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Le favori existe déjà</string>
   <string name="you">Vous</string>
   <string name="action_edit_subject">Modifier le sujet de la conférence</string>
-  <string name="conference_not_found">Impossible de trouver la conférence</string>
-  <string name="conference_unknown_error">Erreur inconnue reçue</string>
+  <string name="joining_conference">Connexion à la conférence...</string>
   <string name="leave">Partir</string>
   <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
   <string name="add_back">Ré-ajouter</string>
@@ -308,10 +306,13 @@
   <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="conference_shutdown">La conférence a été fermée</string>
+  <string name="conference_unknown_error">Vous n\'êtes plus dans cette conférence</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>
+  <string name="check_x_filesize_on_host">Vérification de la taille de %1$s sur %2$s</string>
   <string name="message_options">Options du message</string>
   <string name="copy_text">Copier le texte</string>
   <string name="copy_original_url">Copier l\'URL</string>
@@ -489,7 +490,9 @@
   <string name="user_has_left_conference">%s a quitté la conférence !</string>
   <string name="username">Identifiant</string>
   <string name="username_hint">Identifiant</string>
-  <string name="invalid_username">Ce n\'est pas un identifiant valide</string>
+  <string name="invalid_username">Cet identifiant n\'est pas valide</string>
+  <string name="conference_name">Nom de la conférence </string>
+  <string name="invalid_conference_name">Ce nom de conférence n\'est pas valide</string>
   <string name="download_failed_server_not_found">Échec du téléchargement : impossible de trouver le serveur</string>
   <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>
@@ -502,6 +505,8 @@
   <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="pref_treat_vibrate_as_silent">Indisponible en mode vibreur</string>
+  <string name="pref_treat_vibrate_as_silent_summary">Marque cette ressource comme indisponible quand l\'appareil est en mode vibreur</string>
   <string name="pref_show_connection_options">Paramètres de connexioin avancés</string>
   <string name="pref_show_connection_options_summary">Montrer le nom d\'hôte et le port lors du paramétrage d\'un compte</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -565,4 +570,7 @@
   <string name="this_field_is_required">Ce champ est requis</string>
   <string name="correct_message">Corriger le message</string>
   <string name="send_corrected_message">Envoyer le message corrigé</string>
+  <string name="no_keys_just_confirm">Vous faites déjà confiance à ce contact. En sélectionnant « Terminé » vous confirmerez seulement que %s est membre de cette conférence.</string>
+  <string name="select_image_and_crop">Sélectionner et découper une image</string>
+  <string name="this_account_is_disabled">Vous avez désactivé ce compte</string>
 </resources>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index eae96d30a..3b5d10ffd 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -27,7 +27,9 @@
   <string name="minutes_ago">%d min lalu</string>
   <string name="unread_conversations">Percakapan belum dibaca</string>
   <string name="sending">mengirim...</string>
-  <string name="nick_in_use">Nick ini sudah digunakan</string>
+  <string name="message_decrypting">Mendekripsi pesan. Mohon tunggu…</string>
+  <string name="pgp_message">Pesan terenkripsi OpenPGP</string>
+  <string name="nick_in_use">Nickname ini sudah digunakan</string>
   <string name="admin">Administrator</string>
   <string name="owner">Pemilik</string>
   <string name="moderator">Moderator</string>
@@ -73,6 +75,7 @@
   <string name="clear_histor_msg">Apakah Anda ingin menghapus semua pesan dalam Percakapan ini\n\n<b>Peringatan:</b>ini tidak akan mempengaruhi pesan yang disimpan pada perangkat atau server lain.</string>
   <string name="delete_messages">Hapus pesan</string>
   <string name="choose_presence">Pilih kehadiran untuk kontak</string>
+  <string name="send_unencrypted_message">Kirim pesan tak-terenkripsi</string>
   <string name="send_otr_message">Kirim pesan terenskripsi OTR</string>
   <string name="send_pgp_message">Kirim pesan terenskripsi OpenPGP</string>
   <string name="your_nick_has_been_changed">Nick kamu telah dirubah</string>
@@ -82,6 +85,7 @@
   <string name="openkeychain_required_long">Conversations menggunakan app pihak ke-3 bernama <b>OpenKeychain</b> untuk mengenkripsi dan menerjemahkan pesan dan mengorganisir kunci anda.\n\nOpenKeychain berlisensi GPLv3 dan tersedia fi F-Droid dan Google play.\n\n<small>(Silahkan mulai ulang Conversations setelah menginstall.)</small></string>
   <string name="restart">Mulai ulang</string>
   <string name="install">Pasang</string>
+  <string name="openkeychain_not_installed">Harap install OpenKeychain</string>
   <string name="offering">menawarkan...</string>
   <string name="waiting">menunggu...</string>
   <string name="no_pgp_key">Tidak ada kunci OpenPGP ditemukan</string>
@@ -93,6 +97,7 @@
   <string name="pref_xmpp_resource_summary">Identifikasi nama klien ini dengan</string>
   <string name="pref_accept_files">Terima berkas</string>
   <string name="pref_accept_files_summary">Otomatis menerima berkas lebih kecil dari...</string>
+  <string name="pref_notification_settings">Notif</string>
   <string name="pref_notifications">Notifikasi</string>
   <string name="pref_notifications_summary">Notifikasikan jika pesan baru tiba</string>
   <string name="pref_vibrate">Getar</string>
@@ -101,13 +106,15 @@
   <string name="pref_sound_summary">mainkan suara saat menerima notifikasi</string>
   <string name="pref_notification_grace_period">Tenggang waktu pemberitahuan</string>
   <string name="pref_notification_grace_period_summary">Nonaktifkan pemberitahuan untuk waktu yang singkat setelah salinan diterima</string>
+  <string name="pref_advanced_options">Lanjutan</string>
   <string name="pref_never_send_crash">Jangan kirim laporan kerusakan</string>
   <string name="pref_never_send_crash_summary">Dengan mengirimkan kesalahan Anda membantu pengembangan Aplikasi Conversations</string>
   <string name="pref_confirm_messages">Konfirmasi Pesan</string>
   <string name="pref_confirm_messages_summary">Biarkan kontak Anda tahu kapan Anda telah menerima dan membaca pesan</string>
+  <string name="pref_ui_options">UI</string>
   <string name="openpgp_error">OpenKeychain melaporkan kesalahan</string>
   <string name="error_decrypting_file">I/O Error menerjemahkan berkas</string>
-  <string name="accept">Menerima</string>
+  <string name="accept">Terima</string>
   <string name="error">Sebuah kesalahan terjadi</string>
   <string name="pref_grant_presence_updates">Memberikan perubahan kehadiran</string>
   <string name="pref_grant_presence_updates_summary">Terlebih dahulu meminta dan berlangganan kehadiran untuk kontak Anda buat</string>
@@ -141,6 +148,7 @@
   <string name="account_status_incompatible_server">Server tidak cocok</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">Ubah akun</string>
   <string name="mgmt_account_delete">Hapus akun</string>
   <string name="mgmt_account_disable">Sementara dimatikan</string>
@@ -213,7 +221,6 @@
   <string name="bookmark_already_exists">Bookmark ini sudah ada</string>
   <string name="you">Anda</string>
   <string name="action_edit_subject">Ubah subjek conference</string>
-  <string name="conference_not_found">Conference tidak ditemukan</string>
   <string name="leave">Tinggalkan</string>
   <string name="contact_added_you">Kontak ditambahkan ke daftar anda</string>
   <string name="add_back">Tambah kembali</string>
@@ -399,6 +406,7 @@
   <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>
@@ -434,7 +442,35 @@
   <string name="username">Username</string>
   <string name="username_hint">Username</string>
   <string name="invalid_username">Username ini tidak valid</string>
+  <string name="conference_name">Nama Conference</string>
   <string name="download_failed_server_not_found">Unduhan gagal: Server tidak ditemukan</string>
   <string name="download_failed_file_not_found">Unduh gagal: Berkas tidak ditemukan</string>
   <string name="download_failed_could_not_connect">Unduhan gagal: Tidak dapat terhubung ke host</string>
+  <string name="pref_use_white_background">Gunakan latar putih</string>
+  <string name="account_status_tor_unavailable">Tor network tidak tersedia</string>
+  <string name="server_info_broken">Rusak</string>
+  <string name="pref_presence_settings">Kehadiran</string>
+  <string name="hostname_example">xmpp.example.com</string>
+  <string name="pref_connection_options">Koneksi</string>
+  <string name="pref_use_tor">Hubungkan via Tor</string>
+  <string name="account_settings_hostname">Hostname</string>
+  <string name="account_settings_port">Port</string>
+  <string name="certificate_information">Informasi Sertifikat</string>
+  <string name="certificate_subject">Subjek</string>
+  <string name="certificate_cn">Nama Umum</string>
+  <string name="certificate_o">Organisasi</string>
+  <string name="certificate_sha1">SHA-1</string>
+  <string name="certicate_info_not_available">(Tidak tersedia)</string>
+  <string name="certificate_not_found">Tidak ada sertifikat ditemukan</string>
+  <string name="pref_picture_compression">Kompres Gambar</string>
+  <string name="pref_picture_compression_summary">Rubah ukuran dan kompres gambar</string>
+  <string name="always">Selalu</string>
+  <string name="automatically">Secara otomatis</string>
+  <string name="battery_optimizations_enabled">Pengoptimalan baterai diaktifkan</string>
+  <string name="disable">Non-aktifkan</string>
+  <string name="selection_too_large">Area yang dipilih terlalu besar</string>
+  <string name="no_accounts">(Tidak ada akun aktif)</string>
+  <string name="this_field_is_required">Bagian ini wajib diisi</string>
+  <string name="correct_message">Perbaiki pesan</string>
+  <string name="send_corrected_message">Kirim perbaikan pesan</string>
 </resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 5554efc48..a512575b1 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -96,12 +96,12 @@
   <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>
   <string name="pref_accept_files">Accetta i file</string>
   <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di…</string>
+  <string name="pref_notification_settings">Notifiche</string>
   <string name="pref_notifications">Notifiche</string>
   <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
   <string name="pref_vibrate">Vibra</string>
@@ -110,10 +110,12 @@
   <string name="pref_sound_summary">Riproduci una suoneria con la notifica</string>
   <string name="pref_notification_grace_period">Periodo tra notifiche</string>
   <string name="pref_notification_grace_period_summary">Disabilita le notifiche per un breve lasso di tempo dopo che un messaggio è stato ricevuto</string>
+  <string name="pref_advanced_options">Avanzate</string>
   <string name="pref_never_send_crash">Non inviare mai segnalazioni di errore</string>
   <string name="pref_never_send_crash_summary">Se scegli di inviare una segnalazione dell’errore aiuterai lo sviluppo di Conversations</string>
   <string name="pref_confirm_messages">Conferma Messaggi</string>
   <string name="pref_confirm_messages_summary">Fai sapere ai tuoi contatti quando hai ricevuto il messaggio e l’hai letto</string>
+  <string name="pref_ui_options">Interfaccia Utente</string>
   <string name="openpgp_error">OpenKeychain ha riportato un errore</string>
   <string name="error_decrypting_file">Errore di I/O nel decifrare il file</string>
   <string name="accept">Accetta</string>
@@ -188,6 +190,7 @@
   <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_push">XEP-0357: Push</string>
   <string name="server_info_available">disponibile</string>
   <string name="server_info_unavailable">non disponibile</string>
   <string name="missing_public_keys">Annuncio chiave pubblica non effettuato</string>
@@ -236,7 +239,7 @@
   <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
   <string name="you">Tu</string>
   <string name="action_edit_subject">Modifica soggetto conferenza</string>
-  <string name="conference_not_found">Conferenza non trovata</string>
+  <string name="joining_conference">Entro in conferenza...</string>
   <string name="leave">Abbandona</string>
   <string name="contact_added_you">Il contatto ti ha aggiunto alla sua lista contatti</string>
   <string name="add_back">Add back</string>
@@ -271,10 +274,14 @@
   <string name="sure_delete_fingerprint">Sei sicuro di voler eliminare questa impronta?</string>
   <string name="ignore">Ignora</string>
   <string name="without_mutual_presence_updates"><b>Attenzione:</b> Inviando questo messaggio senza aggiornamenti della presenza reciproci potrebbe causare problemi inaspettati.\n\n<small>Vai nei dettagli del contatto per verificare le tue sottoscrizioni alla presenza.</small></string>
+  <string name="pref_security_settings">Sicurezza</string>
   <string name="pref_force_encryption">Forza cifratura end-to-end</string>
   <string name="pref_force_encryption_summary">Manda sempre messaggi cifrati (ad eccezione delle conferenze)</string>
+  <string name="pref_allow_message_correction">Permetti correzione del messaggio</string>
+  <string name="pref_allow_message_correction_summary">Consenti ai tuoi contatti di modificare retroattivamente i loro messaggi</string>
   <string name="pref_dont_save_encrypted">Non salvare i messaggi cifrati</string>
   <string name="pref_dont_save_encrypted_summary">Attenzione: Questo potrebbe comportare la perdita di messaggi</string>
+  <string name="pref_expert_options">Impostazioni esperto</string>
   <string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
   <string name="title_activity_about">Info su Conversations</string>
   <string name="pref_about_conversations_summary">Informazioni sulla licenza</string>
@@ -292,11 +299,15 @@
   <string name="pref_expert_options_other">Altro</string>
   <string name="pref_conference_name">Nome della conferenza</string>
   <string name="pref_conference_name_summary">Usa il soggetto della stanza al posto del JID per identificare le conferenze</string>
+  <string name="pref_autojoin">Entra automaticamente in conferenza</string>
+  <string name="pref_autojoin_summary">Rispetta l\'opzione di entrata automatica nei segnalibri di conferenze</string>
   <string name="toast_message_otr_fingerprint">Impronta OTR copiata!</string>
   <string name="toast_message_omemo_fingerprint">Fingerprint OMEMO copiata negli appunti|</string>
   <string name="conference_banned">Sei stato bandito da questa conferenza</string>
   <string name="conference_members_only">Questa conferenza è solo per membri</string>
   <string name="conference_kicked">Sei stato buttato fuori dalla conferenza</string>
+  <string name="conference_shutdown">La conferenza è stata chiusa</string>
+  <string name="conference_unknown_error">Non sei più in questa conferenza</string>
   <string name="using_account">usando l’utente %s</string>
   <string name="checking_x">Controllo %s su host HTTP</string>
   <string name="not_connected_try_again">Non sei connesso. Riprova più tardi</string>
@@ -422,6 +433,7 @@
   <string name="two_hours">2 ore</string>
   <string name="eight_hours">8 ore</string>
   <string name="until_further_notice">Fino a nuovo avviso</string>
+  <string name="pref_input_options">Input</string>
   <string name="pref_enter_is_send">Invio spedisce</string>
   <string name="pref_enter_is_send_summary">Il tasto invio spedisce il messaggio</string>
   <string name="pref_display_enter_key">Mostra il tasto invio</string>
@@ -478,6 +490,8 @@
   <string name="username">Utente</string>
   <string name="username_hint">Utente</string>
   <string name="invalid_username">Questo non è un nome utente valido</string>
+  <string name="conference_name">Nome conferenza</string>
+  <string name="invalid_conference_name">Questo non è un nome di conferenza valido</string>
   <string name="download_failed_server_not_found">Download fallito: Server non trovato</string>
   <string name="download_failed_file_not_found">Download fallito: File non trovato</string>
   <string name="download_failed_could_not_connect">Download fallito: Impossibile connettersi all\'host</string>
@@ -485,13 +499,21 @@
   <string name="pref_use_white_background_summary">Mostra i messaggi ricevuti con testo nero su sfondo bianco</string>
   <string name="account_status_tor_unavailable">Rete Tor non disponibile</string>
   <string name="server_info_broken">Rotto</string>
+  <string name="pref_presence_settings">Presenza</string>
   <string name="pref_away_when_screen_off">\"Non disponibile\" a schermo spento</string>
   <string name="pref_away_when_screen_off_summary">Imposta la tua risorsa come non disponibile quando lo schermo è spento</string>
   <string name="pref_xa_on_silent_mode">Non disponibile in modalità silenzioso</string>
   <string name="pref_xa_on_silent_mode_summary">Imposta la tua risorsa come non disponibile quando il dispositivo è in modalità silenziosa</string>
+  <string name="pref_show_connection_options">Impostazioni estese di connessione</string>
+  <string name="pref_show_connection_options_summary">Mostra nome host e impostazioni della porta quando configuri un account</string>
+  <string name="hostname_example">xmpp.esempio.it</string>
   <string name="action_add_account_with_certificate">Aggiungi account con certificato</string>
   <string name="unable_to_parse_certificate">Impossibile analizzare il certificato</string>
   <string name="authenticate_with_certificate">Lasciare vuoto per autenticarsi con certificato</string>
+  <string name="mam_prefs">Preferenze di archiviazione</string>
+  <string name="server_side_mam_prefs">Preferenze di archiviazione lato server</string>
+  <string name="fetching_mam_prefs">Raccolta preferenze di archiviazione. Attendere prego...</string>
+  <string name="unable_to_fetch_mam_prefs">Impossibile raccogliere le preferenze di archiviazione</string>
   <string name="captcha_ocr">Testo captcha</string>
   <string name="captcha_required">Captcha richiest</string>
   <string name="captcha_hint">inserire il testo dall\'immagine</string>
@@ -501,6 +523,7 @@
   <string name="error_fetching_omemo_key">Errore ricezione chiave OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Chiave OMEMO verificata con certificato!</string>
   <string name="device_does_not_support_certificates">Il tuo dispositivo non supporta la selezione di certificati utente!</string>
+  <string name="pref_connection_options">Connessione</string>
   <string name="pref_use_tor">Connettiti via Tor</string>
   <string name="pref_use_tor_summary">Indirizza tutte le connessioni attraverso la rete Tor. Richiede Orbot</string>
   <string name="account_settings_hostname">Nome host</string>
@@ -513,6 +536,7 @@
     <item quantity="one">%d messaggio</item>
     <item quantity="other">%d messaggi</item>
   </plurals>
+  <string name="load_more_messages">Carica altri messaggi</string>
   <string name="shared_file_with_x">Condividi file con %s</string>
   <string name="shared_image_with_x">Immagine condivisa con %s</string>
   <string name="no_storage_permission">Conversations necessita di accesso alla memoria esterna</string>
@@ -523,6 +547,7 @@
   <string name="certificate_issuer">Emittente</string>
   <string name="certificate_cn">Nome comune</string>
   <string name="certificate_o">Organizzazione</string>
+  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(Non disponibile)</string>
   <string name="certificate_not_found">Nessun certificato trovato</string>
   <string name="notify_on_all_messages">Notifica per tutti i messaggi</string>
@@ -530,6 +555,7 @@
   <string name="notify_never">Notifiche disabilitate</string>
   <string name="notify_paused">Notifiche in pausa</string>
   <string name="pref_picture_compression">Comprimi immagini</string>
+  <string name="pref_picture_compression_summary">Ridimensiona e comprimi immagini</string>
   <string name="always">Sempre</string>
   <string name="automatically">Automaticamente</string>
   <string name="battery_optimizations_enabled">Ottimizzazioni batteria abilitate</string>
@@ -537,4 +563,8 @@
   <string name="battery_optimizations_enabled_dialog">Il tuo dispositivo sta facendo delle ingenti ottimizzazioni della batteria per Conversations che potrebbero portare ritardi alle notifiche o anche perdita di messaggi.\n\nTi verrà ora chiesto di disabilitarle.</string>
   <string name="disable">Disabilita</string>
   <string name="selection_too_large">L\'area selezionata è troppo grande</string>
+  <string name="no_accounts">(Nessun account attivo)</string>
+  <string name="this_field_is_required">Questo campo è obbligatorio</string>
+  <string name="correct_message">Correggi messaggio</string>
+  <string name="send_corrected_message">Invia messaggio corretto</string>
 </resources>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 2495360e6..5b640ff2e 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -94,7 +94,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>
@@ -228,7 +227,6 @@
   <string name="bookmark_already_exists">סימנייה זו כבר קיימת</string>
   <string name="you">אני</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>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index b77c30b5f..54611dc56 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -96,7 +96,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>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">このブックマークはすでに存在します</string>
   <string name="you">あなた</string>
   <string name="action_edit_subject">会議の件名を編集</string>
-  <string name="conference_not_found">会議が見つかりません</string>
-  <string name="conference_unknown_error">不明なエラーを受け取りました</string>
+  <string name="joining_conference">会議に参加中…</string>
   <string name="leave">退出</string>
   <string name="contact_added_you">連絡先があなたを連絡先リストに追加しました</string>
   <string name="add_back">戻りを追加</string>
@@ -308,6 +306,8 @@
   <string name="conference_banned">あなたはこの会議から禁止されています</string>
   <string name="conference_members_only">この会議はメンバーのみです</string>
   <string name="conference_kicked">あなたはこの会議からキックされました</string>
+  <string name="conference_shutdown">会議は停止しました</string>
+  <string name="conference_unknown_error">あなたはもうこの会議に参加していません</string>
   <string name="using_account">アカウント %s を使用</string>
   <string name="checking_x">HTTP ホストの %s を確認中</string>
   <string name="not_connected_try_again">接続されていません。後でもう一度お試しください</string>
@@ -488,6 +488,8 @@
   <string name="username">ユーザー名</string>
   <string name="username_hint">ユーザー名</string>
   <string name="invalid_username">これは有効なユーザー名ではありません</string>
+  <string name="conference_name">会議名</string>
+  <string name="invalid_conference_name">これは有効な会議名ではありません</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>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 0931f7f65..311d3fdd9 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -96,7 +96,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"><i>암호화된 메세지가 도착했습니다. 터치하여 복호화하세요.</i></string>
   <string name="pref_general">일반 </string>
   <string name="pref_xmpp_resource">XMPP 자원 </string>
   <string name="pref_xmpp_resource_summary">이 클라이언트가 자신을 알아보는 이름</string>
@@ -236,7 +235,6 @@
   <string name="bookmark_already_exists">즐겨찾기가 이미 존재합니다 </string>
   <string name="you">당신 </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">Add back</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 19b46aacb..b78c1fba2 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -96,7 +96,6 @@
   <string name="contact_has_no_pgp_key">Conversations kan ikke kryptere din melding fordi din kontakt ikke annonserer sin offentlige nøkkel.\n\n<small>Spør din kontakt om å sette opp OpenPGP.</small></string>
   <string name="no_pgp_keys">Ingen OpenPGP-nøkler funnet</string>
   <string name="contacts_have_no_pgp_keys">Conversations kan ikke kryptere din melding fordi dine kontakter ikke annonserer sine offentlige nøkkler.\n\n<small>Spør din kontakt om å sette opp OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Kryptert melding mottatt. Trykk for å dekryptere.</i></string>
   <string name="pref_general">Generelt</string>
   <string name="pref_xmpp_resource">XMPP-ressurs</string>
   <string name="pref_xmpp_resource_summary">Navnet denne klienten identifiserer seg med</string>
@@ -236,7 +235,6 @@
   <string name="bookmark_already_exists">Dette bokmerket finnes allerede</string>
   <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>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 76a8b950a..9431e8cf6 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -96,7 +96,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 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>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Deze bladwijzer bestaat al</string>
   <string name="you">Jij</string>
   <string name="action_edit_subject">Onderwerp van groepsgesprek bewerken</string>
-  <string name="conference_not_found">Groepsgesprek niet gevonden</string>
-  <string name="conference_unknown_error">Onbekende fout ontvangen</string>
+  <string name="joining_conference">Deelnemen aan groepsgesprek…</string>
   <string name="leave">Verlaten</string>
   <string name="contact_added_you">Contact heeft je toegevoegd aan zijn/haar contacten</string>
   <string name="add_back">Contact toevoegen aan eigen contacten</string>
@@ -308,10 +306,13 @@
   <string name="conference_banned">Je bent verbannen uit dit groepsgesprek</string>
   <string name="conference_members_only">Dit groepsgesprek is enkel voor leden</string>
   <string name="conference_kicked">Je bent uit dit groepsgesprek geschopt</string>
+  <string name="conference_shutdown">Het groepsgesprek is uitgeschakeld</string>
+  <string name="conference_unknown_error">Je neemt niet langer deel aan dit groepsgesprek</string>
   <string name="using_account">met account %s</string>
   <string name="checking_x">%s op HTTP-host nakijken</string>
   <string name="not_connected_try_again">Je bent niet verbonden. Probeer later opnieuw</string>
   <string name="check_x_filesize">Bestandsgrootte van %s controleren</string>
+  <string name="check_x_filesize_on_host">Bestandsgrootte van %1$s op %2$s controleren</string>
   <string name="message_options">Berichtopties</string>
   <string name="copy_text">Tekst kopiëren</string>
   <string name="copy_original_url">Oorspronkelijke URL kopiëren</string>
@@ -490,6 +491,8 @@
   <string name="username">Gebruikersnaam</string>
   <string name="username_hint">Gebruikersnaam</string>
   <string name="invalid_username">Dit is geen geldige gebruikersnaam</string>
+  <string name="conference_name">Groepsgespreksnaam</string>
+  <string name="invalid_conference_name">Dit is geen geldige groepsgespreksnaam</string>
   <string name="download_failed_server_not_found">Downloaden mislukt: server niet gevonden</string>
   <string name="download_failed_file_not_found">Downloaden mislukt: bestand niet gevonden</string>
   <string name="download_failed_could_not_connect">Downloaden mislukt: kon geen verbinding maken met host</string>
@@ -502,6 +505,8 @@
   <string name="pref_away_when_screen_off_summary">Stelt je bron in als even weg wanneer het scherm uitgeschakeld is</string>
   <string name="pref_xa_on_silent_mode">Niet beschikbaar in stille modus</string>
   <string name="pref_xa_on_silent_mode_summary">Stelt je bron in als niet beschikbaar wanneer je apparaat in stille modus staat</string>
+  <string name="pref_treat_vibrate_as_silent">Trillen behandelen als stille modus</string>
+  <string name="pref_treat_vibrate_as_silent_summary">Stelt je bron in als niet beschikbaar wanneer je apparaat in trilmodus staat</string>
   <string name="pref_show_connection_options">Uitgebreide verbindingsinstellingen</string>
   <string name="pref_show_connection_options_summary">Toon hostnaam- en poortinstellingen bij instellen van een account</string>
   <string name="hostname_example">xmpp.voorbeeld.be</string>
@@ -565,4 +570,7 @@
   <string name="this_field_is_required">Dit veld is vereist</string>
   <string name="correct_message">Bericht verbeteren</string>
   <string name="send_corrected_message">Verbeterd bericht sturen</string>
+  <string name="no_keys_just_confirm">Je vertrouwt dit contact al. Door \'klaar\' te kiezen bevestig je enkel dat %s deel uitmaakt van dit groepsgesprek.</string>
+  <string name="select_image_and_crop">Afbeelding kiezen en bijsnijden</string>
+  <string name="this_account_is_disabled">Je hebt deze account uitgeschakeld</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 2a9e3135d..15bd09554 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -96,12 +96,12 @@
   <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>Odebrano zaszyfrowaną wiadomość. Dotknij by odszyfrować</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>
   <string name="pref_accept_files">Akceptuj pliki</string>
   <string name="pref_accept_files_summary">Automatycznie akceptuj pliki mniejsze niż...</string>
+  <string name="pref_notification_settings">Powiadomienie</string>
   <string name="pref_notifications">Powiadomienia</string>
   <string name="pref_notifications_summary">Powiadamiaj, gdy nadejdzie wiadomość</string>
   <string name="pref_vibrate">Wibracje</string>
@@ -110,10 +110,12 @@
   <string name="pref_sound_summary">Odtwórz dźwięk z powiadomieniem</string>
   <string name="pref_notification_grace_period">Opóźnienie powiadomień</string>
   <string name="pref_notification_grace_period_summary">Wyłącz powiadomienia przez krótki czas po otrzymaniu kopii wiadomości</string>
+  <string name="pref_advanced_options">Zaawansowane</string>
   <string name="pref_never_send_crash">Nie wysyłaj raportów awarii</string>
   <string name="pref_never_send_crash_summary">Wysyłając ślady stosu pomagasz rozwijać Conversations</string>
   <string name="pref_confirm_messages">Potwierdzenia wiadomości</string>
   <string name="pref_confirm_messages_summary">Powiadamiaj kontakty o otrzymaniu lub przeczytaniu wiadomości</string>
+  <string name="pref_ui_options">UI</string>
   <string name="openpgp_error">Wystąpił błąd OpenKeychain</string>
   <string name="error_decrypting_file">Błąd podczas deszyfrowania pliku</string>
   <string name="accept">Akceptuj</string>
@@ -188,6 +190,7 @@
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
   <string name="server_info_pep">XEP-0163: PEP (Awatary / OMEMO)</string>
   <string name="server_info_http_upload">XEP-0363: Przesyłanie plików przez HTTP</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">dostępny</string>
   <string name="server_info_unavailable">niedostępny</string>
   <string name="missing_public_keys">Brak informacji o kluczu publicznym</string>
@@ -236,7 +239,7 @@
   <string name="bookmark_already_exists">Zakładka już istnieje</string>
   <string name="you">Ty</string>
   <string name="action_edit_subject">Edytuj temat konferencji</string>
-  <string name="conference_not_found">Nie znaleziono konferencji</string>
+  <string name="joining_conference">Dołączenie do konferencji...</string>
   <string name="leave">Opuść pokój</string>
   <string name="contact_added_you">Kontakt został dodany do listy</string>
   <string name="add_back">Dodaj ponownie</string>
@@ -271,10 +274,14 @@
   <string name="sure_delete_fingerprint">Czy na pewno chcesz usunąć odcisk klucza?</string>
   <string name="ignore">Ignoruj</string>
   <string name="without_mutual_presence_updates"><b>Uwaga:</b> Wysyłanie bez obustronnych powiadomień o obecności może powodować nieoczekiwane problemy.\n\n<small>Sprawdź subskrypcję powiadomień w szczegółach kontaktu.</small></string>
+  <string name="pref_security_settings">Bezpieczeństwo</string>
   <string name="pref_force_encryption">Wymuszaj szyfrowanie typu end-to-end</string>
   <string name="pref_force_encryption_summary">Szyfruj wszystkie wiadomości (poza konferencjami)</string>
+  <string name="pref_allow_message_correction">Pozwól na poprawianie wiadomości</string>
+  <string name="pref_allow_message_correction_summary">Pozwól swoim kontaktom poprawiać wiadomości</string>
   <string name="pref_dont_save_encrypted">Nie zapisuj zaszyfrowanych wiadomości</string>
   <string name="pref_dont_save_encrypted_summary">Uwaga: Może powodować utratę wiadomości</string>
+  <string name="pref_expert_options">Ustawienia zaawansowane</string>
   <string name="pref_expert_options_summary">Modyfikuj ustawienia ostrożnie</string>
   <string name="title_activity_about">O Conversations</string>
   <string name="pref_about_conversations_summary">Informacje o kompilacji i licencji</string>
@@ -292,11 +299,15 @@
   <string name="pref_expert_options_other">Inne opcje</string>
   <string name="pref_conference_name">Nazwa konferencji</string>
   <string name="pref_conference_name_summary">Nazywaj konferencję tematem zamiast Jabber ID</string>
+  <string name="pref_autojoin">Automatycznie dołączaj do konferencji</string>
+  <string name="pref_autojoin_summary">Respektuj flagi autodołączania i zakładkach konferencji</string>
   <string name="toast_message_otr_fingerprint">Odcisk klucza OTR został skopiowany do schowka</string>
   <string name="toast_message_omemo_fingerprint">Odcisk klucza OMEMO został skopiowany do schowka!</string>
   <string name="conference_banned">Zbanowano cię w konferencji</string>
   <string name="conference_members_only">To jest zamknięty pokój</string>
   <string name="conference_kicked">Wyrzucono cię z konferencji</string>
+  <string name="conference_shutdown">Konferencję zamknięto</string>
+  <string name="conference_unknown_error">Nie uczestniczysz już w tej konferencji</string>
   <string name="using_account">używając konta %s</string>
   <string name="checking_x">Sprawdzanie %s na hoście HTTP</string>
   <string name="not_connected_try_again">Brak połączenia. Spróbuj ponownie później</string>
@@ -480,6 +491,8 @@
   <string name="username">Nazwa użytkownika</string>
   <string name="username_hint">Nazwa użytkownika</string>
   <string name="invalid_username">Błędna nazwa użytkownika</string>
+  <string name="conference_name">Nazwa konferencji</string>
+  <string name="invalid_conference_name">Nie jest to poprawna nazwa konferencji</string>
   <string name="download_failed_server_not_found">Pobieranie nieudane: Nie odnaleziono serwera</string>
   <string name="download_failed_file_not_found">Pobieranie nieudane: Nie odnaleziono pliku</string>
   <string name="download_failed_could_not_connect">Pobieranie nieudane: Nie można połączyć z hostem</string>
@@ -487,13 +500,21 @@
   <string name="pref_use_white_background_summary">Pokazuj otrzymane wiadomości jako czarny tekst na białym tle</string>
   <string name="account_status_tor_unavailable">Sieć TOR jest niedostepna</string>
   <string name="server_info_broken">Zepsute</string>
+  <string name="pref_presence_settings">Obecność</string>
   <string name="pref_away_when_screen_off">Status \"Oddalony\" gdy wyświetlacz jest wyłączony</string>
   <string name="pref_away_when_screen_off_summary">Oznacza Twój zasób jako \"Oddalony\", gdy wyświetlacz jest wyłączony</string>
   <string name="pref_xa_on_silent_mode">Niedostepne w trybie cichym</string>
   <string name="pref_xa_on_silent_mode_summary">Oznacza Twój zasób jako \"Nieobecny\" gdy urządzenie jest w trybie cichym</string>
+  <string name="pref_show_connection_options">Rozszerzone ustawienia połączenia</string>
+  <string name="pref_show_connection_options_summary">Pokaż nazwę hosta i ustawienia portu przy dodawaniu konta</string>
+  <string name="hostname_example">xmpp.examle.com</string>
   <string name="action_add_account_with_certificate">Dodaj konto za pomocą certyfikatu</string>
   <string name="unable_to_parse_certificate">Nie mogę odczytać certyfikatu</string>
   <string name="authenticate_with_certificate">Pozostaw puste by autoryzować za pomocą certyfikatu</string>
+  <string name="mam_prefs">Preferencje archiwizacji</string>
+  <string name="server_side_mam_prefs">Preferencje archiwizacji po stronie serwera</string>
+  <string name="fetching_mam_prefs">Pobieranie preferencji archiwizacji. Proszę czekać...</string>
+  <string name="unable_to_fetch_mam_prefs">Nie można pobrać preferencji archiwizacji</string>
   <string name="captcha_ocr">Captcha</string>
   <string name="captcha_required">Captcha wymagana</string>
   <string name="captcha_hint">przepisz tekst z obrazka</string>
@@ -503,6 +524,7 @@
   <string name="error_fetching_omemo_key">Błąd pobierania klucza OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Zweryfikowano klucz OMEMO z certyfikatem</string>
   <string name="device_does_not_support_certificates">Twoje urządzenie nie wspiera wyboru certyfikatów klienckich</string>
+  <string name="pref_connection_options">Połączenie</string>
   <string name="pref_use_tor">Połącz przez sieć TOR</string>
   <string name="pref_use_tor_summary">Tuneluj wszystkie połączenia przez sieć TOR. Wymaga zainstalowania aplikacji \"Orbot\"</string>
   <string name="account_settings_hostname">Nazwa hosta</string>
@@ -516,6 +538,7 @@
     <item quantity="few">%d wiadomości</item>
     <item quantity="other">%d wiadomości</item>
   </plurals>
+  <string name="load_more_messages">Załaduj wiecej wiadomości</string>
   <string name="shared_file_with_x">Dzielony plik z %s</string>
   <string name="shared_image_with_x">Dzielony obraz z %s</string>
   <string name="no_storage_permission">Conversations potrzebuje dostęp do zewnętrznego magazynu</string>
@@ -526,6 +549,7 @@
   <string name="certificate_issuer">Wystawca</string>
   <string name="certificate_cn">Nazwa</string>
   <string name="certificate_o">Organizacja</string>
+  <string name="certificate_sha1">SHA-1</string>
   <string name="certicate_info_not_available">(Niedostępne)</string>
   <string name="certificate_not_found">Nie znaleziono certyfikatu</string>
   <string name="notify_on_all_messages">Powiadom o wszystkich wiadomościach</string>
@@ -533,6 +557,7 @@
   <string name="notify_never">Powiadomienia wyłączone</string>
   <string name="notify_paused">Powiadomienia wstrzymane</string>
   <string name="pref_picture_compression">Kompresuj obrazki</string>
+  <string name="pref_picture_compression_summary">Zmień rozmiar i kompresuj obrazki</string>
   <string name="always">Zawsze</string>
   <string name="automatically">Automatycznie</string>
   <string name="battery_optimizations_enabled">Optymalizacje zużycia baterii włączone</string>
@@ -540,4 +565,8 @@
   <string name="battery_optimizations_enabled_dialog">Twoje urządzenie wykonuje poważnie optymalizacje zużycia baterii przez Conversations, które mogą powodować opóźnienie powiadomień lub nawet utratę wiadomości.\nZostaniesz teraz poproszony o ich wyłączenie</string>
   <string name="disable">Wyłącz</string>
   <string name="selection_too_large">Zaznaczony obszar jest zbyt duży</string>
+  <string name="no_accounts">(Brak aktywynych kont)</string>
+  <string name="this_field_is_required">To pole jest wymagane</string>
+  <string name="correct_message">Popraw wiadomość</string>
+  <string name="send_corrected_message">Wyślij poprawioną wiadomość</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 368e17fae..19d25d5d5 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -96,7 +96,6 @@
   <string name="contact_has_no_pgp_key">O Conversations não conseguiu criptografar suas mensagens porque o seu contato não está anunciando a chave pública dele(a).\n\n<small>Por favor, solicite ao seu contato para configurar o OpenPGP.</small></string>
   <string name="no_pgp_keys">Não foi encontrada nenhuma chave OpenPGP</string>
   <string name="contacts_have_no_pgp_keys">O Conversations não conseguiu criptografar suas mensagens porque os seus contatos não estão anunciando a chave pública deles(as).\n\n<small>Por favor, solicite aos seus contatos que configurem o OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Foi recebida uma mensagem criptografada. Toque para descriptografar.</i></string>
   <string name="pref_general">Geral</string>
   <string name="pref_xmpp_resource">Recurso XMPP</string>
   <string name="pref_xmpp_resource_summary">O nome pelo qual esse cliente se identifica</string>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Esse favorito já existe</string>
   <string name="you">Você</string>
   <string name="action_edit_subject">Editar o assunto da conferência</string>
-  <string name="conference_not_found">A conferência não foi encontrada</string>
-  <string name="conference_unknown_error">Foi recebido um erro desconhecido</string>
+  <string name="joining_conference">Entrando na conferência...</string>
   <string name="leave">Sair</string>
   <string name="contact_added_you">O contato foi adicionado à sua lista de contatos</string>
   <string name="add_back">Adicionar novamente</string>
@@ -308,6 +306,8 @@
   <string name="conference_banned">Você foi banido dessa conferência</string>
   <string name="conference_members_only">Essa conferência é restrita a seus membros</string>
   <string name="conference_kicked">Você foi expulso dessa conferência</string>
+  <string name="conference_shutdown">A conferência foi encerrada</string>
+  <string name="conference_unknown_error">Você não está mais participando dessa conferência</string>
   <string name="using_account">usando a conta %s</string>
   <string name="checking_x">Verificando %s no host HTTP</string>
   <string name="not_connected_try_again">Você não está conectado. Tente novamente mais tarde.</string>
@@ -490,6 +490,8 @@
   <string name="username">Nome de usuário</string>
   <string name="username_hint">Nome de usuário</string>
   <string name="invalid_username">Esse não é um nome de usuário válido</string>
+  <string name="conference_name">Nome da conferência</string>
+  <string name="invalid_conference_name">Esse nome de conferência não é válido</string>
   <string name="download_failed_server_not_found">Não foi possível fazer o download: servidor não encontrado</string>
   <string name="download_failed_file_not_found">Não foi possível fazer o download: arquivo não encontrado</string>
   <string name="download_failed_could_not_connect">Não foi possível fazer o download: não foi possível conectar ao host</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 30265948b..4164ca719 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -195,7 +195,6 @@
   <string name="bookmark_already_exists">O favorito já existe</string>
   <string name="you">Você</string>
   <string name="action_edit_subject">Editar o assunto da conferência</string>
-  <string name="conference_not_found">Conferência não encontrada</string>
   <string name="leave">Sair</string>
   <string name="contact_added_you">Contato adicionado à sua lista de contato</string>
   <string name="add_back">Adicionar novamente</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index afcf90e0b..35a608721 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -96,7 +96,6 @@
   <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">Nume client XMPP</string>
   <string name="pref_xmpp_resource_summary">Numele cu care acest client se identifica</string>
@@ -240,8 +239,7 @@
   <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="conference_unknown_error">A fost primita o eroare necunoscuta</string>
+  <string name="joining_conference">Alatura-te conferintei</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>
@@ -308,10 +306,13 @@
   <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="conference_shutdown">Conferinta a fost inchisa</string>
+  <string name="conference_unknown_error">Nu mai participi la aceasta 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="check_x_filesize_on_host">Verifica marimea %1$s pe %2$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>
@@ -492,6 +493,8 @@
   <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="conference_name">Titlu conferinta</string>
+  <string name="invalid_conference_name">Acesta nu este un nume de conferinta 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>
@@ -501,9 +504,11 @@
   <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 clientul drept plecat cand ecranul este oprit</string>
+  <string name="pref_away_when_screen_off_summary">Declara clientul drept plecat 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">Declara clientul drept indisponibil atunci cand dispozitivul este in mod silentios</string>
+  <string name="pref_treat_vibrate_as_silent">Trateaza modul vibratie ca silentios</string>
+  <string name="pref_treat_vibrate_as_silent_summary">Declara clientul drept indisponibil atunci cand dispozitivul este in mod vibratie</string>
   <string name="pref_show_connection_options">Optiuni avansate conexiune</string>
   <string name="pref_show_connection_options_summary">Arata optiunea de setare a numelui de gazda si a portului atunci cand se configureaza un cont</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -569,4 +574,7 @@ Emitent</string>
   <string name="this_field_is_required">Acest camp este obligatoriu</string>
   <string name="correct_message">Corectie mesaj</string>
   <string name="send_corrected_message">Trimite text corectat</string>
+  <string name="no_keys_just_confirm">Deja ai incredere in acest contact. Selectand \'gata\' doar confirmi ca %s ia parte la conferinta.</string>
+  <string name="select_image_and_crop">Selecteaza imaginea si decupeaza</string>
+  <string name="this_account_is_disabled">Ai dezactivat acest cont</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 01cdbcdd2..5ed84b7b3 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -96,7 +96,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>
@@ -236,7 +235,6 @@
   <string name="bookmark_already_exists">Такая закладка уже существует</string>
   <string name="you">Вы</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>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index ce99da94e..414fdf69f 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -224,7 +224,6 @@
   <string name="bookmark_already_exists">Táto záložka už existuje</string>
   <string name="you">Ty</string>
   <string name="action_edit_subject">Upraviť meno skupinovej konverzácie</string>
-  <string name="conference_not_found">Skupinová konverzácia sa nenašla</string>
   <string name="leave">Odísť</string>
   <string name="contact_added_you">Kontakt pridaný do zoznamu</string>
   <string name="add_back">Znova pridať</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 2be86f05a..bf816ba20 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -62,8 +62,8 @@
   <string name="crash_report_message">Слањем контратрага помажете текући развој Конверзације\n<b>Упозорење:</b> Ово ће да искористи ваш ИксМПП налог за слање контратрага програмеру.</string>
   <string name="send_now">Пошаљи одмах</string>
   <string name="send_never">Не питај више</string>
-  <string name="problem_connecting_to_account">Не могу да се повежем са налогом</string>
-  <string name="problem_connecting_to_accounts">Не могу да се повежем са више налога</string>
+  <string name="problem_connecting_to_account">Не могох да се повежем са налогом</string>
+  <string name="problem_connecting_to_accounts">Не могох да се повежем са више налога</string>
   <string name="touch_to_fix">Тапните овде да бисте управљали вашим налозима</string>
   <string name="attach_file">Приложи фајл</string>
   <string name="not_in_roster">Контакт није на вашем списку контаката. Желите ли да га додате?</string>
@@ -96,12 +96,12 @@
   <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>
   <string name="pref_accept_files">Прихватај фајлове</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>
   <string name="pref_vibrate">Вибрирај</string>
@@ -110,10 +110,12 @@
   <string name="pref_sound_summary">Звуци обавештења</string>
   <string name="pref_notification_grace_period">Период одгоде обавештења</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>
   <string name="pref_confirm_messages">Потврди поруке</string>
   <string name="pref_confirm_messages_summary">Обзнаните контакту кад примите и прочитате поруку</string>
+  <string name="pref_ui_options">Сучеље</string>
   <string name="openpgp_error">Отворени кључарник је пријавио грешку</string>
   <string name="error_decrypting_file">У/И грешка дешифровања фајла</string>
   <string name="accept">Прихвати</string>
@@ -188,6 +190,7 @@
   <string name="server_info_stream_management">XEP-0198: менаџмент тока</string>
   <string name="server_info_pep">XEP-0163: PEP (аватари/ОМЕМО)</string>
   <string name="server_info_http_upload">XEP-0363: ХТТП отпремање фајлова</string>
+  <string name="server_info_push">XEP-0357: „push“</string>
   <string name="server_info_available">доступан</string>
   <string name="server_info_unavailable">недоступан</string>
   <string name="missing_public_keys">Недостају објаве јавног кључа</string>
@@ -236,8 +239,7 @@
   <string name="bookmark_already_exists">Овај обележивач већ постоји</string>
   <string name="you">Ви</string>
   <string name="action_edit_subject">Уреди предмет групног ћаскања</string>
-  <string name="conference_not_found">Групно ћаскање није нађено</string>
-  <string name="conference_unknown_error">Примљена је непозната грешка</string>
+  <string name="joining_conference">Придружујем се групном ћаскању…</string>
   <string name="leave">Напусти</string>
   <string name="contact_added_you">Контакт вас је додао на списак контаката</string>
   <string name="add_back">Додај га</string>
@@ -272,10 +274,14 @@
   <string name="sure_delete_fingerprint">Желите ли заиста да обришете овај отисак?</string>
   <string name="ignore">Занемари</string>
   <string name="without_mutual_presence_updates"><b>Упозорење:</b> Слање овога без узајамних ажурирања присутности би могло да узрокује неочекиване проблеме.\n\n<small>Идите на детаље контакта да бисте проверили претплате на присутности.</small></string>
+  <string name="pref_security_settings">Безбедност</string>
   <string name="pref_force_encryption">Присили крај-на-крај шифровање</string>
   <string name="pref_force_encryption_summary">Увек шифруј поруке (осим за групна ћаскања)</string>
+  <string name="pref_allow_message_correction">Дозволи исправљање порука</string>
+  <string name="pref_allow_message_correction_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_summary">Будите пажљиви са овим</string>
   <string name="title_activity_about">О Конверзацији</string>
   <string name="pref_about_conversations_summary">Подаци о издању и лиценци</string>
@@ -293,15 +299,20 @@
   <string name="pref_expert_options_other">Остало</string>
   <string name="pref_conference_name">Назив групног ћаскања</string>
   <string name="pref_conference_name_summary">Предмет собе уместо ЈИД-а идентификује групно ћаскање</string>
+  <string name="pref_autojoin">Аутоматски ме придружуј групним ћаскањима</string>
+  <string name="pref_autojoin_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_shutdown">Групно ћаскање је угашено</string>
+  <string name="conference_unknown_error">Више нисте у овом групном ћаскању</string>
   <string name="using_account">преко налога %s</string>
   <string name="checking_x">Проверавам %s на ХТТП домаћину</string>
   <string name="not_connected_try_again">Нисте повезани. Покушајте поново касније</string>
   <string name="check_x_filesize">Провери величину %s</string>
+  <string name="check_x_filesize_on_host">Провери величину %1$s na %2$s</string>
   <string name="message_options">Опције поруке</string>
   <string name="copy_text">Копирај текст</string>
   <string name="copy_original_url">Копирај изворни УРЛ</string>
@@ -423,6 +434,7 @@
   <string name="two_hours">2 сата</string>
   <string name="eight_hours">8 сати</string>
   <string name="until_further_notice">до даљњег</string>
+  <string name="pref_input_options">Унос</string>
   <string name="pref_enter_is_send">Ентер шаље</string>
   <string name="pref_enter_is_send_summary">Користи Ентер тастер за слање порука</string>
   <string name="pref_display_enter_key">Прикажи Ентер тастер</string>
@@ -481,6 +493,8 @@
   <string name="username">Корисничко име</string>
   <string name="username_hint">Корисничко име</string>
   <string name="invalid_username">Ово није исправно корисничко име</string>
+  <string name="conference_name">Назив групног ћаскања</string>
+  <string name="invalid_conference_name">Ово није исправан назив за групно ћаскање</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>
@@ -488,14 +502,23 @@
   <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>
-  <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="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="pref_treat_vibrate_as_silent">Вибрација је нечујни режим</string>
+  <string name="pref_treat_vibrate_as_silent_summary">Означавање вашег ресурса недоступним кад је уређај у режиму вибрирања</string>
+  <string name="pref_show_connection_options">Проширене поставке повезивања</string>
+  <string name="pref_show_connection_options_summary">Приказ домаћина и порта у поставкама налога</string>
   <string name="hostname_example">xmpp.primer.com</string>
   <string name="action_add_account_with_certificate">Додај налог сертификатом</string>
-  <string name="unable_to_parse_certificate">Не могу да рашчланим сертификат</string>
+  <string name="unable_to_parse_certificate">Не могох да рашчланим сертификат</string>
   <string name="authenticate_with_certificate">Оставите празно за аутентификацију сертификатом</string>
+  <string name="mam_prefs">Поставке архивисања</string>
+  <string name="server_side_mam_prefs">Серверске поставке архивисања</string>
+  <string name="fetching_mam_prefs">Добављам поставке архивисања, сачекајте…</string>
+  <string name="unable_to_fetch_mam_prefs">Не могох да добавим поставке архивисања</string>
   <string name="captcha_ocr">Текст стопке</string>
   <string name="captcha_required">Потребна стопка</string>
   <string name="captcha_hint">унесите текст са слике</string>
@@ -505,6 +528,7 @@
   <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>
@@ -529,6 +553,7 @@
   <string name="certificate_issuer">Издавач</string>
   <string name="certificate_cn">Заједничко име</string>
   <string name="certificate_o">Организација</string>
+  <string name="certificate_sha1">СХА-1</string>
   <string name="certicate_info_not_available">(није доступно)</string>
   <string name="certificate_not_found">Сертификат није нађен</string>
   <string name="notify_on_all_messages">Обавештења за све поруке</string>
@@ -536,6 +561,7 @@
   <string name="notify_never">Обавештења искључена</string>
   <string name="notify_paused">Обавештења паузирана</string>
   <string name="pref_picture_compression">Компресуј слике</string>
+  <string name="pref_picture_compression_summary">Промена величине и компресовање слика</string>
   <string name="always">увек</string>
   <string name="automatically">аутоматски</string>
   <string name="battery_optimizations_enabled">Оптимизација батерије је укључена</string>
@@ -545,4 +571,9 @@
   <string name="selection_too_large">Назначена површина је превелика</string>
   <string name="no_accounts">(Нема активираних налога)</string>
   <string name="this_field_is_required">Ово поље је захтевано</string>
+  <string name="correct_message">Исправи поруку</string>
+  <string name="send_corrected_message">Пошаљи исправљену поруку</string>
+  <string name="no_keys_just_confirm">Већ се поуздате у овог контакта. Избором „Готово“ само потврђујете да је %s део овог групног ћаскања.</string>
+  <string name="select_image_and_crop">Изабери слику и опсеци</string>
+  <string name="this_account_is_disabled">Искључили сте овај налог</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index c1feeaab0..ee6a46ae0 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -96,7 +96,6 @@
   <string name="contact_has_no_pgp_key">Conversations kan inte kryptera 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 kryptera 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 klienten identifierar sig med</string>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Detta bokmärke finns redan</string>
   <string name="you">Du</string>
   <string name="action_edit_subject">Ändra konferensämne</string>
-  <string name="conference_not_found">Konferens hittades inte</string>
-  <string name="conference_unknown_error">Mottog okänt fel</string>
+  <string name="joining_conference">Går med i konferens...</string>
   <string name="leave">Lämna</string>
   <string name="contact_added_you">Kontakten lade till dig i sin kontaktlista</string>
   <string name="add_back">Addera tillbaka</string>
@@ -308,10 +306,13 @@
   <string name="conference_banned">Du är bannlyst från denna konferens</string>
   <string name="conference_members_only">Medlemsskap krävs för denna konferens</string>
   <string name="conference_kicked">Du har blivit utsparkad från denna konferens</string>
+  <string name="conference_shutdown">Konferensen stängdes ner</string>
+  <string name="conference_unknown_error">Du är inte längre med i denna konferens</string>
   <string name="using_account">använder konto %s</string>
   <string name="checking_x">Kontrollerar %s på webbserver</string>
   <string name="not_connected_try_again">Du är inte ansluten. Försök igen senare</string>
-  <string name="check_x_filesize">Kontrollera storleken på %s</string>
+  <string name="check_x_filesize">Kontrollera filstorleken på %s</string>
+  <string name="check_x_filesize_on_host">Kontrollera filstorlek för %1$s på %2$s</string>
   <string name="message_options">Meddelandealternativ</string>
   <string name="copy_text">Kopiera text</string>
   <string name="copy_original_url">Kopiera orginal-URL</string>
@@ -490,6 +491,8 @@
   <string name="username">Användarnamn</string>
   <string name="username_hint">Användarnamn</string>
   <string name="invalid_username">Inte ett giltigt användanamn</string>
+  <string name="conference_name">Konferensnamn</string>
+  <string name="invalid_conference_name">Detta är inte ett giltigt konferensnamn</string>
   <string name="download_failed_server_not_found">Nerladdning gick fel: Server hittades inte</string>
   <string name="download_failed_file_not_found">Nerladdning gick fel: Filen hittades inte</string>
   <string name="download_failed_could_not_connect">Nerladdningen gick fel: Kunder inte ansluta till server</string>
@@ -502,6 +505,8 @@
   <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="pref_treat_vibrate_as_silent">Hantera vibrationsläge som tyst läge</string>
+  <string name="pref_treat_vibrate_as_silent_summary">Sätter din tillgänglighet till ej tillgänglig när enheten är i vibratorläge</string>
   <string name="pref_show_connection_options">Utökade anslutningsinställningar</string>
   <string name="pref_show_connection_options_summary">Visa val av servernamn och port vid inställning av konto</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -565,4 +570,7 @@
   <string name="this_field_is_required">Detta fält måste fyllas i</string>
   <string name="correct_message">Korrigera meddelanden</string>
   <string name="send_corrected_message">Skicka korrigerat meddelande</string>
+  <string name="no_keys_just_confirm">Du litar redan på denna kontakt. Genom att välja \'klar\' bekräftar du att %s är med i denna konferens.</string>
+  <string name="select_image_and_crop">Välj bild och beskär</string>
+  <string name="this_account_is_disabled">Du har deaktiverat detta konto</string>
 </resources>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 2a674290f..2d434f039 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -96,7 +96,6 @@
   <string name="contact_has_no_pgp_key">Kişi ortak anahtarını yayınlamadığı için Conversations iletilerinizi şifreleyemiyor.\n\n<small>Lütfen kişiden OpenPGP’yi ayarlamasını isteyin.</small></string>
   <string name="no_pgp_keys">Herhangi bir OpenPGP anahtarı bulunamadı</string>
   <string name="contacts_have_no_pgp_keys">Kişiler ortak anahtarlarını yayınlamadığı için Conversations iletilerinizi şifreleyemiyor.\n\n<small>Lütfen kişilerden OpenPGP’yi ayarlamalarını isteyin.</small></string>
-  <string name="encrypted_message_received"><i>Şifreli ileti alındı. Deşifre etmek için dokunun.</i></string>
   <string name="pref_general">Genel</string>
   <string name="pref_xmpp_resource">XMPP kaynağı</string>
   <string name="pref_xmpp_resource_summary">İstemci kimliği</string>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">Bu yer imi zaten mevcut</string>
   <string name="you">Siz</string>
   <string name="action_edit_subject">Grup sohbet konusunu düzenle</string>
-  <string name="conference_not_found">Grup sohbet bulunamadı</string>
-  <string name="conference_unknown_error">Bilinmeyen hata alındı</string>
+  <string name="joining_conference">Grup sohbete katiliyor</string>
   <string name="leave">Ayrıl</string>
   <string name="contact_added_you">Kişi sizi listesine ekledi</string>
   <string name="add_back">Siz de ekleyin</string>
@@ -308,10 +306,13 @@
   <string name="conference_banned">Grup sohbetinden atıldınız</string>
   <string name="conference_members_only">Bu grup sohbet sadece üyelere açıktır</string>
   <string name="conference_kicked">Grup sohbetinden atıldınız</string>
+  <string name="conference_shutdown">Grup sohbet sona erdi</string>
+  <string name="conference_unknown_error">Artık bu grup sohbet içerisinde değilsiniz.</string>
   <string name="using_account">%s hesabını kullanarak</string>
   <string name="checking_x">HTTP sunucusundaki %s \'leri kontrol ediyor</string>
   <string name="not_connected_try_again">Bağlı değilsiniz. Daha sonra yeniden deneyin</string>
   <string name="check_x_filesize">%s boyutunu kontrol edin</string>
+  <string name="check_x_filesize_on_host">%2$s üzerindeki %1$s boyutunu kontrol edin</string>
   <string name="message_options">İleti seçenekleri</string>
   <string name="copy_text">Metni kopyala</string>
   <string name="copy_original_url">Orijinal URL\'i kopyala</string>
@@ -488,6 +489,8 @@
   <string name="username">Kullanıcı adı</string>
   <string name="username_hint">Kullanıcı adı</string>
   <string name="invalid_username">Kullanıcı adı geçerli değil</string>
+  <string name="conference_name">Grup sohbet ismi</string>
+  <string name="invalid_conference_name">Bu grup sohbet adı geçerli değil</string>
   <string name="download_failed_server_not_found">İndirme başarısız: Sunucu bulunamadı</string>
   <string name="download_failed_file_not_found">İndirme başarısız: Dosya bulunamadı</string>
   <string name="download_failed_could_not_connect">İndirme başarısız: Sunucuya bağlanılamadı</string>
@@ -500,6 +503,8 @@
   <string name="pref_away_when_screen_off_summary">Ekran kapandığında çevrimiçi durum bildiriminizi uzakta olarak değiştirir</string>
   <string name="pref_xa_on_silent_mode">Sessiz moddayken erişilemez</string>
   <string name="pref_xa_on_silent_mode_summary">Telefonunuz sessizdeyken, durum bildiriminizi müsait değil olarak değiştirir</string>
+  <string name="pref_treat_vibrate_as_silent">titreş modunu sessiz mod olarak değerlendir</string>
+  <string name="pref_treat_vibrate_as_silent_summary">cihazınız titreşim modundaysa durum bildiriminizi müsahit değil olarak değiştirir</string>
   <string name="pref_show_connection_options">Genişletilmiş bağlantı seçenekleri</string>
   <string name="pref_show_connection_options_summary">Hesap oluştururken sunucu adıyla port seçeneğini göster</string>
   <string name="hostname_example">xmpp.ornek.com</string>
@@ -562,4 +567,7 @@
   <string name="this_field_is_required">Bu alan zorunludur</string>
   <string name="correct_message">ileti düzelt</string>
   <string name="send_corrected_message">Düzeltilmiş iletiyi gönder</string>
+  <string name="no_keys_just_confirm">Bu kişiye zaten güveniyor durumdasınız. \"tamam\" seçeneğini işaretleyerek, sadece %s \'in bu grup sohbete katılabileceğini teyid ediyorsunuz.</string>
+  <string name="select_image_and_crop">Resmi seçip kırpın</string>
+  <string name="this_account_is_disabled">Bu hesabı devre dışı bıraktınız</string>
 </resources>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 2d7511d61..935e6fa32 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -96,7 +96,6 @@
   <string name="contact_has_no_pgp_key">Conversations không thể mã hoá tin nhắn vì liên hệ của bạn không thông báo khoá công cộng của anh/chị ấy.\n\n<small>Hãy yêu cầu liên hệ đó cài đặt OpenPGP.</small></string>
   <string name="no_pgp_keys">Không tìm thấy các khoá OpenPGP</string>
   <string name="contacts_have_no_pgp_keys">Conversations không thể mã hoá tin nhắn vì các liên hệ của bạn không thông báo khoá công cộng của họ.\n\n<small>Hãy yêu cầu họ cài đặt OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>Đã nhận tin nhắn được mã hoá. Chạm để giải mã.</i></string>
   <string name="pref_general">Tổng quan</string>
   <string name="pref_xmpp_resource">Ứng dụng XMPP</string>
   <string name="pref_xmpp_resource_summary">Tên của máy trạm này được tự đặt là</string>
@@ -236,7 +235,6 @@
   <string name="bookmark_already_exists">Đã có đánh dấu này rồi</string>
   <string name="you">Bạn</string>
   <string name="action_edit_subject">Chỉnh sửa tiêu đề diễn đàn</string>
-  <string name="conference_not_found">Không tìm thấy diễn đàn</string>
   <string name="leave">Rời khỏi</string>
   <string name="contact_added_you">Liên hệ đã thêm bạn vào danh bạ</string>
   <string name="add_back">Thêm họ vào</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 5ed64ed5c..8c7705379 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -96,7 +96,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>
@@ -240,8 +239,7 @@
   <string name="bookmark_already_exists">该书签已存在</string>
   <string name="you">你</string>
   <string name="action_edit_subject">编辑讨论组主题</string>
-  <string name="conference_not_found">讨论组未找到</string>
-  <string name="conference_unknown_error">收到未知错误</string>
+  <string name="joining_conference">加入讨论组…</string>
   <string name="leave">离开</string>
   <string name="contact_added_you">联系人已添加你到联系人列表</string>
   <string name="add_back">反向添加</string>
@@ -308,10 +306,13 @@
   <string name="conference_banned">你被此讨论组屏蔽</string>
   <string name="conference_members_only">此讨论组只允许成员加入</string>
   <string name="conference_kicked">你被从此讨论组踢出</string>
+  <string name="conference_shutdown">讨论组已被关闭</string>
+  <string name="conference_unknown_error">你已不属于此讨论组</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="check_x_filesize_on_host">在 %2$s 上检查 %1$s 的大小</string>
   <string name="message_options">消息选项</string>
   <string name="copy_text">拷贝文本</string>
   <string name="copy_original_url">拷贝原始URL</string>
@@ -488,6 +489,8 @@
   <string name="username">用户名</string>
   <string name="username_hint">用户名</string>
   <string name="invalid_username">该用户名无效</string>
+  <string name="conference_name">讨论组名称</string>
+  <string name="invalid_conference_name">该讨论组名称无效</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>
@@ -500,6 +503,8 @@
   <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="pref_treat_vibrate_as_silent">静音模式开启振动</string>
+  <string name="pref_treat_vibrate_as_silent_summary">当设备进入振动模式时把资源标识改为不可用</string>
   <string name="pref_show_connection_options">高级边接设置</string>
   <string name="pref_show_connection_options_summary">注册账户时显示主机名和端口</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -564,4 +569,7 @@
   <string name="this_field_is_required">必填</string>
   <string name="correct_message">更正消息</string>
   <string name="send_corrected_message">发送更正后的消息</string>
+  <string name="no_keys_just_confirm">你已信任此联系人。选择“完成”表示 %s 将成为此讨论组的一部分。</string>
+  <string name="select_image_and_crop">选择照片并裁剪</string>
+  <string name="this_account_is_disabled">你已经禁用了此账户</string>
 </resources>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index ce80073b6..952035f34 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -186,7 +186,6 @@
   <string name="bookmark_already_exists">該書籤已存在</string>
   <string name="you">你</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>