From 5ecd250565155b92715e131e67422e57623690be Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 30 Jul 2020 13:02:25 +0200
Subject: [PATCH] pulled translations from transifex

---
 src/conversations/res/values-it/strings.xml     |  3 ++-
 src/conversations/res/values-pt-rBR/strings.xml |  3 ++-
 src/conversations/res/values-ru/strings.xml     |  3 ++-
 src/conversations/res/values-zh-rCN/strings.xml |  3 ++-
 src/main/res/values-ar/strings.xml              |  1 -
 src/main/res/values-bg/strings.xml              |  4 ----
 src/main/res/values-ca/strings.xml              |  4 ----
 src/main/res/values-cs/strings.xml              |  1 -
 src/main/res/values-de/strings.xml              | 12 +++++++-----
 src/main/res/values-el/strings.xml              |  4 ----
 src/main/res/values-es/strings.xml              | 10 ++++++----
 src/main/res/values-eu/strings.xml              |  4 ----
 src/main/res/values-fr/strings.xml              |  4 ----
 src/main/res/values-gl/strings.xml              | 10 ++++++----
 src/main/res/values-hu/strings.xml              |  4 ----
 src/main/res/values-it/strings.xml              |  6 ++----
 src/main/res/values-iw/strings.xml              |  1 -
 src/main/res/values-ja/strings.xml              |  4 ----
 src/main/res/values-ko/strings.xml              |  1 -
 src/main/res/values-nb-rNO/strings.xml          |  4 ----
 src/main/res/values-nl/strings.xml              |  4 ----
 src/main/res/values-pl/strings.xml              |  4 ----
 src/main/res/values-pt-rBR/strings.xml          | 16 +++++++++++-----
 src/main/res/values-pt/strings.xml              |  2 --
 src/main/res/values-ro-rRO/strings.xml          |  8 +++++---
 src/main/res/values-ru/strings.xml              |  9 ++++-----
 src/main/res/values-sr/strings.xml              |  4 ----
 src/main/res/values-sv/strings.xml              |  2 --
 src/main/res/values-tr-rTR/strings.xml          |  1 -
 src/main/res/values-uk/strings.xml              |  9 +++------
 src/main/res/values-vi/strings.xml              |  1 -
 src/main/res/values-zh-rCN/strings.xml          |  6 ++----
 src/main/res/values-zh-rTW/strings.xml          |  1 -
 33 files changed, 54 insertions(+), 99 deletions(-)

diff --git a/src/conversations/res/values-it/strings.xml b/src/conversations/res/values-it/strings.xml
index ccaf6889d..51388be7d 100644
--- a/src/conversations/res/values-it/strings.xml
+++ b/src/conversations/res/values-it/strings.xml
@@ -10,4 +10,5 @@ In ogni caso per facilitare puoi creare facilmente un account su conversations.i
     <string name="magic_create_text_on_x">Sei stato invitato su %1$s. Ti guideremo nel procedimento per creare un account.\nQuando scegli %1$s come fornitore sarai in grado di comunicare con utenti di altri fornitori dando loro l\'indirizzo XMPP completo.</string>
     <string name="magic_create_text_fixed">Sei stato invitato su %1$s. È già stato scelto un nome utente per te. Ti guideremo nel procedimento per creare un account.\nSarai in grado di comunicare con utenti di altri fornitori dando loro l\'indirizzo XMPP completo.</string>
     <string name="your_server_invitation">Il tuo invito al server</string>
-    </resources>
\ No newline at end of file
+    <string name="improperly_formatted_provisioning">Codice di approvvigionamento formattato male</string>
+</resources>
\ No newline at end of file
diff --git a/src/conversations/res/values-pt-rBR/strings.xml b/src/conversations/res/values-pt-rBR/strings.xml
index d2cacc255..d233046dc 100644
--- a/src/conversations/res/values-pt-rBR/strings.xml
+++ b/src/conversations/res/values-pt-rBR/strings.xml
@@ -8,4 +8,5 @@
     <string name="magic_create_text_on_x">Você foi convidado para %1$s. Nós iremos guiá-lo ao longo do processo de criação de uma conta.\nAo escolher %1$s como um provedor você conseguirá se comunicar com usuários de outros provedores dando a eles seu endereço XMPP completo.</string>
     <string name="magic_create_text_fixed">Você foi convidado para %1$s. Um nome de usuário já foi escolhido para você. Nós iremos guiá-lo ao longo do processo de criação de uma conta.\nVocê conseguirá se comunicar com usuários de outros provedores dando a eles seu endereço XMPP completo.</string>
     <string name="your_server_invitation">Seu convite do servidor</string>
-    </resources>
\ No newline at end of file
+    <string name="improperly_formatted_provisioning">Código de provisionamento formatado de maneira imprópria</string>
+</resources>
\ No newline at end of file
diff --git a/src/conversations/res/values-ru/strings.xml b/src/conversations/res/values-ru/strings.xml
index 49a3a5ecb..0c6e5a163 100644
--- a/src/conversations/res/values-ru/strings.xml
+++ b/src/conversations/res/values-ru/strings.xml
@@ -8,4 +8,5 @@
     <string name="magic_create_text_on_x">Вас пригласили на %1$s. Мы проведём вас через процесс создания аккаунта. Аккаунт на %1$s позволит вам общаться с пользователями и на этом, и на других серверах, используя ваш полный XMPP-адрес.</string>
     <string name="magic_create_text_fixed">Вас пригласили на %1$s. Вам уже назначили имя пользователя. Мы проведём вас через процесс создания аккаунта. Этот аккаунт позволит вам общаться с пользователями и на этом, и на других серверах, используя ваш полный XMPP-адрес.</string>
     <string name="your_server_invitation">Ваше приглашение</string>
-    </resources>
\ No newline at end of file
+    <string name="improperly_formatted_provisioning">Неправильный формат кода</string>
+</resources>
\ No newline at end of file
diff --git a/src/conversations/res/values-zh-rCN/strings.xml b/src/conversations/res/values-zh-rCN/strings.xml
index 0457d02b4..b1edc3b21 100644
--- a/src/conversations/res/values-zh-rCN/strings.xml
+++ b/src/conversations/res/values-zh-rCN/strings.xml
@@ -8,4 +8,5 @@
     <string name="magic_create_text_on_x">您已受邀参加%1$s。 我们将指导您完成创建帐户的过程。\n选择%1$s作为提供者后，您可以通过提供其他人的完整XMPP地址与其他提供者的用户进行交流。</string>
     <string name="magic_create_text_fixed">您已受邀参加%1$s。 已经为您选择了一个用户名。 我们将指导您完成创建帐户的过程。\n您可以通过向其他提供商的用户提供完整的XMPP地址来与他们进行交流。</string>
     <string name="your_server_invitation">你的服务器邀请</string>
-    </resources>
\ No newline at end of file
+    <string name="improperly_formatted_provisioning">格式不正确的配置代码</string>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index d1395e762..c0a1851cd 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -363,7 +363,6 @@
   <string name="server_info_broken">مكسر</string>
   <string name="pref_presence_settings">حالة الحضور</string>
   <string name="pref_away_when_screen_off">غائب عند إطفاء الشاشة</string>
-  <string name="pref_dnd_on_silent_mode">\"لا تزعجني\" في وضع السكوت</string>
   <string name="pref_show_connection_options">إعدادات الربط الموسعة</string>
   <string name="pref_show_connection_options_summary">عرض اسم المضيف وإعدادات المنفذ عند تنصيب حساب</string>
   <string name="hostname_example">xmpp.example.com</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 6349bd0d8..2b7e749e2 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -368,11 +368,7 @@
   <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_dnd_on_silent_mode">„Отпочиващ“ в тих режим</string>
-  <string name="pref_dnd_on_silent_mode_summary">Преминава в състояние „отсъстващ“, когато устройството е в тих режим</string>
   <string name="pref_treat_vibrate_as_silent">Тих режим при режим на вибриране</string>
-  <string name="pref_treat_vibrate_as_dnd_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>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index b65925ff2..e9d2fa29b 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -366,11 +366,7 @@
   <string name="server_info_broken">Trencat</string>
   <string name="pref_presence_settings">Disponibilitat</string>
   <string name="pref_away_when_screen_off">Fora quan la pantalla està apagada</string>
-  <string name="pref_away_when_screen_off_summary">Marqueu el vostre recurs quan la pantalla estigui desactivada</string>
-  <string name="pref_dnd_on_silent_mode">\"No molesteu\" en modo silenciós</string>
-  <string name="pref_dnd_on_silent_mode_summary">Marqueu el vostre recurs com \"No molesteu\" quan el dispositiu estigui en modo silenciós</string>
   <string name="pref_treat_vibrate_as_silent">Tracteu de vibrar al modo silenciós</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">Marqueu el vostre recurs com \"No molesteu\" quan el dispositiu estigui en vibració</string>
   <string name="pref_show_connection_options">Configuració de connexió estesa</string>
   <string name="pref_show_connection_options_summary">Mostra el nom de la màquina i la configuració del port quan configureu un compte</string>
   <string name="hostname_example">xmpp.example.com</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index c231f9bee..103c03430 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -316,7 +316,6 @@
   <string name="account_status_bind_failure">Bind chyba</string>
   <string name="server_info_broken">Rozbité</string>
   <string name="pref_away_when_screen_off">Pryč při vypnuté obrazovce</string>
-  <string name="pref_away_when_screen_off_summary">Při vypnuté obrazovce označí váš stav jako pryč</string>
   <string name="pref_treat_vibrate_as_silent">Vibrační mód brát stejně jako tichý</string>
   <string name="pref_show_connection_options">Rozšířená nastavení připojení</string>
   <string name="pref_show_connection_options_summary">Zobrazovat nastavení hostname a port  při vytváření účtu</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index d301dabaa..03893364d 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -460,12 +460,12 @@
   <string name="account_status_host_unknown">Der Server ist nicht für diese Domain verantwortlich</string>
   <string name="server_info_broken">Fehlerhaft</string>
   <string name="pref_presence_settings">Status</string>
-  <string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string>
-  <string name="pref_away_when_screen_off_summary">Setzt deinen Status auf \"abwesend\", solange dein Bildschirm abgeschaltet ist</string>
-  <string name="pref_dnd_on_silent_mode">\"Bitte nicht stören\" bei Stummschaltung</string>
-  <string name="pref_dnd_on_silent_mode_summary">Setzt deinen Status auf \"Bitte nicht stören\", solange dein Gerät stummgeschaltet ist </string>
+  <string name="pref_away_when_screen_off">Abwesend bei ausgeschaltetem Bildschirm</string>
+  <string name="pref_away_when_screen_off_summary">Als abwesend anzeigen, wenn der Bildschirm ausgeschaltet ist</string>
+  <string name="pref_dnd_on_silent_mode">Beschäftigt im lautlosen Modus</string>
+  <string name="pref_dnd_on_silent_mode_summary">Als Beschäftigt anzeigen, wenn sich das Gerät im lautlosen Modus befindet</string>
   <string name="pref_treat_vibrate_as_silent">Vibration als Lautlos behandeln</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">Setzt deinen Status auf \"Bitte nicht stören\", solange das Gerät auf Vibration geschaltet ist</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">Als Beschäftigt anzeigen, wenn das Gerät auf Vibration eingestellt ist</string>
   <string name="pref_show_connection_options">Erweiterte Verbindungsoptionen</string>
   <string name="pref_show_connection_options_summary">Hostname- und Port-Optionen bei Kontoeinrichtung anzeigen</string>
   <string name="hostname_example">xmpp.domain.de</string>
@@ -923,6 +923,8 @@
   <string name="could_not_switch_camera">Kamera konnte nicht gewechselt werden</string>
   <string name="add_to_favorites">Zu Favoriten hinzufügen</string>
   <string name="remove_from_favorites">Von Favoriten entfernen</string>
+  <string name="gpx_track">GPX-Strecke</string>
+  <string name="could_not_correct_message">Nachricht konnte nicht korrigiert werden</string>
   <plurals name="view_users">
     <item quantity="one">%1$d Teilnehmer anzeigen</item>
     <item quantity="other">%1$d Teilnehmer anzeigen</item>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index c0be73378..6948212ed 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -402,11 +402,7 @@
   <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_dnd_on_silent_mode">\"Μην ενοχλείτε\" όταν βρίσκεται σε σιωπηρή λειτουργία</string>
-  <string name="pref_dnd_on_silent_mode_summary">Σημειώνει την παρουσία σας ως \"Μην ενοχλείτε\" όταν η συσκευή είναι σε κατάσταση σιωπής</string>
   <string name="pref_treat_vibrate_as_silent">Χρήση της κατάστασης δόνησης ως σιωπηρή κατάσταση</string>
-  <string name="pref_treat_vibrate_as_dnd_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>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index fa8f782cc..1daf200c5 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -461,11 +461,11 @@
   <string name="server_info_broken">Error</string>
   <string name="pref_presence_settings">Disponibilidad</string>
   <string name="pref_away_when_screen_off">Ausente con pantalla apagada</string>
-  <string name="pref_away_when_screen_off_summary">Cambia tu estado a ausente cuando la pantalla está apagada</string>
-  <string name="pref_dnd_on_silent_mode">\"No molestar\" en modo silencio</string>
-  <string name="pref_dnd_on_silent_mode_summary">Cambia tu estado a \"no molestar\" cuando el dispositivo está en modo silencio</string>
+  <string name="pref_away_when_screen_off_summary">Mostrar como Ausente cuando la pantalla esté apagada</string>
+  <string name="pref_dnd_on_silent_mode">Ocupado en modo silencio</string>
+  <string name="pref_dnd_on_silent_mode_summary">Mostrar como Ocupado 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_dnd_summary">Cambia tu estado a \"no molestar\" cuando el dispositivo está en modo vibración</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">Mostrar como Ocupado 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>
@@ -923,6 +923,8 @@
   <string name="could_not_switch_camera">No se ha podido cambiar de cámara</string>
   <string name="add_to_favorites">Añadir a los favoritos</string>
   <string name="remove_from_favorites">Eliminar de favoritos</string>
+  <string name="gpx_track">Recorrido GPX</string>
+  <string name="could_not_correct_message">No se pudo corregir el mensaje</string>
   <plurals name="view_users">
     <item quantity="one">Ver %1$d Participante</item>
     <item quantity="other">Ver %1$d Participantes</item>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 687db96db..bf595e4a5 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -399,11 +399,7 @@
   <string name="server_info_broken">Hondatuta</string>
   <string name="pref_presence_settings">Eskuragarritasuna</string>
   <string name="pref_away_when_screen_off">Urrun pantaila itzalita dagoenean</string>
-  <string name="pref_away_when_screen_off_summary">Zure baliabidea urrun bezala markatzen du pantaila itzalita dagoenean</string>
-  <string name="pref_dnd_on_silent_mode">\"Ez gogaitu\" modu isilean</string>
-  <string name="pref_dnd_on_silent_mode_summary">Zure baliabidea \"Ez gogaitu\" bezala markatzen du gailua modu isilean dagoenean</string>
   <string name="pref_treat_vibrate_as_silent">Dardara modu isila bezala tratatu</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">Zure baliabidea \"Ez gogaitu\" bezala markatzen du gailua dardara moduan dagoenean</string>
   <string name="pref_show_connection_options">Konexioaren ezarpen luzatuak</string>
   <string name="pref_show_connection_options_summary">Ostalariaren izena eta ataka ezarpenak erakutsi kontu bat ezartzerakoan</string>
   <string name="hostname_example">xmpp.adibidea.com</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 0ef628729..a6ebebacf 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -460,11 +460,7 @@
   <string name="server_info_broken">Détraqué</string>
   <string name="pref_presence_settings">Disponibilité</string>
   <string name="pref_away_when_screen_off">Absent quand l\'écran est éteint</string>
-  <string name="pref_away_when_screen_off_summary">Marquer cette ressource comme absente quand l\'écran est éteint.</string>
-  <string name="pref_dnd_on_silent_mode">Indisponible en mode silencieux</string>
-  <string name="pref_dnd_on_silent_mode_summary">Marquer 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_dnd_summary">Marquer cette ressource comme Indisponible quand l\'appareil est en mode vibreur</string>
   <string name="pref_show_connection_options">Paramètres de connexion 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>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index db1eceb20..3cd0f8b7b 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -461,11 +461,11 @@
   <string name="server_info_broken">Roto</string>
   <string name="pref_presence_settings">Disponibilidade</string>
   <string name="pref_away_when_screen_off">Non dispoñible cando se apaga a pantalla</string>
-  <string name="pref_away_when_screen_off_summary">Marca o seu recurso como non dipoñíble cando se apaga a pantalla</string>
-  <string name="pref_dnd_on_silent_mode">\"Non molestar\" en modo silencioso</string>
-  <string name="pref_dnd_on_silent_mode_summary">Marca o seu recurso como \"Non molestar\" cando o dispositivo está en modo silencioso</string>
+  <string name="pref_away_when_screen_off_summary">Mostrar como Fóra cando se apaga a pantalla</string>
+  <string name="pref_dnd_on_silent_mode">En modolo silencioso, Ocupado</string>
+  <string name="pref_dnd_on_silent_mode_summary">Mostrar como Ocupado se o dispositivo está en silencio</string>
   <string name="pref_treat_vibrate_as_silent">Trata a vibración como modo silencioso</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">Marca o seu recurso como \"Non molestar\" cando o dispositivo está en modo vibración</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">Mostrar como Ocupado cando o dispositivo está en vibración</string>
   <string name="pref_show_connection_options">Axustes ampliados de conexión</string>
   <string name="pref_show_connection_options_summary">Mostar axustes de servidor e porto cando se configura unha conta</string>
   <string name="hostname_example">xmpp.exemplo.com</string>
@@ -923,6 +923,8 @@
   <string name="could_not_switch_camera">Non se puido activar a cámara</string>
   <string name="add_to_favorites">Engadir a favoritas</string>
   <string name="remove_from_favorites">Eliminar das favoritas</string>
+  <string name="gpx_track">Ruta GPX</string>
+  <string name="could_not_correct_message">No se pode correxir a mensaxe</string>
   <plurals name="view_users">
     <item quantity="one">Ver %1$d Participante</item>
     <item quantity="other">Ver %1$d Participantes</item>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 055499efe..0aff10aa7 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -443,11 +443,7 @@
   <string name="server_info_broken">Törött</string>
   <string name="pref_presence_settings">Elérhetőség</string>
   <string name="pref_away_when_screen_off">„Távol”, ha a kijelző ki van kapcsolva</string>
-  <string name="pref_away_when_screen_off_summary">„Távol” állapotként jelöli az erőforrást, ha a kijelző ki van kapcsolva</string>
-  <string name="pref_dnd_on_silent_mode">„Ne zavarjon” csendes módban</string>
-  <string name="pref_dnd_on_silent_mode_summary">„Ne zavarjon” állapotként jelöli az erőforrást, ha az eszköz csendes módban van</string>
   <string name="pref_treat_vibrate_as_silent">Rezgés kezelése csendes módként</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">„Ne zavarjon” állapotként jelöli az erőforrást, ha az eszköz rezgő módban van</string>
   <string name="pref_show_connection_options">Kiterjesztett kapcsolati beállítások</string>
   <string name="pref_show_connection_options_summary">Gépnév és port beállításainak megjelenítése egy fiók beállításakor</string>
   <string name="hostname_example">xmpp.example.com</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 7ea9504ca..c42c050d0 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -401,6 +401,7 @@
   <string name="mark_as_read">Segna come già letto</string>
   <string name="pref_input_options">Input</string>
   <string name="pref_enter_is_send">Invio spedisce</string>
+  <string name="pref_enter_is_send_summary">Usa il tasto Invio per spedire il messaggio. Puoi sempre usare Ctrl+Invio per spedire, anche se questa opzione è disattivata.</string>
   <string name="pref_display_enter_key">Mostra il tasto invio</string>
   <string name="pref_display_enter_key_summary">Cambia il tasto delle faccine nel tasto di invio</string>
   <string name="audio">audio</string>
@@ -460,11 +461,7 @@
   <string name="server_info_broken">Rotto</string>
   <string name="pref_presence_settings">Disponibilità</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_dnd_on_silent_mode">\"Non disturbare\" in modalità silenziosa</string>
-  <string name="pref_dnd_on_silent_mode_summary">Segna la tua risorsa come \"Non disturbare\" quando il dispositivo è in modalità silenziosa</string>
   <string name="pref_treat_vibrate_as_silent">Tratta vibrazione come modalità silenziosa</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">Segna la tua risorsa come \"Non disturbare\" quando il dispositivo ha solo la vibrazione</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>
@@ -915,6 +912,7 @@
   <string name="audio_call">Chiamata vocale</string>
   <string name="video_call">Chiamata video</string>
   <string name="help">Aiuto</string>
+  <string name="switch_to_conversation">Passa alla conversazione</string>
   <string name="microphone_unavailable">Il tuo microfono non è disponibile</string>
   <string name="only_one_call_at_a_time">Puoi fare solo una chiamata alla volta.</string>
   <string name="return_to_ongoing_call">Torna alla chiamata in corso</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 2427c5098..e12b2b5b3 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -266,7 +266,6 @@
   <string name="download_failed_could_not_connect">ההורדה נכשלה: נכשל ביצוע חיבור לשרת</string>
   <string name="server_info_broken">לא עובד</string>
   <string name="pref_away_when_screen_off">העבר למצב \"לא נמצא\" כאשר המסך כבוי</string>
-  <string name="pref_away_when_screen_off_summary">מעביר את המכשיר לסטטוס \"לא נמצא\" כאשר המסך כבוי</string>
   <string name="action_renew_certificate">חידוש תעודה</string>
   <string name="error_fetching_omemo_key">שגיאה בתפיסת OMEMO!</string>
   <string name="pref_use_tor">התחבר דרך Tor</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 36f223084..870ac2ac2 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -367,11 +367,7 @@
   <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_dnd_on_silent_mode">サイレントモード時 “邪魔しないで”</string>
-  <string name="pref_dnd_on_silent_mode_summary">デバイスがサイレントモードの時に、リソースを “邪魔しないで” としてマークします</string>
   <string name="pref_treat_vibrate_as_silent">バイブレートをサイレントモードとして扱う</string>
-  <string name="pref_treat_vibrate_as_dnd_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>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index f37f07a33..b8ae856be 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -306,7 +306,6 @@
   <string name="account_status_bind_failure">바인드 실패</string>
   <string name="server_info_broken">손상됨</string>
   <string name="pref_away_when_screen_off">화면이 꺼져있을 경우 자리 비움으로 표시</string>
-  <string name="pref_away_when_screen_off_summary">화면이 꺼져있을 경우에 자리 비움으로 상태를 표시함</string>
   <string name="pref_treat_vibrate_as_silent">진동을 자동으로 처리</string>
   <string name="pref_show_connection_options">확장 연결 설정</string>
   <string name="pref_show_connection_options_summary">계정을 설정할 때 호스트 이름과 포트 설정을 표시합니다</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 4ecdbcbc5..c237a8c79 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -335,11 +335,7 @@
   <string name="account_status_bind_failure">Klarte ikke å binde</string>
   <string name="server_info_broken">Knekt</string>
   <string name="pref_away_when_screen_off">Borte når skjermen er av</string>
-  <string name="pref_away_when_screen_off_summary">Markerer din ressurs som borte når skjermen er avskrudd</string>
-  <string name="pref_dnd_on_silent_mode">“Ikke forstyrr” i stillemodus.</string>
-  <string name="pref_dnd_on_silent_mode_summary">Merker din ressurs som \"Ikke forstyrr\" når enheten er i stillemodus.</string>
   <string name="pref_treat_vibrate_as_silent">Behandle vibrering som stille-modus</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">Merker din ressurs som \"Ikke forstyrr\" når enheten er skrudd til vibrering</string>
   <string name="pref_show_connection_options">Utvidede tilkoblingsinnst.</string>
   <string name="pref_show_connection_options_summary">Vis vertsnavn og portinnstillinger når du setter opp en ny konto</string>
   <string name="hostname_example">xmpp.eksempel.no</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 02f5d2e06..23bea3fa6 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -411,11 +411,7 @@
   <string name="server_info_broken">Gebroken</string>
   <string name="pref_presence_settings">Aanwezigheid</string>
   <string name="pref_away_when_screen_off">Even weg wanneer scherm uit staat</string>
-  <string name="pref_away_when_screen_off_summary">Stelt je bron in als even weg wanneer het scherm uitgeschakeld is</string>
-  <string name="pref_dnd_on_silent_mode">“Niet storen” in stille modus</string>
-  <string name="pref_dnd_on_silent_mode_summary">Stelt je bron in als “Niet storen” 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_dnd_summary">Stelt je bron in als “Niet storen” 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>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 7180d5256..03f17ff5a 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -462,11 +462,7 @@
   <string name="server_info_broken">Zepsute</string>
   <string name="pref_presence_settings">Dostępność</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_dnd_on_silent_mode">\"Nie przeszkadzać\" w trybie cichym</string>
-  <string name="pref_dnd_on_silent_mode_summary">Oznacza twój zasób jako \"Nie przeszkadzać\", gdy urządzenie jest w trybie cichym</string>
   <string name="pref_treat_vibrate_as_silent">Traktuj tryb wibracji jak tryb cichy</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">Oznacza twój zasób jako \"Nie przeszkadzać\", gdy urządzenie jest w trybie wibracji</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.example.com</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index ddddc0310..701f8f21f 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -401,6 +401,7 @@
   <string name="mark_as_read">Marcar como lida</string>
   <string name="pref_input_options">Entrada</string>
   <string name="pref_enter_is_send">Enter envia</string>
+  <string name="pref_enter_is_send_summary">Use a tecla Enter para enviar mensagens. Você sempre pode usar Ctrl+Enter para enviar mensagens, mesmo se essa opção estiver desabilitada.</string>
   <string name="pref_display_enter_key">Exibir o botão Enter</string>
   <string name="pref_display_enter_key_summary">Altera o botão de emoticons para um botão Enter.</string>
   <string name="audio">áudio</string>
@@ -459,12 +460,12 @@
   <string name="account_status_host_unknown">O servidor não responde por esse domínio</string>
   <string name="server_info_broken">Quebrado</string>
   <string name="pref_presence_settings">Disponibilidade</string>
-  <string name="pref_away_when_screen_off">Afastado quando a tela estiver desligada</string>
-  <string name="pref_away_when_screen_off_summary">Define o seu status como afastado quando a tela estiver desligada.</string>
-  <string name="pref_dnd_on_silent_mode">\"Não perturbe\" em modo silencioso</string>
-  <string name="pref_dnd_on_silent_mode_summary">Define o seu status como \"Não perturbe\" quando o dispositivo estiver em modo silencioso</string>
+  <string name="pref_away_when_screen_off">\"Afastado\" quando a tela estiver desligada</string>
+  <string name="pref_away_when_screen_off_summary">Exibe como Afastado quando a tela for desligada</string>
+  <string name="pref_dnd_on_silent_mode">\"Ocupado\" no modo silencioso</string>
+  <string name="pref_dnd_on_silent_mode_summary">Exibe como Ocupado quando o dispositivo estiver em modo silencioso</string>
   <string name="pref_treat_vibrate_as_silent">Considerar o modo de vibração como silencioso</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">Define o seu status como \"Não perturbe\" quando o dispositivo estiver no modo de vibração</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">Exibe como Ocupado quando o dispositivo estiver em vibratório</string>
   <string name="pref_show_connection_options">Configurações detalhadas da conexão</string>
   <string name="pref_show_connection_options_summary">Exibe o nome de host e configurações da porta ao configurar uma conta.</string>
   <string name="hostname_example">xmpp.example.com</string>
@@ -900,6 +901,7 @@
   <string name="rtp_state_ringing">Tocando</string>
   <string name="rtp_state_declined_or_busy">Ocupado</string>
   <string name="rtp_state_connectivity_error">Não foi possível conectar à chamada</string>
+  <string name="rtp_state_connectivity_lost_error">Conexão perdida</string>
   <string name="rtp_state_retracted">Chamada rejeitada</string>
   <string name="rtp_state_application_failure">Falha no aplicativo</string>
   <string name="hang_up">Desligar</string>
@@ -913,12 +915,16 @@
   <string name="missed_call">Chamada perdida</string>
   <string name="audio_call">Chamada de áudio</string>
   <string name="video_call">Chamada de vídeo</string>
+  <string name="help">Ajuda</string>
+  <string name="switch_to_conversation">Alternar para a conversa</string>
   <string name="microphone_unavailable">Seu microfone não está disponível</string>
   <string name="only_one_call_at_a_time">Você só pode ter uma chamada de cada vez</string>
   <string name="return_to_ongoing_call">Retornar para a chamada em andamento</string>
   <string name="could_not_switch_camera">Não foi possível trocar a câmera</string>
   <string name="add_to_favorites">Adicionar aos favoritos</string>
   <string name="remove_from_favorites">Remover dos favoritos</string>
+  <string name="gpx_track">Trilha GPX</string>
+  <string name="could_not_correct_message">Não foi possível corrigir a mensagem</string>
   <plurals name="view_users">
     <item quantity="one">Ver %1$d participante</item>
     <item quantity="other">Ver %1$d participantes</item>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 1a49ef2d9..48ac1af22 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -330,8 +330,6 @@
   <string name="server_info_broken">Existe um problema</string>
   <string name="pref_presence_settings">Disponibilidade</string>
   <string name="pref_away_when_screen_off">Ausente quando o ecrã está desligado</string>
-  <string name="pref_away_when_screen_off_summary">Define o seu recurso como ausente quando o ecrã está desligado</string>
-  <string name="pref_dnd_on_silent_mode">\"Não incomodar\" em modo silencioso</string>
   <string name="pref_treat_vibrate_as_silent">Tratar vibrar como modo silencioso</string>
   <string name="pref_show_connection_options">Definições de conexão</string>
   <string name="pref_show_connection_options_summary">Mostrar as definições do hostname e do porto ao configurar uma conta</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 610cc7d60..bb7f98a4e 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -463,10 +463,10 @@
   <string name="pref_presence_settings">Setări de disponibilitate</string>
   <string name="pref_away_when_screen_off">Plecat când ecranul este oprit</string>
   <string name="pref_away_when_screen_off_summary">Prezintă clientul drept \"Plecat\" atunci când ecranul este oprit</string>
-  <string name="pref_dnd_on_silent_mode">\"Nu deranja\" în modul silențios</string>
-  <string name="pref_dnd_on_silent_mode_summary">Prezintă clientul drept \"Nu deranja\" atunci când dispozitivul este în mod silențios</string>
+  <string name="pref_dnd_on_silent_mode">\"Ocupat\" în modul silențios</string>
+  <string name="pref_dnd_on_silent_mode_summary">Prezintă clientul drept \"Ocupat\" atunci când dispozitivul este în mod silențios</string>
   <string name="pref_treat_vibrate_as_silent">Tratează modul vibrație ca silențios</string>
-  <string name="pref_treat_vibrate_as_dnd_summary">Prezintă clientul drept \"Nu deranja\" atunci când dispozitivul este în mod vibrație</string>
+  <string name="pref_treat_vibrate_as_dnd_summary">Prezintă clientul drept \"Ocupat\" atunci când dispozitivul este în mod vibrație</string>
   <string name="pref_show_connection_options">Opțiuni avansate conexiune</string>
   <string name="pref_show_connection_options_summary">Arată opțiunea de setare a numelui de gazdă și a portului, atunci când se configurează un cont</string>
   <string name="hostname_example">xmpp.exemplu.ro</string>
@@ -931,6 +931,8 @@
   <string name="could_not_switch_camera">Nu s-a putut face comutarea camerei foto</string>
   <string name="add_to_favorites">Adaugă la favorite</string>
   <string name="remove_from_favorites">Înlătură din favorite</string>
+  <string name="gpx_track">Traseu GPX</string>
+  <string name="could_not_correct_message">Nu s-a putut corecta mesajul</string>
   <plurals name="view_users">
     <item quantity="one">Arată %1$d participant</item>
     <item quantity="few">Arată %1$d participanți</item>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 890d2d519..b4328ad26 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -53,7 +53,7 @@
   <string name="change_password_on_server">Изменить пароль на сервере</string>
   <string name="share_with">Поделиться с</string>
   <string name="start_conversation">Начать беседу</string>
-  <string name="invite_contact">Пригласить собеседника</string>
+  <string name="invite_contact">Пригласить контакт</string>
   <string name="invite">Пригласить</string>
   <string name="contacts">Контакты</string>
   <string name="contact">Контакт</string>
@@ -298,6 +298,8 @@
   <string name="hosted_on">размещено на %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="quote">Цитировать</string>
   <string name="paste_as_quote">Вставить как цитату</string>
@@ -399,6 +401,7 @@
   <string name="mark_as_read">Прочитано</string>
   <string name="pref_input_options">Ввод</string>
   <string name="pref_enter_is_send">Отправить на \"Enter\"</string>
+  <string name="pref_enter_is_send_summary">Отправлять сообщения клавишей Enter. Даже если эта опция отключена, сообщение можно отправить, нажав Ctrl+Enter.</string>
   <string name="pref_display_enter_key">Показывать клавишу ввода</string>
   <string name="pref_display_enter_key_summary">Поменять кнопку смайликов на кнопку ввода</string>
   <string name="audio">аудио</string>
@@ -460,11 +463,7 @@
   <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_dnd_on_silent_mode">\"Не беспокоить\" в беззвучном режиме</string>
-  <string name="pref_dnd_on_silent_mode_summary">Устанавливает статус \"Не беспокоить\", когда устройство в беззвучном режиме</string>
   <string name="pref_treat_vibrate_as_silent">Не доступен в режиме вибрации</string>
-  <string name="pref_treat_vibrate_as_dnd_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>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 69102e87b..b89041668 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -349,11 +349,7 @@
   <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_dnd_on_silent_mode">„Не ометај“ у нечујном режиму</string>
-  <string name="pref_dnd_on_silent_mode_summary">Означавање вашег ресурса као „не ометај“ кад је уређај у нечујном режиму</string>
   <string name="pref_treat_vibrate_as_silent">Вибрација је нечујни режим</string>
-  <string name="pref_treat_vibrate_as_dnd_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>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 2929dba55..95c39ba06 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -370,8 +370,6 @@
   <string name="server_info_broken">Sönder</string>
   <string name="pref_presence_settings">Tillgänglighet</string>
   <string name="pref_away_when_screen_off">Status borta när skärmen är av</string>
-  <string name="pref_away_when_screen_off_summary">Sätter din tillgänglighet till borta när skrämen är av</string>
-  <string name="pref_dnd_on_silent_mode">\"Stör ej\" i tyst läge</string>
   <string name="pref_treat_vibrate_as_silent">Hantera vibrationsläge som tyst lä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>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index de11cb3eb..aad58e3a5 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -321,7 +321,6 @@
   <string name="account_status_bind_failure">Bağlantı başarısız</string>
   <string name="server_info_broken">Bozuk</string>
   <string name="pref_away_when_screen_off">Ekran kapandığında uzakta</string>
-  <string name="pref_away_when_screen_off_summary">Ekran kapandığında çevrim içi durum bildiriminizi uzakta olarak değiştirir</string>
   <string name="pref_treat_vibrate_as_silent">Titreşim kipini sessiz kip olarak değerlendir</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 bağlantı noktası seçeneğini göster</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 2f41c4e8c..9d02b5ff9 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -367,7 +367,7 @@
   <string name="enable_all_accounts">Увімкнути всі облікові записи</string>
   <string name="disable_all_accounts">Вимкнути всі облікові записи</string>
   <string name="perform_action_with">Здійснити дію з</string>
-  <string name="no_affiliation">Непов\'язаний</string>
+  <string name="no_affiliation">Учасник</string>
   <string name="no_role">Поза мережею</string>
   <string name="outcast">Вигнанець</string>
   <string name="member">Учасник</string>
@@ -380,7 +380,7 @@
   <string name="remove_owner_privileges">Відкликати права власника</string>
   <string name="remove_from_room">Вилучити з групи</string>
   <string name="remove_from_channel">Прибрати з каналу</string>
-  <string name="could_not_change_affiliation">Неможливо змінити статус приєднання з %s</string>
+  <string name="could_not_change_affiliation">Неможливо змінити статус участі %s</string>
   <string name="ban_from_conference">Заборонити доступ до групи</string>
   <string name="ban_from_channel">Вилучити з каналу</string>
   <string name="removing_from_public_conference">Ви намагаєтеся вилучити %s з публічного каналу. Єдиним способом для цього є заблокувати користувача назавжди.</string>
@@ -401,6 +401,7 @@
   <string name="mark_as_read">Позначити як прочитане</string>
   <string name="pref_input_options">Введення</string>
   <string name="pref_enter_is_send">Enter для надсилання</string>
+  <string name="pref_enter_is_send_summary">Використовувати кнопку Enter для надсилання повідомлень. Якщо цей параметр вимкнено, повідомлення можна надсилати за допомогою комбінації Ctrl-Enter. </string>
   <string name="pref_display_enter_key">Показувати кнопку Enter</string>
   <string name="pref_display_enter_key_summary">Змінити клавішу емоційок на кнопку Enter</string>
   <string name="audio">аудіо</string>
@@ -462,11 +463,7 @@
   <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_dnd_on_silent_mode">\"Не турбувати\" в режимі тиші</string>
-  <string name="pref_dnd_on_silent_mode_summary">Додавати \"Не турбувати\" до імені вашого пристрою, коли пристрій в режимі тиші</string>
   <string name="pref_treat_vibrate_as_silent">Вважати вібро за безшумний режим</string>
-  <string name="pref_treat_vibrate_as_dnd_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>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index ff68350b9..adcd79e96 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -290,7 +290,6 @@
   <string name="account_status_tor_unavailable">Mạng Tor chưa sẵn sàng</string>
   <string name="server_info_broken">Bị hỏng</string>
   <string name="pref_away_when_screen_off">Vắng mặt khi màn hình tắt</string>
-  <string name="pref_away_when_screen_off_summary">Hiện ứng dụng là \'vắng mặt\' khi màn hình tắt</string>
   <string name="action_renew_certificate">Gia hạn chứng nhận</string>
   <string name="error_fetching_omemo_key">Lỗi nhập khoá OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Khoá OMEMO đã xác minh với chứng nhận!</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 27e8cd01c..cdd7e736a 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -401,6 +401,7 @@
   <string name="mark_as_read">标记为已读</string>
   <string name="pref_input_options">输入</string>
   <string name="pref_enter_is_send">点击回车发送</string>
+  <string name="pref_enter_is_send_summary">使用Enter键发送消息。即使禁用此选项，也可以使用Ctrl+Enter发送消息。</string>
   <string name="pref_display_enter_key">显示回车键</string>
   <string name="pref_display_enter_key_summary">将表情键改为回车键</string>
   <string name="audio">音频</string>
@@ -459,11 +460,7 @@
   <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_dnd_on_silent_mode">静音模式时设为“请勿打扰”</string>
-  <string name="pref_dnd_on_silent_mode_summary">当设备静音时标记为“请勿打扰”状态</string>
   <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
-  <string name="pref_treat_vibrate_as_dnd_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>
@@ -907,6 +904,7 @@
   <string name="audio_call">语音通话</string>
   <string name="video_call">视频通话</string>
   <string name="help">帮助</string>
+  <string name="switch_to_conversation">切换到对话</string>
   <string name="microphone_unavailable">麦克风不可用</string>
   <string name="only_one_call_at_a_time">只能同时打一通电话</string>
   <string name="return_to_ongoing_call">返回正在进行的通话</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index c78987f5a..b2323e52f 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -309,7 +309,6 @@
   <string name="account_status_bind_failure">綁定失敗</string>
   <string name="server_info_broken">損壞</string>
   <string name="pref_away_when_screen_off">關閉螢幕時離開</string>
-  <string name="pref_away_when_screen_off_summary">當螢幕關閉時將標記您的資源為離開狀態</string>
   <string name="pref_treat_vibrate_as_silent">靜音模式開啟振動</string>
   <string name="pref_show_connection_options">高級連接設置</string>
   <string name="pref_show_connection_options_summary">註冊帳戶時顯示主機名稱和埠</string>