diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 868ea5e24..d7cd734a1 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -283,6 +283,7 @@
   <string name="conference_requires_password">Беседата изисква парола</string>
   <string name="enter_password">Въведете парола</string>
   <string name="missing_presence_updates">Липсват актуализации за присъствието на контакта</string>
+  <string name="missing_presence_subscription">Липсва абонамент за присъствието</string>
   <string name="request_presence_updates">Моля, първо помолете контакта за актуализации на присъствието му.\n\n<small>Това ще бъде използвано, за да се провери какъв клиент (или клиенти) използва контакта.</small></string>
   <string name="request_now">Поискване сега</string>
   <string name="delete_fingerprint">Изтриване на отпечатъка</string>
@@ -330,6 +331,7 @@
   <string name="check_x_filesize_on_host">Проверете размера на %1$s на %2$s</string>
   <string name="message_options">Настройки за съобщенята</string>
   <string name="copy_text">Копиране на текста</string>
+  <string name="select_text">Избиране на текста</string>
   <string name="copy_original_url">Копиране на оригиналния адрес</string>
   <string name="send_again">Повторно изпращане</string>
   <string name="file_url">Адрес на файла</string>
@@ -651,10 +653,17 @@
   <string name="unable_to_update_account">Неуспешно обновяване на профила</string>
   <string name="missing_presence_subscription_with_x">Липсва абонамент за присъствието на %s.</string>
   <string name="missing_keys_from_x">Липсват ключове OMEMO от %s.</string>
+  <string name="missing_omemo_keys">Липсват ключове OMEMO</string>
   <string name="wrong_conference_configuration">Това не е лична, не-анонимна беседа.</string>
   <string name="this_conference_has_no_members">Няма участници в тази беседа.</string>
   <string name="report_jid_as_spammer">Докладване на този JID за изпращане на нежелани съобщения.</string>
   <string name="pref_delete_omemo_identities">Изтриване на идентификаторите OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Пресъздайте своите ключове OMEMO. Всички Ваши контакти ще трябва да Ви потвърдят отново. Използвайте това само в краен случай.</string>
   <string name="delete_selected_keys">Изтриване на избраните ключове.</string>
+  <string name="error_publish_avatar_offline">Трябва да бъдете свързан(а), за да публикувате аватара си.</string>
+  <string name="show_error_message">Показване на грешка</string>
+  <string name="error_message">Съобщение за грешка</string>
+  <string name="data_saver_enabled">Съхранението на данни е включено</string>
+  <string name="data_saver_enabled_explained">Операционната Ви система не позволява на Conversations да се свързва с Интернет когато работи на заден фон. За да получавате известия за новите съобщения, трябва да дадете на Conversations неограничен достъп когато съхранението на данни е включено.\nConversations ще продължи да се опитва да записва данните когато е възможно.</string>
+  <string name="device_does_not_support_data_saver">Устройството Ви не поддържа изключването на съхранението на данни за Conversations.</string>
 </resources>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 54af09db4..80fe5d129 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -331,6 +331,7 @@
   <string name="check_x_filesize_on_host">Kontrola %1$s velikosti na %2$s</string>
   <string name="message_options">Možnosti zpráv</string>
   <string name="copy_text">Zkopírovat text</string>
+  <string name="select_text">Vybrat text</string>
   <string name="copy_original_url">Kopírovat originální URL</string>
   <string name="send_again">Poslat znovu</string>
   <string name="file_url">URL souboru</string>
@@ -663,4 +664,8 @@
   <string name="pref_delete_omemo_identities_summary">Znovu vygenerovat OMEMO klíče. Vyžaduje potvrzení od všech vašich kontaktů. POužijte pouze jako poslední řešení.</string>
   <string name="delete_selected_keys">Smazat vybrané klíče</string>
   <string name="error_publish_avatar_offline">Pro zveřejnění svého avatara musíte být online.</string>
+  <string name="show_error_message">Zobrazit chybovou zprávu</string>
+  <string name="error_message">Chybová zpráva</string>
+  <string name="data_saver_enabled">Zapnuta úspora dat</string>
+  <string name="data_saver_enabled_explained">Váš operační systém zabraňuje aplikaci Conversations v přístupu na Internet, pokud tato běží na pozadí. Pro příjem upozornění na nové zprávy musíte Conversations povolit neomezený přístup při zapnuté úspoře dat.\nConversations se bude i přesto snažit omezovat přenos dat.</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 962a6b3ba..a3c944295 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -331,6 +331,7 @@
   <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="select_text">Text markieren</string>
   <string name="copy_original_url">Original-URL kopieren</string>
   <string name="send_again">Erneut senden</string>
   <string name="file_url">Datei-URL</string>
@@ -596,7 +597,7 @@
   <string name="security_error_invalid_file_access">Sicherheitsfehler: Dateizugriff nicht erlaubt</string>
   <string name="no_application_to_share_uri">Keine Anwendung zum Teilen der URI gefunden</string>
   <string name="share_uri_with">Teile URI mit…</string>
-  <string name="welcome_text">XMPP ist ein providerunabhängiges Protokoll. Du kannst diesen Client mit jedem beliebigen XMPP-Server benutzen.\nUm es Dir leicht zu machen haben wir die Möglichkeit geschaffen, ein Konto auf conversations.im¹ anzulegen. Dieser Provider ist besonders gut für Conversations geeignet. </string>
+  <string name="welcome_text">XMPP ist ein providerunabhängiges Protokoll. Du kannst diesen Client mit jedem beliebigen XMPP-Server benutzen.\nUm es dir leicht zu machen haben wir die Möglichkeit geschaffen, ein Konto auf conversations.im¹ anzulegen. Dieser Provider ist besonders gut für Conversations geeignet. </string>
   <string name="magic_create_text">Wir führen dich durch den Prozess der Kontoerstellung auf conversations.im.¹\nWenn du conversations.im als Provider wählst, kannst du mit Nutzern anderer Anbieter kommunizieren, indem du ihnen deine vollständige Jabber-ID gibst.</string>
   <string name="your_full_jid_will_be">Deine vollständige Jabber ID lautet: %s</string>
   <string name="create_account">Konto erstellen</string>
@@ -660,4 +661,9 @@
   <string name="pref_delete_omemo_identities_summary">Regeneriere deine OMEMO-Schlüssel. Alle deine Kontakte müssen dich neu verifizieren. Nutze dies als letzten Ausweg.</string>
   <string name="delete_selected_keys">Ausgewählte Schlüssel löschen</string>
   <string name="error_publish_avatar_offline">Du musst verbunden sein um deinen Avatar zu veröffentlichen</string>
+  <string name="show_error_message">Zeige Fehlermeldung</string>
+  <string name="error_message">Fehlermeldung</string>
+  <string name="data_saver_enabled">Datensparmodus aktiv</string>
+  <string name="data_saver_enabled_explained">Dein Betriebssystem verbietet Conversations im Hintergrund den Zugang zum Internet. Um Benachrichtigungen erhalten zu können, solltest du Conversations den Zugang erlauben, wenn der Datensparmodus aktiv ist. Conversations wird dennoch versuchen, so viel Daten wie möglich einzusparen.</string>
+  <string name="device_does_not_support_data_saver">Dein Gerät unterstützt den Datensparmodus für Conversations nicht.</string>
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index eede5b989..b08f3ad0e 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -331,6 +331,7 @@
   <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="select_text">Seleccionar texto</string>
   <string name="copy_original_url">Copiar URL original</string>
   <string name="send_again">Volver a enviar</string>
   <string name="file_url">URL de archivo</string>
@@ -660,4 +661,7 @@
   <string name="pref_delete_omemo_identities_summary">Regenerar tus clave OMEMO. Todos tus contactos tendrán que verificarte de nuevo. Usa esta opción como último recurso.</string>
   <string name="delete_selected_keys">Eliminar claves seleccionadas</string>
   <string name="error_publish_avatar_offline">Debes estar conectado para publicar la imagen de perfil</string>
+  <string name="show_error_message">Mostrar mensaje de error</string>
+  <string name="data_saver_enabled">Optimización de datos habilitado</string>
+  <string name="data_saver_enabled_explained">Tu sistema operativo está restringiendo a Conversations acceder a internet cuando está en segundo plano. Para recibir notificaciones de nuevos mensajes deberías permitir a Conversations acceder a internet cuando la optimización de datos está habilitada.\nConversations realizará igualmente optimizaciones para ahorrar datos cuando sea posible.</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 3ebfd5179..6d26330da 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -247,6 +247,7 @@
   <string name="contact_already_exists">Kontaktua existitzen da dagoeneko</string>
   <string name="join">Batu</string>
   <string name="conference_address">Konferentziaren helbidea</string>
+  <string name="conference_address_example">gela@konferentzia.adibidea.eus/ezizena</string>
   <string name="save_as_bookmark">Gorde laster-marka bezala</string>
   <string name="delete_bookmark">Laster-marka ezabatu</string>
   <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string>
@@ -282,6 +283,7 @@
   <string name="conference_requires_password">Konferentziak pasahitza behar du</string>
   <string name="enter_password">Sartu pasahitza</string>
   <string name="missing_presence_updates">Kontaktuaren presentzia eguneraketak falta dira</string>
+  <string name="missing_presence_subscription">Presentzia harpidetza falta da</string>
   <string name="request_presence_updates">Mesedez eskatu lehenago zure kontaktuaren presentzia eguneraketak.\n\n<small>Kontaktuak erabiltzen ari den bezeroa(k) zehazteko erabilika da hau.</small></string>
   <string name="request_now">Eskatu orain</string>
   <string name="delete_fingerprint">Hatz-marka ezabatu</string>
@@ -650,6 +652,12 @@
   <string name="unable_to_update_account">Ezin izan da kontua eguneratu</string>
   <string name="missing_presence_subscription_with_x">%s(r)ekin presentzia harpidetza falta da</string>
   <string name="missing_keys_from_x">%s(r)en OMEMO gakoak falta dira.</string>
+  <string name="missing_omemo_keys">OMEMO gakoak falta dira</string>
   <string name="wrong_conference_configuration">Hau ez da konferentzia pribatu, ez anonimo bat.</string>
   <string name="this_conference_has_no_members">Ez dago kiderik konferentzia honetan.</string>
+  <string name="report_jid_as_spammer">JIDa nahi gabeko mezuen bidaltzaile gisa salatu</string>
+  <string name="pref_delete_omemo_identities">OMEMO nortasunak ezabatu</string>
+  <string name="pref_delete_omemo_identities_summary">Zure OMEMO gakoak birsortu. Zure kontaktu guztiak zu egiaztatu beharko zaituzte berriz. Soilik azken aukera bezala erabili hau.</string>
+  <string name="delete_selected_keys">Hautatutako gakoak ezabatu</string>
+  <string name="error_publish_avatar_offline">Konektatuta egon behar zara zure profileko argazkia argitaratzeko.</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 63576e0ee..af3055702 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -283,6 +283,7 @@
   <string name="conference_requires_password">La conférence nécessite un mot de passe</string>
   <string name="enter_password">Entrer le mot de passe</string>
   <string name="missing_presence_updates">Mises à jour de disponibilité manquantes pour ce contact</string>
+  <string name="missing_presence_subscription">La notification de présence est manquante </string>
   <string name="request_presence_updates">Veuillez demander à votre contact de partager ses mises à jour de disponibilité.\n\n<small>Elles seront utilisées pour déterminer son client.</small></string>
   <string name="request_now">Demander maintenant</string>
   <string name="delete_fingerprint">Supprimer l\'empreinte</string>
@@ -330,6 +331,7 @@
   <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="select_text">Sélectionnez le texte</string>
   <string name="copy_original_url">Copier l\'URL</string>
   <string name="send_again">Envoyer de nouveau</string>
   <string name="file_url">URL du fichier</string>
@@ -651,10 +653,16 @@
   <string name="unable_to_update_account">Mise à jour du compte impossible</string>
   <string name="missing_presence_subscription_with_x">La notification de présence est manquante avec %s</string>
   <string name="missing_keys_from_x">La clef OMEMO de %s est manquante</string>
+  <string name="missing_omemo_keys">Clefs OMEMO manquantes</string>
   <string name="wrong_conference_configuration">La conférence n\'est ni privée, ni anonyme</string>
   <string name="this_conference_has_no_members">Aucun membre dans cette conférence</string>
   <string name="report_jid_as_spammer">Signaler ce JID comme envoyant des messages non sollicités</string>
   <string name="pref_delete_omemo_identities">Effacer les identités OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Régénérer vos clef OMEMO. Tous vos contacts devront les vérifier à nouveau. A n\'utiliser qu\'en dernier recours.</string>
   <string name="delete_selected_keys">Supprimer les clefs sélectionnées</string>
+  <string name="error_publish_avatar_offline">Vous devez être connecté pour publier votre avatar</string>
+  <string name="show_error_message">Afficher le message d\'erreur</string>
+  <string name="error_message">Message d\'erreur</string>
+  <string name="data_saver_enabled">Économie de données activée</string>
+  <string name="data_saver_enabled_explained">Votre système d\'exploitation empêche Conversations d’accéder à Internet en arrière plan. Pour recevoir les notifications de nouveaux messages, vous devez autoriser, quand le mode d\'économie de données est actif, à ce que Conversations ai un plein accès au réseau.\n Conversations essaiera autant que possible d\'économiser la data.</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 3e55d17ab..5e5230d7a 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -331,6 +331,7 @@
   <string name="check_x_filesize_on_host">%2$s で %1$s のサイズを確認</string>
   <string name="message_options">メッセージオプション</string>
   <string name="copy_text">テキストをコピー</string>
+  <string name="select_text">テキストを選択</string>
   <string name="copy_original_url">元の URL をコピー</string>
   <string name="send_again">再送</string>
   <string name="file_url">ファイル URL</string>
@@ -657,4 +658,9 @@
   <string name="pref_delete_omemo_identities_summary">OMEMO 鍵を再生成します。すべての連絡先を再度確認する必要があります。最後の手段としてのみ使用してください。</string>
   <string name="delete_selected_keys">選択した鍵を削除</string>
   <string name="error_publish_avatar_offline">アバターを公開するには接続する必要があります。</string>
+  <string name="show_error_message">エラーメッセージを表示</string>
+  <string name="error_message">エラーメッセージ</string>
+  <string name="data_saver_enabled">データセーバーを有効にしました</string>
+  <string name="data_saver_enabled_explained">お使いのオペレーティングシステムは、Conversationsがバックグラウンドのときにインターネットにアクセスすることを制限しています。新しいメッセージの通知を受信するには、データセーバーがオンになっているとき、Conversationsに無制限のアクセスを許可する必要があります。\nConversationsは可能なときにデータを保存するための努力をします。</string>
+  <string name="device_does_not_support_data_saver">お使いのデバイスは、Conversationsのデータセーバーを無効にすることはできません。</string>
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 4d55e33db..0ce913617 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -331,6 +331,7 @@
   <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="select_text">Tekst selecteren</string>
   <string name="copy_original_url">Oorspronkelijke URL kopiëren</string>
   <string name="send_again">Opnieuw versturen</string>
   <string name="file_url">Bestands-URL</string>
@@ -660,4 +661,9 @@
   <string name="pref_delete_omemo_identities_summary">Maak je OMEMO-sleutels opnieuw aan. Al je contacten zullen je opnieuw moeten verifiëren. Gebruik dit enkel als een laatste reddingsmiddel.</string>
   <string name="delete_selected_keys">Geselecteerde sleutels verwijderen</string>
   <string name="error_publish_avatar_offline">Je moet verbonden zijn om je avatar te kunnen publiceren.</string>
+  <string name="show_error_message">Toon foutbericht</string>
+  <string name="error_message">Foutbericht</string>
+  <string name="data_saver_enabled">Gegevensbesparing ingeschakeld</string>
+  <string name="data_saver_enabled_explained">Je besturingssysteem verhindert Conversations toegang tot het internet wanneer Conversations zich in de achtergrond bevindt. Om meldingen van nieuwe berichten te krijgen moet je Conversations onbeperkte toegang geven wanneer gegevensbesparing is ingeschakeld.\nConversations zal nog steeds proberen wanneer mogelijk gegevens te besparen.</string>
+  <string name="device_does_not_support_data_saver">Je apparaat ondersteunt het uitschakelen van gegevensbesparing voor Conversations niet.</string>
 </resources>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 909b14d21..2c76db207 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -3,7 +3,7 @@
   <string name="action_settings">Setari</string>
   <string name="action_add">Conversatie noua</string>
   <string name="action_accounts">Configureaza conturi</string>
-  <string name="action_end_conversation">Termina conversatia</string>
+  <string name="action_end_conversation">Inchide conversatia</string>
   <string name="action_contact_details">Detalii contact</string>
   <string name="action_muc_details">Detalii conferinta</string>
   <string name="action_secure">Securizeaza conferinta</string>
@@ -20,7 +20,7 @@
   <string name="title_activity_conference_details">Detalii conferinta</string>
   <string name="title_activity_contact_details">Detalii contact</string>
   <string name="title_activity_sharewith">Distribuie catre Conversations</string>
-  <string name="title_activity_start_conversation">Porneste conversatie</string>
+  <string name="title_activity_start_conversation">Porneste o conversatie</string>
   <string name="title_activity_choose_contact">Alege contact</string>
   <string name="title_activity_block_list">Blocheaza lista</string>
   <string name="just_now">in acest moment</string>
@@ -46,7 +46,7 @@
   <string name="register_account">Inregistreaza un cont nou pe server</string>
   <string name="change_password_on_server">Schimba parola pe server</string>
   <string name="share_with">Partajeaza cu...</string>
-  <string name="start_conversation">Porneste conversatie</string>
+  <string name="start_conversation">Porneste o conversatie</string>
   <string name="invite_contact">Invita contact</string>
   <string name="contacts">Contacte</string>
   <string name="cancel">Anuleaza</string>
@@ -103,15 +103,15 @@
   <string name="pref_xmpp_resource">Nume client XMPP</string>
   <string name="pref_xmpp_resource_summary">Identificatorul acestui client</string>
   <string name="pref_accept_files">Accepta fisiere</string>
-  <string name="pref_accept_files_summary">Accepta automat fisiere mai mici decat...</string>
+  <string name="pref_accept_files_summary">Mai mici decat...</string>
   <string name="pref_attachments">Atasamente</string>
   <string name="pref_return_to_previous">Partajare rapida</string>
-  <string name="pref_return_to_previous_summary">Intoarcere la activitatea precedenta in loc sa deschizi conversatia, dupa ce ai partajat ceva</string>
+  <string name="pref_return_to_previous_summary">Dupa ce ai partajat ceva, intoarce-te la activitatea precedenta in loc sa deschizi conversatia</string>
   <string name="pref_notification_settings">Notificare</string>
   <string name="pref_notifications">Notificari</string>
-  <string name="pref_notifications_summary">Notifica cand un nou mesaj este primit</string>
+  <string name="pref_notifications_summary">Atunci cand un nou mesaj este primit</string>
   <string name="pref_vibrate">Vibreaza</string>
-  <string name="pref_vibrate_summary">Vibreaza cand un nou mesaj este primit</string>
+  <string name="pref_vibrate_summary">Atunci cand un nou mesaj este primit</string>
   <string name="pref_led">Notificare LED</string>
   <string name="pref_led_summary">Clipeste lumina de notificare atunci cand un nou mesaj este primit</string>
   <string name="pref_sound">Ton de apel</string>
@@ -122,7 +122,7 @@
   <string name="pref_never_send_crash">Nu trimite rapoarte de erori</string>
   <string name="pref_never_send_crash_summary">Trimitand date ajuti la dezvoltarea aplicatiei Conversations\n<b>Atentie:</b> Se va utiliza contul XMPP pentru a trimite informatii catre programatori.</string>
   <string name="pref_confirm_messages">Confirma mesaje</string>
-  <string name="pref_confirm_messages_summary">Notifica contactul cand ai primit un mesaj si l-ai citit</string>
+  <string name="pref_confirm_messages_summary">Contactul este notificat atunci cand ai primit un mesaj si l-ai citit</string>
   <string name="pref_ui_options">Optiuni interfata</string>
   <string name="openpgp_error">OpenKeychain a raportat o eroare</string>
   <string name="error_decrypting_file">Eroare I/O la decriptarea fisierului</string>
@@ -294,7 +294,7 @@
   <string name="pref_force_encryption">Forteaza criptarea conexiunii de la un capat la altul</string>
   <string name="pref_force_encryption_summary">Trimite mereu mesajele criptate (exceptand conferintele)</string>
   <string name="pref_allow_message_correction">Permite corectia mesajelor</string>
-  <string name="pref_allow_message_correction_summary">Permite contactelor sa isi editeze mesajele din trecut</string>
+  <string name="pref_allow_message_correction_summary">Contactele pot sa isi editeze mesajele din trecut</string>
   <string name="pref_dont_save_encrypted">Nu salva mesaje criptate</string>
   <string name="pref_dont_save_encrypted_summary">Atentie: Asta poate duce la pierderea de mesaje</string>
   <string name="pref_expert_options">Optiuni expert</string>
@@ -306,15 +306,15 @@
   <string name="title_pref_quiet_hours_end_time">Ora de oprire</string>
   <string name="title_pref_enable_quiet_hours">Activeaza orar de liniste</string>
   <string name="pref_quiet_hours_summary">Notificarile vor fi reduse la tacere in timpul orelor de liniste</string>
-  <string name="pref_use_larger_font">Mareste marimea literelor</string>
+  <string name="pref_use_larger_font">Mareste fontul</string>
   <string name="pref_use_larger_font_summary">Foloseste marimea mai mare de text in toata aplicatia</string>
   <string name="pref_use_send_button_to_indicate_status">Butonul de trimitere indica starea</string>
   <string name="pref_use_indicate_received">Cere raport de primire</string>
-  <string name="pref_use_indicate_received_summary">Mesajele primite vor fi marcate cu un semn verde daca este suportat</string>
+  <string name="pref_use_indicate_received_summary">Mesajele primite vor fi marcate cu o bifa verde daca este suportat</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Coloreaza butonul de trimitere pentru a indica starea contactului</string>
   <string name="pref_expert_options_other">Altele</string>
   <string name="pref_conference_name">Titlu conferinta</string>
-  <string name="pref_conference_name_summary">Foloseste subiectul camerei in locul JID pentru a identifica conferinta</string>
+  <string name="pref_conference_name_summary">Foloseste subiectul camerei pentru a identifica conferinta</string>
   <string name="pref_autojoin">Alatura-te automat conferintelor</string>
   <string name="pref_autojoin_summary">Respecta setarea de alaturare automata la o conferinta conform semnului de carte</string>
   <string name="toast_message_otr_fingerprint">Amprenta OTR copiata in memorie</string>
@@ -331,6 +331,7 @@
   <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="select_text">Selecteaza text</string>
   <string name="copy_original_url">Copiaza URL original</string>
   <string name="send_again">Trimite din nou</string>
   <string name="file_url">URL fisier</string>
@@ -380,8 +381,8 @@
   <string name="could_not_verify_fingerprint">Nu s-a putut verifica amprenta</string>
   <string name="manually_verify">Verifica manual</string>
   <string name="are_you_sure_verify_fingerprint">Sigur vrei sa verifici amprenta OTR a persoanei de contact?</string>
-  <string name="pref_show_dynamic_tags">Arata etichetele dinamice</string>
-  <string name="pref_show_dynamic_tags_summary">Arata etichete de stare sub contacte </string>
+  <string name="pref_show_dynamic_tags">Arata etichetele de stare</string>
+  <string name="pref_show_dynamic_tags_summary">Sub contacte arata etichete dinamice</string>
   <string name="enable_notifications">Activeaza notificari</string>
   <string name="conference_with">Creeaza conferinta cu...</string>
   <string name="no_conference_server_found">Serverul conferintei nu a fost gasita</string>
@@ -638,7 +639,7 @@ Emitent</string>
   <string name="pref_theme_light">Tema luminoasa</string>
   <string name="pref_theme_dark">Tema intunecata</string>
   <string name="pref_use_green_background">Fundal verde</string>
-  <string name="pref_use_green_background_summary">Foloseste la mesajele primite un fundal verde</string>
+  <string name="pref_use_green_background_summary">Pentru mesajele primite</string>
   <string name="unable_to_connect_to_keychain">Nu s-a putut contacta OpenKeychain</string>
   <string name="this_device_is_no_longer_in_use">Acest dispozitiv nu mai este in uz</string>
   <string name="type_pc">PC</string>
@@ -659,9 +660,13 @@ Emitent</string>
   <string name="missing_omemo_keys">Chei OMEMO lipsa</string>
   <string name="wrong_conference_configuration">Aceasta este o conferinta care nu este privata si nu este anonima.</string>
   <string name="this_conference_has_no_members">Conferinta nu are nici un membru.</string>
-  <string name="report_jid_as_spammer">Raporteaza ca aceasta identitate (JID) trimite mesaje nedorite.</string>
+  <string name="report_jid_as_spammer">Raporteaza ca aceasta identitate trimite mesaje nedorite.</string>
   <string name="pref_delete_omemo_identities">Sterge identitatile OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Regenereaza cheile personale OMEMO. Toate contactele vor fi obligate sa verifice cheile tale din nou. Foloseste asta ca o ultima optiune.</string>
   <string name="delete_selected_keys">Sterge cheile selectate</string>
   <string name="error_publish_avatar_offline">Pentru a putea publica avatarul trebuie sa existe o conexiune.</string>
+  <string name="show_error_message">Arata mesaj de eroare</string>
+  <string name="error_message">Mesaj de eroare</string>
+  <string name="data_saver_enabled">Economizorul de date este activat</string>
+  <string name="data_saver_enabled_explained">Sistemul de operare restrictioneaza accesul la Internet pentru Conversations atunci cand este in fundal. Pentru a primi in continuare notificari de mesaje noi trebuie sa acordati acces ne restrictionat pentru Conversations atunci cand Economizorul de date este activ.\nConversations totusi face eforturi sa economiseasca datele atunci cand este posibil.</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index bc6929960..cc38a5dc5 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -29,7 +29,7 @@
   <string name="unread_conversations">сообщен. не прочитано</string>
   <string name="sending">отправка…</string>
   <string name="message_decrypting">Расшифровка сообщения. Подождите…</string>
-  <string name="pgp_message">OpenPGP зашифрованное сообщение</string>
+  <string name="pgp_message">OpenPGP зашифр. сообщение</string>
   <string name="nick_in_use">Имя уже используется</string>
   <string name="admin">Администратор</string>
   <string name="owner">Владелец</string>
@@ -81,10 +81,10 @@
   <string name="choose_presence">Выберите устройство</string>
   <string name="send_unencrypted_message">Нешифрованное сообщение</string>
   <string name="send_message_to_x">Сообщение для %s</string>
-  <string name="send_otr_message">OTR зашифрованное сообщение</string>
-  <string name="send_omemo_message">OMEMO зашифрованное сообщение</string>
-  <string name="send_omemo_x509_message">v\\OMEMO зашифрованное сообщение</string>
-  <string name="send_pgp_message">OpenPGP зашифрованное сообщение</string>
+  <string name="send_otr_message">OTR зашифр. сообщение</string>
+  <string name="send_omemo_message">OMEMO зашифр. сообщение</string>
+  <string name="send_omemo_x509_message">v\\OMEMO зашифр. сообщение</string>
+  <string name="send_pgp_message">OpenPGP зашифр. сообщение</string>
   <string name="your_nick_has_been_changed">Ваш псевдоним был изменён</string>
   <string name="send_unencrypted">Отправить в незашифрованном виде</string>
   <string name="decryption_failed">Расшифровка не удалась. Вероятно, что у вас нет надлежащего ключа.</string>
@@ -270,7 +270,7 @@
   <string name="error_publish_avatar_no_server_support">Ваш сервер не поддерживает публикацию аватаров</string>
   <string name="private_message">шёпот</string>
   <string name="private_message_to">отправить %s</string>
-  <string name="send_private_message_to">Отправить личное сообщение для %s</string>
+  <string name="send_private_message_to">Приватное сообщение %s</string>
   <string name="connect">Подключиться</string>
   <string name="account_already_exists">Аккаунт уже существует</string>
   <string name="next">Далее</string>
@@ -331,7 +331,6 @@
   <string name="check_x_filesize_on_host">Проверить размер %1$s на %2$s</string>
   <string name="message_options">Опции сообщения</string>
   <string name="copy_text">Копировать текст</string>
-  <string name="select_text">Выбрать текст</string>
   <string name="copy_original_url">Копировать адрес ссылки</string>
   <string name="send_again">Отправить ещё раз</string>
   <string name="file_url">URL файла</string>
@@ -354,7 +353,7 @@
   <string name="respond">Ответ</string>
   <string name="failed">Не удалось</string>
   <string name="secrets_do_not_match">Ключи не совпадают</string>
-  <string name="try_again">Попробуйте ещё раз</string>
+  <string name="try_again">Повторить</string>
   <string name="finish">Завершить</string>
   <string name="verified">Подтверждён!</string>
   <string name="smp_requested">Контакт запросил подтверждение SMP</string>
@@ -480,7 +479,7 @@
   <string name="location">Местоположение</string>
   <string name="received_location">Получено местоположение</string>
   <string name="title_undo_swipe_out_conversation">Беседа окончена</string>
-  <string name="title_undo_swipe_out_muc">Выход из конференции</string>
+  <string name="title_undo_swipe_out_muc">Выход из чата</string>
   <string name="pref_dont_trust_system_cas_title">Не доверять системным УЦ</string>
   <string name="pref_dont_trust_system_cas_summary">Все сертификаты должны быть подтверждены вручную</string>
   <string name="pref_remove_trusted_certificates_title">Удалить сертификаты</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 46723f176..6b914e23e 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -331,6 +331,7 @@
   <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="select_text">Изабери текст</string>
   <string name="copy_original_url">Копирај изворни УРЛ</string>
   <string name="send_again">Пошаљи поново</string>
   <string name="file_url">УРЛ фајла</string>
@@ -599,6 +600,8 @@
   <string name="security_error_invalid_file_access">Безбедносна грешка: неисправан приступ фајлу</string>
   <string name="no_application_to_share_uri">Нема апликације за дељење веза</string>
   <string name="share_uri_with">Подели везу помоћу…</string>
+  <string name="welcome_text">ИксМПП је протокол независан од провајдера. Можете да користите овог клијента са било којим ИксМПП сервером.\nИпак, због погодности омогућили смо једноставно прављење налога на conversations.im¹, сервер посебно прилагођен за коришћење са Конверзацијом.</string>
+  <string name="magic_create_text">Водићемо вас кроз процес прављења налога на conversations.im.¹\nАко изаберете conversations.im за даваоца услуге моћи ћете да комуницирате са корисницима других сервера ако им дате ваш Џабер ИД.</string>
   <string name="your_full_jid_will_be">Ваш пуни Џабер ИД ће бити: %s</string>
   <string name="create_account">Направи налог</string>
   <string name="use_own_provider">Користићу сопствени провајдер</string>
@@ -661,4 +664,6 @@
   <string name="pref_delete_omemo_identities_summary">Поновно генерисање ОМЕМО кључева. Сви ваши контакти ће морати поново да вас овере. Користите ово само у крајњем случају.</string>
   <string name="delete_selected_keys">Обриши изабране кључеве</string>
   <string name="error_publish_avatar_offline">Морате бити повезани да бисте објавили ваш аватар.</string>
+  <string name="show_error_message">Прикажи поруку грешке</string>
+  <string name="error_message">Порука грешке</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 51cf173d2..3487e0ba2 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -331,6 +331,7 @@
   <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="select_text">Markera text</string>
   <string name="copy_original_url">Kopiera orginal-URL</string>
   <string name="send_again">Skicka igen</string>
   <string name="file_url">Fil-URL</string>
@@ -596,6 +597,8 @@
   <string name="security_error_invalid_file_access">Säkerhetsfel: Ogiltig filaccess</string>
   <string name="no_application_to_share_uri">Ingen applikation kunde hittas för att dela URI</string>
   <string name="share_uri_with">Dela URI med...</string>
+  <string name="welcome_text">XMPP är ett leverantörsoberoende protokoll. Du kan använda denna klient med vilken XMPP server du vill.\nFör din bekvämlighet har vi gjort det enkelt att skapa ett konto hos conversations.im¹; en leverantör speciellt anpassad för att användas med Conversations.</string>
+  <string name="magic_create_text">Du kommer nu att få hjälp med att skapa ett konto på conversations.im.¹\nNär conversations.im väljs som leverantör kommer du kunna kommunicera med användare hos andra leverantörer genom att ge dem ditt Jabber ID.</string>
   <string name="your_full_jid_will_be">Ditt jabber ID blir: %s</string>
   <string name="create_account">Skapa konto</string>
   <string name="use_own_provider">Använd min egen leverantör</string>
@@ -658,4 +661,9 @@
   <string name="pref_delete_omemo_identities_summary">Regenerera din OMEMO-nyckel. Alla dina kontakter kommer att behöva verifiera dig igen. Använd detta endast som en sista utväg.</string>
   <string name="delete_selected_keys">Ta bort valda nycklar</string>
   <string name="error_publish_avatar_offline">Du måste vara ansluten för att publicera din avatarbild</string>
+  <string name="show_error_message">Visa felmeddelande</string>
+  <string name="error_message">Felmeddelande</string>
+  <string name="data_saver_enabled">Databesparing</string>
+  <string name="data_saver_enabled_explained">Ditt operativsystem begränsar Internet-access för Conversations i när den är i bakgrunden. För att få notifieringar vid nya meddelanden behöver du ge Conversations obegränsad access när databesparing är påslaget.\nConversations kommer ändå försöka minska dataanvändningen när det är möjligt.</string>
+  <string name="device_does_not_support_data_saver">Din enhet stödjer inte att deaktivera databesparing för Conversations.</string>
 </resources>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index f0c070497..768822b70 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -331,6 +331,7 @@
   <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="select_text">Metni seç</string>
   <string name="copy_original_url">Orijinal URL\'i kopyala</string>
   <string name="send_again">Yeniden gönder</string>
   <string name="file_url">Dosya URL</string>
@@ -657,4 +658,8 @@
   <string name="pref_delete_omemo_identities_summary">OMEMO anahtarını tekrar oluştur. Tüm kişilerinizin sizi tekrar doğrulaması gerekecek. Bunu sadece son çare olarak kullanın.</string>
   <string name="delete_selected_keys">Seçilen anahtarları sil</string>
   <string name="error_publish_avatar_offline">Avatarınızı yayınlamak için bağlı olmalısınız.</string>
+  <string name="show_error_message">Hata mesajını göster</string>
+  <string name="error_message">Hata mesajı</string>
+  <string name="data_saver_enabled">Veri tasarrufu aktif</string>
+  <string name="data_saver_enabled_explained">İşletim sisteminiz Conversations arka planda çalışırken Internet erişimini sınırlıyor. Yeni ileti alındığında uyarı gelmesi için Conversations\'a veri tasarrufu aktif durumdayken  sınırsız erişim vermeniz gerekiyor.\nConversations mümkün olan durumlarda veri tasarrufu için çaba harcar.</string>
 </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a25856238..89e5a9c6c 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -157,7 +157,9 @@
   <string name="account_status_regis_success">注册完成</string>
   <string name="account_status_regis_not_sup">服务器不支持注册</string>
   <string name="account_status_security_error">安全错误</string>
+  <string name="account_status_policy_violation">违反政策</string>
   <string name="account_status_incompatible_server">服务器不兼容</string>
+  <string name="account_status_stream_error">流错误</string>
   <string name="encryption_choice_unencrypted">未加密</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -281,6 +283,7 @@
   <string name="conference_requires_password">讨论组设有密码</string>
   <string name="enter_password">输入密码</string>
   <string name="missing_presence_updates">缺少在线联系人更新</string>
+  <string name="missing_presence_subscription">缺少在线订阅</string>
   <string name="request_presence_updates">请先发送更新在线联系人的请求。\n\n<small>以判断您的联系人所用的客户端类型。</small></string>
   <string name="request_now">现在发送请求</string>
   <string name="delete_fingerprint">删除指纹</string>
@@ -512,6 +515,7 @@
   <string name="pref_use_white_background_summary">收到的消息将显示为白底黑字</string>
   <string name="account_status_tor_unavailable">Tor network 不可用</string>
   <string name="account_status_bind_failure">绑定失败</string>
+  <string name="account_status_host_unknown">服务器不能为域名做出响应</string>
   <string name="server_info_broken">损坏</string>
   <string name="pref_presence_settings">存在</string>
   <string name="pref_away_when_screen_off">关闭屏幕时离开</string>
@@ -591,6 +595,8 @@
   <string name="security_error_invalid_file_access">安全错误：文件访问权限无效</string>
   <string name="no_application_to_share_uri">没有可以分享此链接的应用</string>
   <string name="share_uri_with">分享链接...</string>
+  <string name="welcome_text">XMPP 是一个独立协议的提供者。你可以用这个客户端连接任何你选择的 XMPP 服务器。\n为了让你更便捷，我们让你可以在 conversations.im¹ 上方便的注册账号；特意为使用 Conversations 的人准备。</string>
+  <string name="magic_create_text">我们将会引导你完成在 conversations.im¹ 上注册账号的过程。\n当获得了 conversations.im 提供的账号以后，你可以通过添加使用其他提供商的好友的完整 Jabber ID 来与他们联络。</string>
   <string name="your_full_jid_will_be">您完整的 Jabble ID 是：%s </string>
   <string name="create_account">创建账户</string>
   <string name="use_own_provider">使用我自己的服务端</string>
@@ -636,15 +642,21 @@
   <string name="type_web">浏览器</string>
   <string name="type_console">控制台</string>
   <string name="payment_required">需要付款</string>
+  <string name="missing_internet_permission">缺少互联网权限</string>
+  <string name="me">我</string>
+  <string name="contact_asks_for_presence_subscription">联系人请求在线订阅</string>
   <string name="allow">允许</string>
   <string name="no_permission_to_access_x">没有访问 %s 的许可</string>
   <string name="remote_server_not_found">找不到远程服务器</string>
   <string name="unable_to_update_account">无法更新账户</string>
+  <string name="missing_presence_subscription_with_x">缺少与 %s 的在线订阅。</string>
   <string name="missing_keys_from_x">缺少来自 %s 的 OMEMO 密钥。</string>
+  <string name="missing_omemo_keys">缺少 OMEMO 密钥</string>
   <string name="wrong_conference_configuration">这不是一个私密，非匿名的会议室。</string>
   <string name="this_conference_has_no_members">这个会议室中没有成员。</string>
   <string name="report_jid_as_spammer">报告这个 JID 发送不想要的消息。</string>
   <string name="pref_delete_omemo_identities">删除 OMEMO 身份</string>
   <string name="pref_delete_omemo_identities_summary">重新生成你的 OMEMO 密钥。你的所有联系人不得不对你进行再认证。请将此作为最后的办法。</string>
   <string name="delete_selected_keys">删除选择的密钥</string>
+  <string name="error_publish_avatar_offline">你需要连接才能发布头像</string>
 </resources>