diff --git a/README.md b/README.md
index 5333324bb..f6e33ab91 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Download ist hier möglich:
 
 Alternativ kannst du den Messenger auch direkt hier von Codeberg unter [Releases](https://codeberg.org/Arne/monocles_chat/releases/latest) herunterladen.
 
-<a rel="me" href="https://monocles.social/@monocles">monocles bei Mastodon</a> 
+<a rel="me" href="https://monocles.social/?node/pubsub.monocles.de/monocles-news">monocles social</a> 
 
 #### monocles chat nightly bzw. beta
 
@@ -42,8 +42,8 @@ nightly oder beta Versionen kann man direkt hier von Codeberg unter [Releases](h
 #### Ich habe Probleme, was soll ich tun?
 Am einfachsten ist es, wenn du unserer Support-Gruppe beitrittst, dort werden deine Probleme mit Sicherheit schnell gelöst. 
 
-Support-Chat: [support@conference.monocles.de](https://interact.monocles.de)     
-[![Users in muc](https://inverse.chat/badge.svg?room=support@conference.monocles.de)](https://interact.monocles.de/)
+Support-Chat: [support@conference.monocles.de](https://monocles.social)     
+[![Users in muc](https://inverse.chat/badge.svg?room=support@conference.monocles.de)](https://monocles.social/)
 
 Development-Chat:  [development@conference.monocles.de](https://interact.monocles.de)     
 [![Users in muc](https://inverse.chat/badge.svg?room=development@conference.monocles.de)](https://interact.monocles.de/)
diff --git a/build.gradle b/build.gradle
index 706042d0c..02833f2a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 
@@ -102,10 +102,7 @@ android {
 
     signingConfigs {
         'monocles chat' {
-            storeFile file('/home/arne/StudioProjects/vogelsang.jks')
-            storePassword 'OcHJ0bq-Ud73'
-            keyAlias 'KeyC'
-            keyPassword 'erKC-aeVN012P7'
+
         }
     }
     compileSdkVersion 29
@@ -115,8 +112,8 @@ android {
         targetSdkVersion 29
 
         //bversionNameSuffix " beta_(2021-06-28)" // " beta_(XXXX-XX-XX)" // activate for beta versions
-        versionCode 102
-        versionName "1.2"
+        versionCode 103
+        versionName "1.3"
         //resConfigs "en"
 
         archivesBaseName += "-$versionName"
@@ -130,7 +127,7 @@ android {
         buildConfigField("String", "UPDATE_URL", '"https://monocles.de/chat/update/"')
         resValue "string", "applicationId", applicationId
         signingConfig signingConfigs.'monocles chat'
-        def appName = "monocles chat"
+        def appName = "chat"
         resValue "string", "app_name", appName
         buildConfigField "String", "APP_NAME", "\"$appName\"";
     }
diff --git a/gradlew b/gradlew
index cccdd3d51..4f906e0c8 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6a..ac1b06f93 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/libs/android-transcoder/build.gradle b/libs/android-transcoder/build.gradle
index 1e9d2550c..2668443e1 100644
--- a/libs/android-transcoder/build.gradle
+++ b/libs/android-transcoder/build.gradle
@@ -12,14 +12,7 @@ dependencies {
 }
 
 android {
-    signingConfigs {
-        'monocles chat libs' {
-            storeFile file('/home/arne/StudioProjects/vogelsang.jks')
-            storePassword 'OcHJ0bq-Ud73'
-            keyAlias 'keyC'
-            keyPassword 'erKC-aeVN012P7'
-        }
-    }
+
     compileSdkVersion 30
     buildToolsVersion '30.0.3'
 
diff --git a/src/main/res/values-az/strings.xml b/src/main/res/values-az/strings.xml
index c99b528bf..3af6ba707 100644
--- a/src/main/res/values-az/strings.xml
+++ b/src/main/res/values-az/strings.xml
@@ -164,7 +164,7 @@
     <string name="account_settings_jabber_id">Jabber-ID</string>
     <string name="account_settings_example_jabber_id">istifadəçininadı@monocles.de</string>
     <string name="password">Şifrə</string>
-    <string name="invalid_jid">Bu etibarlı Jabber-ID deyil</string>
+    <string name="invalid_jid">Bu etibarlı chat address deyil</string>
     <string name="error_out_of_memory">Yaddaş dolub. Şəkil çox böyükdür</string>
     <string name="add_phone_book_text">Ünvan kitabınıza %s əlavə etmək istəyirsiniz?</string>
     <string name="server_info_show_more">Server məlumatı </string>
@@ -453,7 +453,7 @@
     <string name="captcha_required">Captcha tələb olunur</string>
     <string name="captcha_hint">Yuxarıdakı şəkildən mətni daxil edin</string>
     <string name="certificate_chain_is_not_trusted">Sertifikat zənciri etibarlı deyil</string>
-    <string name="jid_does_not_match_certificate">Jabber-ID sertifikatla uyğun gəlmir</string>
+    <string name="jid_does_not_match_certificate">chat address sertifikatla uyğun gəlmir</string>
     <string name="action_renew_certificate">Sertifikatı yeniləyin</string>
     <string name="error_fetching_omemo_key">OMEMO açarını almaq xətası!</string>
     <string name="verified_omemo_key_with_certificate">Sertifikatla təsdiqlənmiş OMEMO açarı!</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 935feaf80..dbec62819 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -148,7 +148,7 @@
     <string name="mgmt_account_delete_confirm_message">Ако изтриете профила си, цялата история на локалните ви разговори ще бъде загубена.\n\nАко изтриете акаунта си от сървъра, целият ви акаунт ще бъде изтрит и от сървъра, няма да можете да влизате повече, докато не регистрирате нов профил. ,</string>
     <string name="attach_record_voice">Запис на глас</string>
     <string name="password">Парола</string>
-    <string name="invalid_jid">Това не е валиден Jabber-ID</string>
+    <string name="invalid_jid">Това не е валиден chat address</string>
     <string name="error_out_of_memory">Недостиг на памет. Снимката е твърде голема</string>
     <string name="add_phone_book_text">Искате ли да добавите%s към адресната си книга?</string>
     <string name="server_info_show_more">Информация за сървъра</string>
@@ -421,7 +421,7 @@
     <string name="unable_to_fetch_mam_prefs">Предпочитанията за архивиране не могат да бъдът извлечени</string>
     <string name="captcha_hint">Въведете текста от снимката по-горе</string>
     <string name="certificate_chain_is_not_trusted">Веригата на сертификата не е надеждна</string>
-    <string name="jid_does_not_match_certificate">Jabber-ID не съответства на сертификата</string>
+    <string name="jid_does_not_match_certificate">chat address не съответства на сертификата</string>
     <string name="action_renew_certificate">Подновяване на сертификата</string>
     <string name="error_fetching_omemo_key">Грешка при извличането на ключа OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Проверен OMEMO ключ със сертификат!</string>
@@ -466,7 +466,7 @@
     <string name="mgmt_account_reconnect">Повторно Свързване</string>
     <string name="welcome_text">...е безплатен и сигурен XMPP / Jabber клиент.</string>
     <string name="magic_create_text">Ще ви преведем през процеса на създаване на акаунт със случайна парола, която можете да използвате или да промените на собствената си парола на следващата страница. \nСлед това ще можете да общувате с потребителите на този и други доставчици, като им дадете пълния си Jabber-ID.</string>
-    <string name="your_full_jid_will_be">Вашият Jabber-ID ще бъде: %s</string>
+    <string name="your_full_jid_will_be">Вашият chat address ще бъде: %s</string>
     <string name="create_account">Създаване на нов акаунт</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Имам профил</string>
@@ -510,7 +510,7 @@
     <string name="remote_server_not_found">Отдалеченият сървър не е намерен</string>
     <string name="error_file_corrupt">Изглежда, че този файл е повреден.</string>
     <string name="unable_to_update_account">Профилът не може да се поднови</string>
-    <string name="report_jid_as_spammer">Подай сигнал за този JID като изпраща нежелани съобщения.</string>
+    <string name="report_jid_as_spammer">Подай сигнал за този chat address като изпраща нежелани съобщения.</string>
     <string name="create_issue">Подайте сигнал за проблем</string>
     <string name="pref_delete_omemo_identities">Изтрийте самоличността на OMEMO</string>
     <string name="pref_delete_omemo_identities_summary">Регенерирайте вашите OMEMO ключове. Всичките ви контакти ще трябва да ви потвърдят отново. Използвайте това само в краен случай.</string>
@@ -615,7 +615,7 @@
     <string name="yesterday">Вчера</string>
     <string name="pref_validate_hostname">Потвърди името на интернет адреса \"хост\" с DNSSEC</string>
     <string name="pref_validate_hostname_summary">Сървърните сертификати, които съдържат потвърденото име на хост, се считат за проверени</string>
-    <string name="certificate_does_not_contain_jid">Сертификатът не съдържа идентификатор Jabber</string>
+    <string name="certificate_does_not_contain_jid">Сертификатът не съдържа идентификатор chat address</string>
     <string name="error_no_keys_to_trust_presence">Нема налични ключове за този контакт.\nУвери се, че имаш абонамент за взаимно присъствие.</string>
     <string name="mark_as_read">Маркирай като прочетено</string>
     <string name="server_info_partial">частично</string>
@@ -680,8 +680,8 @@
     <string name="search_messages">Търсене на съобщения</string>
     <string name="view_conversation">Преглед на разговора</string>
     <string name="web_address">интернет адрес \"web address\"</string>
-    <string name="jabber_id_copied_to_clipboard">Копирай JID в бележника</string>
-    <string name="copy_jabber_id">Копирай JID</string>
+    <string name="jabber_id_copied_to_clipboard">Копирай chat address в бележника</string>
+    <string name="copy_jabber_id">Копирай chat address</string>
     <string name="copy_link">Копирай интернет адрес \"web address\"</string>
     <string name="server_hint">Избери доставчик</string>
     <string name="choose_your_server">Избери вашия доставчик на jabber</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index b38fa11d3..f7d516d5f 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -163,7 +163,7 @@
     <string name="account_settings_jabber_id">Identificador Jabber</string>
     <string name="account_settings_example_jabber_id">nom_d\'usuari@monocles.de</string>
     <string name="password">Contrasenya</string>
-    <string name="invalid_jid">L\'identificador jabber- ID no és vàlid</string>
+    <string name="invalid_jid">L\'identificador chat address no és vàlid</string>
     <string name="error_out_of_memory">Sense memòria. La imatge és massa gran</string>
     <string name="add_phone_book_text">Vols afegir a %s als teus contactes?</string>
     <string name="server_info_show_more">Informació de servidor</string>
@@ -452,7 +452,7 @@
     <string name="captcha_required">Captcha requerit</string>
     <string name="captcha_hint">Introdueix el text de l\'imatge de dalt</string>
     <string name="certificate_chain_is_not_trusted">La cadena de certificats no és de confiança</string>
-    <string name="jid_does_not_match_certificate">L\'identificador Jabber no coincideix amb el del certificat</string>
+    <string name="jid_does_not_match_certificate">L\'identificador Chat no coincideix amb el del certificat</string>
     <string name="action_renew_certificate">Renovar certificat</string>
     <string name="error_fetching_omemo_key">Error buscant clau OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Clau OMEMO amb certificat verificada!</string>
@@ -508,7 +508,7 @@
     <string name="mgmt_account_reconnect">Reconnectar</string>
     <string name="welcome_text">... és una aplicació XMPP/Jabber gratuÏta i segura.</string>
     <string name="magic_create_text">A continuació crearem un perfil amb una contrasenya generada aleatoriàment que podràs utilitzar o canviar a la pàgina següent\i posteriorment podràs posar-t\'he en contacte amb els teus contactes d\'aquest i altres servidors donan-los el teu Jabber-ID.</string>
-    <string name="your_full_jid_will_be">El teu identificador Jabber serà: %s</string>
+    <string name="your_full_jid_will_be">El teu identificador chat serà: %s</string>
     <string name="create_account">Crear compte</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Tinc un compte</string>
@@ -557,7 +557,7 @@
     <string name="remote_server_not_found">Servidor no trobat</string>
     <string name="error_file_corrupt">Aquest arxiu sembla està espatllat</string>
     <string name="unable_to_update_account">No s\'ha pogut actualitzar la compte</string>
-    <string name="report_jid_as_spammer">Reportar a aquest Id Jabber per enviar missatges no desitjats</string>
+    <string name="report_jid_as_spammer">Reportar a aquest chat address per enviar missatges no desitjats</string>
     <string name="create_issue">Notificar una incidència</string>
     <string name="pref_delete_omemo_identities">Eliminar identitats OMEMO</string>
     <string name="pref_delete_omemo_identities_summary">Regenerar les teves claus OMEMO. Tots els seus contactes hauran de verificar-t\'he de nou. Utilitza aquesta opció com últim recurs.</string>
@@ -671,7 +671,7 @@
     <string name="yesterday">Ahir</string>
     <string name="pref_validate_hostname">Validar hostname amb DNSSEC</string>
     <string name="pref_validate_hostname_summary">Els certificats del servidor que contenen el hostname validat són considerats verificats</string>
-    <string name="certificate_does_not_contain_jid">El certificat no conté un identificador Jabber</string>
+    <string name="certificate_does_not_contain_jid">El certificat no conté un identificador chat address</string>
     <string name="error_no_keys_to_trust_presence">No hi ha claus disponibles per a aquest contacte.\n Assegura\'t que teniu subscripció de presència mútua.</string>
     <string name="mark_as_read">Marcar como a llegit</string>
     <string name="server_info_partial">Parcial</string>
@@ -751,8 +751,8 @@
     <string name="gif">GIF</string>
     <string name="view_conversation">Veure conversa</string>
     <string name="web_address">direcció web</string>
-    <string name="jabber_id_copied_to_clipboard">Copiat JID en el portapapers</string>
-    <string name="copy_jabber_id">Copiar JID</string>
+    <string name="jabber_id_copied_to_clipboard">Copiat chat address en el portapapers</string>
+    <string name="copy_jabber_id">Copiar chat address</string>
     <string name="copy_link">Copiar direcció web</string>
     <string name="server_hint">Escollir proveïdor</string>
     <string name="choose_your_server">Escollir el seu servidor jabber</string>
diff --git a/src/main/res/values-ceb/strings.xml b/src/main/res/values-ceb/strings.xml
index 49e3dbf7f..45a06a993 100644
--- a/src/main/res/values-ceb/strings.xml
+++ b/src/main/res/values-ceb/strings.xml
@@ -129,7 +129,7 @@
     <string name="openpgp_has_been_published">Gilunsad ang publikong yawe sa OpenPGP.</string>
     <string name="mgmt_account_are_you_sure">Sure jud ka?</string>
     <string name="attach_record_voice">Irekord ang tingog</string>
-    <string name="invalid_jid">Dili kini balido nga Jabber-ID</string>
+    <string name="invalid_jid">Dili kini balido nga chat address</string>
     <string name="error_out_of_memory">Wala nay memorya. Ang hulagway dako kaayo</string>
     <string name="add_phone_book_text">Gusto nimu i-dagdag %s sa imung address nga libro?</string>
     <string name="server_info_show_more">Serber nga impormasyon</string>
@@ -339,7 +339,7 @@
     <string name="captcha_required">Nanginahanglan ang Captcha</string>
     <string name="captcha_hint">Pagsulod sa teksto gikan sa hulagway sa ibabaw</string>
     <string name="certificate_chain_is_not_trusted">Ang chain nga certificate kay dili kasaligan</string>
-    <string name="jid_does_not_match_certificate">Ang Jabber-ID kay dili mopareha sa sertipiko</string>
+    <string name="jid_does_not_match_certificate">Ang chat address kay dili mopareha sa sertipiko</string>
     <string name="action_renew_certificate">Pag-usab sa sertipiko</string>
     <string name="error_fetching_omemo_key">Sayop nga gikuha ang yawe sa OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Tino-a ang OMEMO nga yawe uban sa sertipiko!</string>
@@ -381,7 +381,7 @@
     <string name="mgmt_account_reconnect">Konek ug balik</string>
     <string name="welcome_text">…usa ka libre ug luwas nga kliyente sa XMPP / Jabber.</string>
     <string name="magic_create_text">Giyahan ka namo sa pag proseso sa pagmugna og usa ka account gamit ang random nga password, nga mahimo nimong gamiton o usbon sa imong kaugalingong password sa sunod nga pahina. \nLabaw kay makahimo ka sa pagpakig-estorya sa mga tiggamit niini ug sa ubang mga tighatag pinaagi sa paghatag kanila sa imong full Jabber-ID.</string>
-    <string name="your_full_jid_will_be">Ang imong Jabber-ID mahimong: %s</string>
+    <string name="your_full_jid_will_be">Ang imong chat address mahimong: %s</string>
     <string name="create_account">Buhat ug bag-o nga account</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="pick_your_username">Pili ug imung username</string>
@@ -421,7 +421,7 @@
     <string name="remote_server_not_found">Ang layo nga server wala makita</string>
     <string name="error_file_corrupt">Ang kini nga file kay basin na korakot.</string>
     <string name="unable_to_update_account">Dili mabag-o ang account</string>
-    <string name="report_jid_as_spammer">I-report kini nga JID isip pagpadala sa mga mensahe nga dili kinahanglan.</string>
+    <string name="report_jid_as_spammer">I-report kini nga chat address isip pagpadala sa mga mensahe nga dili kinahanglan.</string>
     <string name="create_issue">I-report ang usa ka isyu</string>
     <string name="pref_delete_omemo_identities">Pagtangtang sa OMEMO nga mga pakaila sa ilaha</string>
     <string name="pref_delete_omemo_identities_summary">Usaba ang imong mga yawe sa OMEMO. Ang tanan nimong mga contact kinahanglan nga motino kanimo pag-usab. Gamita kini ingon nga usa ka katapusan nga pamaagi.</string>
@@ -486,7 +486,7 @@
     <string name="yesterday">Kagahapon</string>
     <string name="pref_validate_hostname">I-balido ang hostname kauban sa DNSSEC</string>
     <string name="pref_validate_hostname_summary">Ang mga sertipiko sa mga server nga naglangkob sa balido nga hostname giisip nga napamatud-an</string>
-    <string name="certificate_does_not_contain_jid">Ang sertipiko wala maglangkob sa Jabber ID</string>
+    <string name="certificate_does_not_contain_jid">Ang sertipiko wala maglangkob sa chat address</string>
     <string name="error_no_keys_to_trust_presence">Walay mga yawe nga magamit alang niining kontak.\nSiguraduha nga ikaw adunay subskripsyon sa presensya sa usag usa.</string>
     <string name="mark_as_read">Markahi ug nabasa na</string>
     <string name="server_info_partial">parsyal</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index ca868e63b..4333b26ea 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -118,9 +118,9 @@
     <string name="openpgp_has_been_published">Veřejný OpenPGP klíč byl zveřejněn.</string>
     <string name="mgmt_account_are_you_sure">Jste si jisti?</string>
     <string name="attach_record_voice">Nahrát hlas</string>
-    <string name="account_settings_jabber_id">Jabber ID</string>
+    <string name="account_settings_jabber_id">chat address</string>
     <string name="password">Heslo</string>
-    <string name="invalid_jid">Toto není platné Jabber ID</string>
+    <string name="invalid_jid">Toto není platné chat address</string>
     <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
     <string name="add_phone_book_text">Chcete přidat %s do svého adresáře?</string>
     <string name="server_info_show_more">Údaje serveru</string>
@@ -328,7 +328,7 @@
     <string name="captcha_required">Captcha vyžadována</string>
     <string name="captcha_hint">Zadejte text z obrázku výše</string>
     <string name="certificate_chain_is_not_trusted">Řetězec certifikátů není důvěryhodný</string>
-    <string name="jid_does_not_match_certificate">Jabber ID neodpovídá certifikátu</string>
+    <string name="jid_does_not_match_certificate">chat address neodpovídá certifikátu</string>
     <string name="action_renew_certificate">Obnovit certifikát</string>
     <string name="error_fetching_omemo_key">Chyba získání OMEMO klíče!</string>
     <string name="verified_omemo_key_with_certificate">OMEMO klíč ověřen certifikátem!</string>
@@ -351,7 +351,7 @@
     <string name="this_account_is_disabled">Tento účet byl vypnut</string>
     <string name="no_application_to_share_uri">Nebyla nalezena aplikace pro sdílení URI</string>
     <string name="share_uri_with">Sdílet URI s...</string>
-    <string name="your_full_jid_will_be">Vaše celé Jabber ID bude: %s</string>
+    <string name="your_full_jid_will_be">Vaše celé chat address bude: %s</string>
     <string name="create_account">Vytvořit účet</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="pick_your_username">Zadejte své uživatelské jméno</string>
@@ -378,7 +378,7 @@
     <string name="no_permission_to_access_x">Chybí oprávnění přistupovat k %s</string>
     <string name="remote_server_not_found">Vzdálený server nebyl nalezen</string>
     <string name="unable_to_update_account">Nelze aktualizovat účet</string>
-    <string name="report_jid_as_spammer">Nahlásit toto JID jako odesilatele nevyžádaného obsahu.</string>
+    <string name="report_jid_as_spammer">Nahlásit toto chat address jako odesilatele nevyžádaného obsahu.</string>
     <string name="pref_delete_omemo_identities">Smazat OMEMO identity</string>
     <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>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index f10192ac8..f505cd9d2 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -160,10 +160,10 @@
     <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string>
     <string name="mgmt_account_delete_confirm_message">Wenn du dein Profil löschst, gehen deine lokal gespeicherten Chatverläufe verloren.\n\nWenn du dein Profil vom Server löschst, wird dein gesamtes Benutzerprofil ebenfalls gelöscht, du wirst dich nicht mehr einloggen können bis du ein neues Profil erstellt hast.</string>
     <string name="attach_record_voice">Sprache aufzeichnen</string>
-    <string name="account_settings_jabber_id">Jabber-ID</string>
+    <string name="account_settings_jabber_id">Chat Adresse</string>
     <string name="account_settings_example_jabber_id">benutzer@monocles.de</string>
     <string name="password">Passwort</string>
-    <string name="invalid_jid">Ungültige Jabber-ID</string>
+    <string name="invalid_jid">Ungültige Chat Adresse</string>
     <string name="error_out_of_memory">Zu wenig Speicher vorhanden. Das Bild ist zu groß</string>
     <string name="add_phone_book_text">%s zum Telefonbuch hinzufügen?</string>
     <string name="server_info_show_more">Server-Info</string>
@@ -365,7 +365,7 @@
     <string name="kicking_from_conference">Du versuchst %s aus dem Gruppenchat zu entfernen.</string>
     <string name="ban_now">Jetzt ausschließen</string>
     <string name="kick_now">Jetzt entfernen</string>
-    <string name="non_anonymous">JIDs für alle sichtbar machen</string>
+    <string name="non_anonymous">chat Adressen für alle sichtbar machen</string>
     <string name="moderated">Raum wird moderiert</string>
     <string name="you_are_not_participating">Du bist kein Mitglied</string>
     <string name="modified_conference_options">Gruppenchat-Optionen geändert!</string>
@@ -452,7 +452,7 @@
     <string name="captcha_required">Captcha erforderlich</string>
     <string name="captcha_hint">Gib den Text von obigem Bild ein</string>
     <string name="certificate_chain_is_not_trusted">Zertifikat wird nicht vertraut</string>
-    <string name="jid_does_not_match_certificate">Jabber-ID stimmt nicht dem Zertifikat überein</string>
+    <string name="jid_does_not_match_certificate">Chat Adresse stimmt nicht dem Zertifikat überein</string>
     <string name="action_renew_certificate">Zertifikat erneuern</string>
     <string name="error_fetching_omemo_key">Fehler beim Empfang des OMEMO-Fingerabdrucks</string>
     <string name="verified_omemo_key_with_certificate">OMEMO-Fingerabdruck mit Zertifikat verifiziert!</string>
@@ -508,7 +508,7 @@
     <string name="mgmt_account_reconnect">Neu verbinden</string>
     <string name="welcome_text">…ist ein kostenfreier und sicherer XMPP/Jabber Client.</string>
     <string name="magic_create_text">Wir erstellen nun mit dir gemeinsam ein Profil mit einem zufällig generierten Passwort, welches du benutzen oder auf der nächsten Seite ändern kannst\nDanach kannst du mit Kontakten auf diesem und anderen Servern in Kontakt treten, indem du ihnen deine Jabber-ID gibst.</string>
-    <string name="your_full_jid_will_be">Deine Jabber-ID lautet: %s</string>
+    <string name="your_full_jid_will_be">Deine Chat Adresse lautet: %s</string>
     <string name="create_account">Neues Profil erstellen</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Bekomme einen monocles account!</a></string>
     <string name="welcome_existing_account">Ich habe ein Profil</string>
@@ -557,7 +557,7 @@
     <string name="remote_server_not_found">Entfernter Server konnte nicht gefunden werden</string>
     <string name="error_file_corrupt">Die Datei scheint defekt zu sein.</string>
     <string name="unable_to_update_account">Profil kann nicht aktualisiert werden.</string>
-    <string name="report_jid_as_spammer">Melde die JID als Sender unerwünschter Nachrichten.</string>
+    <string name="report_jid_as_spammer">Melde die Chat Adresse als Sender unerwünschter Nachrichten.</string>
     <string name="create_issue">Einen Fehler melden</string>
     <string name="pref_delete_omemo_identities">OMEMO Identitäten zurücksetzen</string>
     <string name="pref_delete_omemo_identities_summary">Regeneriere deine OMEMO-Fingerabdrücke. Alle deine Kontakte müssen dich neu verifizieren. Nutze dies als letzten Ausweg.</string>
@@ -671,7 +671,7 @@
     <string name="yesterday">Gestern</string>
     <string name="pref_validate_hostname">Überprüfe den Hostnamen mit DNSSEC</string>
     <string name="pref_validate_hostname_summary">Serverzertifikate, die den überprüften Hostnamen enthalten, werden als verifiziert betrachtet</string>
-    <string name="certificate_does_not_contain_jid">Zertifikat enthält keine Jabber-ID</string>
+    <string name="certificate_does_not_contain_jid">Zertifikat enthält keine Chat Adresse</string>
     <string name="error_no_keys_to_trust_presence">Für diesen Kontakt sind keine benutzbaren Schlüssel verfügbar.\nStelle sicher, dass du den gegenseitigen Online-Status aktiviert hast.</string>
     <string name="mark_as_read">Als gelesen markieren</string>
     <string name="server_info_partial">teilweise</string>
@@ -751,8 +751,8 @@
     <string name="gif">GIF</string>
     <string name="view_conversation">Unterhaltung öffnen</string>
     <string name="web_address">Webadresse</string>
-    <string name="jabber_id_copied_to_clipboard">JID in die Zwischenablage kopiert</string>
-    <string name="copy_jabber_id">JID kopieren</string>
+    <string name="jabber_id_copied_to_clipboard">Chat Adresse in die Zwischenablage kopiert</string>
+    <string name="copy_jabber_id">Chatadresse kopieren</string>
     <string name="copy_link">Webadresse kopieren</string>
     <string name="server_hint">Wähle Provider</string>
     <string name="choose_your_server">Wähle deinen Jabber Provider</string>
@@ -906,8 +906,8 @@
     <string name="attach">Anhängen</string>
     <string name="delete_from_server">Vom Server löschen</string>
     <string name="go_online_to_delete">Du musst online sein, um dein Profil vom Server löschen zu können.</string>
-    <string name="discover_channels">Kanäle entdecken</string>
-    <string name="search_channels">Kanäle suchen</string>
+    <string name="discover_channels">Chaträume entdecken</string>
+    <string name="search_channels">Chaträume suchen</string>
     <string name="channel_discovery_opt_in_title">Hinweis zum Datenschutz</string>
     <string name="channel_discover_opt_in_message"><![CDATA[Die Kanal-Entdeckung verwendet einen Drittanbieterservice namens <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Wenn du diese Funktion verwendest, werden deine IP-Adresse und deine Suchbegriffe an diesen Dienst übertragen. Weitere Informationen findest du in der <a href="https://search.jabbercat.org/privacy">Datenschutzerklärung</a>.]]></string>
     <string name="action_add_existing_account">Bestehendes Profil hinzufügen</string>
@@ -967,7 +967,7 @@
     <string name="intro_optional_permissions">Optionale Berechtigungen</string>
     <string name="intro_desc_optional_permissions2">Wenn du deinen Standort teilen möchtest, sind Berechtigungen auf deinen Standort erforderlich.\nFür den Versand von Sprachnachrichten ist es erforderlich, Zugang zum Mikrofon zu erhalten.</string>
     <string name="intro_desc_account3">Du hast die Möglichkeit, ein bestehendes Profil zu importieren.\nTippe einfach auf Profil importieren. Wenn Backup-Dateien verfügbar sind, werden diese angezeigt. Wähle ein Profil aus, das importiert werden soll.</string>
-    <string name="intro_desc_start_chatting2">Du kannst auch Gruppenchats - sogenannte MUCs (Multi-User-Chats) - hinzufügen, erstellen oder beitreten. Man unterscheidet zwischen privaten Gruppenchats und öffentlichen Gruppenchats - sogenannten Kanälen.</string>
+    <string name="intro_desc_start_chatting2">Du kannst auch Gruppenchats - sogenannte MUCs (Multi-User-Chats) - hinzufügen, erstellen oder beitreten. Man unterscheidet zwischen privaten Gruppenchats und öffentlichen Gruppenchats - sogenannten Chaträumen.</string>
     <string name="intro_desc_start_chatting3">Herzlichen Glückwunsch!\nJetzt geht\'s los und viel Spaß…</string>
     <string name="intro_privacy">Deine Privatsphäre\nDeine Souveränität</string>
     <string name="intro_desc_privacy">monocles chat wird deine Daten weder verkaufen noch analysieren und du entscheidest, welche Berechtigungen du erteilst.</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index f7dc91736..f49d52162 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -103,7 +103,7 @@
     <string name="attach_record_voice">Εγγραφή φωνής</string>
     <string name="account_settings_jabber_id">ταυτότητα Jabber</string>
     <string name="password">Συνθηματικό</string>
-    <string name="invalid_jid">Αυτή δεν είναι έγκυρη ταυτότητα Jabber</string>
+    <string name="invalid_jid">Αυτή δεν είναι έγκυρη ταυτότητα chat address</string>
     <string name="error_out_of_memory">Πλήρης μνήμη. Η εικόνα είναι πολύ μεγάλη</string>
     <string name="server_info_show_more">Πληροφορίες διακομιστή</string>
     <string name="server_info_mam">XEP-0313: Διαχείριση αρχείου μηνυμάτων</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index f603ac84b..efe30b631 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -163,7 +163,7 @@
     <string name="account_settings_jabber_id">Identificador Jabber</string>
     <string name="account_settings_example_jabber_id">usuario@monocles.de</string>
     <string name="password">Contraseña</string>
-    <string name="invalid_jid">El identificador no es un identificador Jabber válido</string>
+    <string name="invalid_jid">El identificador no es un identificador chat válido</string>
     <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
     <string name="add_phone_book_text">¿Quieres añadir a %s a tus contactos?</string>
     <string name="server_info_show_more">Información de servidor</string>
@@ -452,7 +452,7 @@
     <string name="captcha_required">Captcha requerido</string>
     <string name="captcha_hint">Introduce el texto de la imagen de arriba</string>
     <string name="certificate_chain_is_not_trusted">La cadena de certificados no es de confianza</string>
-    <string name="jid_does_not_match_certificate">El identificador Jabber no coincide con el del certificado</string>
+    <string name="jid_does_not_match_certificate">El identificador chat no coincide con el del certificado</string>
     <string name="action_renew_certificate">Renovar certificado</string>
     <string name="error_fetching_omemo_key">¡Error buscando clave OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">¡Clave OMEMO con certificado verificada!</string>
@@ -508,7 +508,7 @@
     <string name="mgmt_account_reconnect">Reconectar</string>
     <string name="welcome_text">... es una aplicación XMPP/Jabber gratuita y segura.</string>
     <string name="magic_create_text">A continuación crearemos un perfil con una contraseña generada aleatoriamente que podrás utilizar o cambiar en la página siguiente\ny posteriormente podrás ponerte en contacto con los contactos de este y otros servidores dándoles tu Jabber-ID.</string>
-    <string name="your_full_jid_will_be">Tu identificador Jabber será: %s</string>
+    <string name="your_full_jid_will_be">Tu identificador chat será: %s</string>
     <string name="create_account">Crear cuenta</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Tengo una cuenta</string>
@@ -557,7 +557,7 @@
     <string name="remote_server_not_found">Servidor no encontrado</string>
     <string name="error_file_corrupt">Este archivo parece estar dañado.</string>
     <string name="unable_to_update_account">No se ha podido actualizar la cuenta</string>
-    <string name="report_jid_as_spammer">Reportar a este Id Jabber por enviar mensajes no deseados</string>
+    <string name="report_jid_as_spammer">Reportar a este Id chat por enviar mensajes no deseados</string>
     <string name="create_issue">Notificar una incidencia</string>
     <string name="pref_delete_omemo_identities">Eliminar identidades OMEMO</string>
     <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>
@@ -671,7 +671,7 @@
     <string name="yesterday">Ayer</string>
     <string name="pref_validate_hostname">Validar hostname con DNSSEC</string>
     <string name="pref_validate_hostname_summary">Los certificados del servidor que contienen el hostname validado son considerados verificados</string>
-    <string name="certificate_does_not_contain_jid">El certificado no contiene un identificador Jabber</string>
+    <string name="certificate_does_not_contain_jid">El certificado no contiene un identificador chat</string>
     <string name="error_no_keys_to_trust_presence">No hay claves disponibles para este contacto.\n Asegúrate que tenéis suscripción de presencia mutua.</string>
     <string name="mark_as_read">Marcar como leído</string>
     <string name="server_info_partial">Parcial</string>
@@ -751,8 +751,8 @@
     <string name="gif">GIF</string>
     <string name="view_conversation">Ver conversación</string>
     <string name="web_address">dirección web</string>
-    <string name="jabber_id_copied_to_clipboard">Copiado JID en el portapapeles</string>
-    <string name="copy_jabber_id">Copiar JID</string>
+    <string name="jabber_id_copied_to_clipboard">Copiado chat en el portapapeles</string>
+    <string name="copy_jabber_id">Copiar chat</string>
     <string name="copy_link">Copiar dirección web</string>
     <string name="server_hint">Elegir proveedor</string>
     <string name="choose_your_server">Elegir su servidor jabber</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 3c5c014d5..efa3f4d07 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -146,7 +146,7 @@
     <string name="attach_record_voice">Ahotsa grabatu</string>
     <string name="account_settings_jabber_id">Jabber IDa</string>
     <string name="password">Pasahitza</string>
-    <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
+    <string name="invalid_jid">Hau ez da chat address baliodun bat</string>
     <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
     <string name="add_phone_book_text">%s zure helbideen liburura gehitu nahi duzu?</string>
     <string name="server_info_show_more">Zerbitzariaren informazioa</string>
@@ -375,7 +375,7 @@
     <string name="captcha_required">Captcha beharrezkoa da</string>
     <string name="captcha_hint">Sar ezazu goiko irudiko testua</string>
     <string name="certificate_chain_is_not_trusted">Ziurtagiriaren katea ez da fidagarria</string>
-    <string name="jid_does_not_match_certificate">Jabber IDa ez du ziurtagiriarekin bat egiten</string>
+    <string name="jid_does_not_match_certificate">chat addressa ez du ziurtagiriarekin bat egiten</string>
     <string name="action_renew_certificate">Ziurtagiria berriztu</string>
     <string name="error_fetching_omemo_key">Akatsa OMEMO gakoa eskuratzerakoan!</string>
     <string name="verified_omemo_key_with_certificate">OMEMO gakoa ziurtagiriarekin egiaztatuta!</string>
@@ -408,7 +408,7 @@
     <string name="share_uri_with">URIa honekin partekatu...</string>
     <string name="welcome_text">XMPP hornitzaleez independiente den protokolo bat da. Bezero hau aukeratzen duzun edozein XMPP zerbitzariarekin erabili dezakezu.\nHala ere zure erosotasunerako conversations.im¹-en, Conversationsekin bereziki erabiltzeko egokia den hornitzaile batean, kontu bat sortzea erraz egin dugu.</string>
     <string name="magic_create_text">conversations.im-en kontu bat sortzeko prozesuan zehar gidatuko zaitugu.\nconversations.im¹ hornitzaile bezala aukeratzerakoan beste hornitzaileen erabiltzaileekin komunikatzeko gai izango zara haiei zure Jabber ID osoa emanez.</string>
-    <string name="your_full_jid_will_be">Zure Jabber ID osoa %s izango da</string>
+    <string name="your_full_jid_will_be">Zure chat address osoa %s izango da</string>
     <string name="create_account">Kontua sortu</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="pick_your_username">Aukeratu zure erabiltzaile izena</string>
@@ -437,7 +437,7 @@
     <string name="no_permission_to_access_x">%s(e)ra sartzeko baimenik ez</string>
     <string name="remote_server_not_found">Urruneko zerbitzaria ez da aurkitu</string>
     <string name="unable_to_update_account">Ezin izan da kontua eguneratu</string>
-    <string name="report_jid_as_spammer">JIDa nahi gabeko mezuen bidaltzaile gisa salatu</string>
+    <string name="report_jid_as_spammer">chat addressa 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>
@@ -492,7 +492,7 @@
     <string name="yesterday">Atzo</string>
     <string name="pref_validate_hostname">Ostalariaren izena DNSSECekin balioztatu</string>
     <string name="pref_validate_hostname_summary">Ostalariaren izena balioztatuta daukaten zerbitzarien ziurtagiriak egiaztatutzat hartzen dira</string>
-    <string name="certificate_does_not_contain_jid">Ziurtagiriak ez dauka Jabber ID baliodun bat</string>
+    <string name="certificate_does_not_contain_jid">Ziurtagiriak ez dauka chat address baliodun bat</string>
     <string name="error_no_keys_to_trust_presence">Ez dago gako erabilgarririk kontaktu honetarako.\nEgiaztatu ezazu bien arteko presentzia harpidetza duzuela.</string>
     <string name="server_info_partial">partziala</string>
     <string name="no_application_found_to_open_link">Ez da lotura hau ireki dezakeen aplikaziorik aurkitu</string>
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index 2bcf7d4fd..241e9c9f4 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -129,7 +129,7 @@
     <string name="mgmt_account_are_you_sure">Sigurado ka ba?</string>
     <string name="attach_record_voice">I-rekord ang boses</string>
     <string name="password">Ang password</string>
-    <string name="invalid_jid">Hindi ito balido na Jabber-ID</string>
+    <string name="invalid_jid">Hindi ito balido na chat address</string>
     <string name="error_out_of_memory">Wala ng memorya. Ang imahe ay napakalaki</string>
     <string name="add_phone_book_text">Gusto mo bang magdagdag %s sa iyong address book?</string>
     <string name="server_info_show_more">Impormasyon sa server</string>
@@ -363,7 +363,7 @@
     <string name="captcha_required">Kinakailangan ang Captcha</string>
     <string name="captcha_hint">Ipasok ang teksto mula sa imahe sa itaas</string>
     <string name="certificate_chain_is_not_trusted">Ang kadena ng sertipiko ay hindi pinagkakatiwalaan</string>
-    <string name="jid_does_not_match_certificate">Hindi tumutugma ang Jabber-ID sa sertipiko</string>
+    <string name="jid_does_not_match_certificate">Hindi tumutugma ang chat address sa sertipiko</string>
     <string name="action_renew_certificate">I-renew ang sertipiko</string>
     <string name="error_fetching_omemo_key">Error sa pagkuha ng key ng OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Na-verify na key ng OMEMO na may sertipiko!</string>
@@ -401,7 +401,7 @@
     <string name="mgmt_account_reconnect">Kumonekta muli</string>
     <string name="welcome_text">…ay isang libre at ligtas na XMPP / Jabber client.</string>
     <string name="magic_create_text">Gagabayan ka namin sa pamamagitan ng proseso ng paglikha ng isang account na may isang random na password, na maaari mong gamitin o baguhin sa iyong sariling password sa susunod na pahina.\nKaysa makakausap mo ang mga gumagamit ng ito at iba pang mga provider sa pamamagitan ng pagbibigay sa kanila ng iyong buong Jabber-ID.</string>
-    <string name="your_full_jid_will_be">Ang iyong Jabber-ID ay magiging: %s</string>
+    <string name="your_full_jid_will_be">Ang iyong chat address ay magiging: %s</string>
     <string name="create_account">Lumikha ng bagong account</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="pick_your_username">Piliin ang iyong username</string>
@@ -440,7 +440,7 @@
     <string name="remote_server_not_found">Hindi mahanap ang remote na server</string>
     <string name="error_file_corrupt">Mukhang sira ang file na ito.</string>
     <string name="unable_to_update_account">Hindi ma-update ang account</string>
-    <string name="report_jid_as_spammer">Iulat ang JID na ito bilang pagpapadala ng mga hindi gustong mensahe.</string>
+    <string name="report_jid_as_spammer">Iulat ang chat address na ito bilang pagpapadala ng mga hindi gustong mensahe.</string>
     <string name="create_issue">Mag-ulat ng isang isyu</string>
     <string name="pref_delete_omemo_identities">Tanggalin ang mga ID ng OMEMO</string>
     <string name="pref_delete_omemo_identities_summary">Bumaon ang iyong mga key ng OMEMO. Kailangang i-verify muli ang lahat ng iyong mga contact. Gamitin lamang ito bilang isang huling paraan.</string>
@@ -511,7 +511,7 @@
     <string name="yesterday">Kahapon</string>
     <string name="pref_validate_hostname">Patunayan ang hostname sa DNSSEC</string>
     <string name="pref_validate_hostname_summary">Ang mga sertipiko ng server na naglalaman ng validated hostname ay itinuturing na na-verify</string>
-    <string name="certificate_does_not_contain_jid">Ang certificate ay hindi naglalaman ng Jabber ID</string>
+    <string name="certificate_does_not_contain_jid">Ang certificate ay hindi naglalaman ng chat address</string>
     <string name="error_no_keys_to_trust_presence">Walang magagamit na mga susi na magagamit para sa kontak na ito. \nTumiyak na mayroon kang subscription ng magkaparehong presensya.</string>
     <string name="mark_as_read">Markahan bilang nabasa</string>
     <string name="server_info_partial">bahagyang</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index f3786a913..15ab5f807 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -163,7 +163,7 @@
     <string name="account_settings_jabber_id">Identifiant</string>
     <string name="account_settings_example_jabber_id">nomutilisateur@monocles.de</string>
     <string name="password">Mot de passe</string>
-    <string name="invalid_jid">Cet identifiant n\'est pas valide</string>
+    <string name="invalid_jid">Cet chat address n\'est pas valide</string>
     <string name="error_out_of_memory">Plus de mémoire disponible. L’image est trop grande</string>
     <string name="add_phone_book_text">Voulez-vous ajouter %s à votre carnet d’adresses ?</string>
     <string name="server_info_show_more">Infos du serveur</string>
@@ -452,7 +452,7 @@
     <string name="captcha_required">Captcha obligatoire</string>
     <string name="captcha_hint">Entrez le texte à partir de l’image ci-dessus</string>
     <string name="certificate_chain_is_not_trusted">La chaîne de certificats n\'est pas digne de confiance</string>
-    <string name="jid_does_not_match_certificate">L’identifiant Jabber ne correspond pas au certificat</string>
+    <string name="jid_does_not_match_certificate">Le chat address ne correspond pas au certificat</string>
     <string name="action_renew_certificate">Renouveler le certificat</string>
     <string name="error_fetching_omemo_key">Erreur lors de la récupération de la clef OMEMO !</string>
     <string name="verified_omemo_key_with_certificate">Clef OMEMO vérifiée avec un certificat !</string>
@@ -508,7 +508,7 @@
     <string name="mgmt_account_reconnect">Se reconnecter</string>
     <string name="welcome_text">… est un client XMPP/Jabber libre et sécurisé.</string>
     <string name="magic_create_text">Nous vous guiderons pendant toute la procédure de création d’un compte utilisateur/trice avec un mot de passe aléatoire que vous pourrez utiliser ou modifier, au choix, durant la prochaine étape. \nEnsuite vous pourrez communiquer avec les utilisateurs/trices des autres fournisseurs en leur transmettant votre identifiant Jabber complet.</string>
-    <string name="your_full_jid_will_be">Votre identifiant Jabber complet sera : %s</string>
+    <string name="your_full_jid_will_be">Votre identifiant chat address complet sera : %s</string>
     <string name="create_account">Création d’un nouveau compte</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">J’ai déjà un compte</string>
@@ -671,7 +671,7 @@
     <string name="yesterday">Hier</string>
     <string name="pref_validate_hostname">Valider le nom de domaine avec DNSSEC</string>
     <string name="pref_validate_hostname_summary">Les certificats serveur qui comportent le nom de domaine validé sont considérés comme vérifiés.</string>
-    <string name="certificate_does_not_contain_jid">Le certificat ne contient pas d’ID Jabber</string>
+    <string name="certificate_does_not_contain_jid">Le certificat ne contient pas de chat address</string>
     <string name="error_no_keys_to_trust_presence">Il n’y a aucune clef disponible pour ce contact.\nAssurez-vous d’avoir un abonnement de présence mutuelle.</string>
     <string name="mark_as_read">Marquer comme lu</string>
     <string name="server_info_partial">partiel</string>
@@ -751,8 +751,8 @@
     <string name="gif">GIF</string>
     <string name="view_conversation">Afficher la conversation</string>
     <string name="web_address">adresse Web</string>
-    <string name="jabber_id_copied_to_clipboard">JID copié dans le presse-papiers</string>
-    <string name="copy_jabber_id">Copier le JID</string>
+    <string name="jabber_id_copied_to_clipboard">Chat adress copié dans le presse-papiers</string>
+    <string name="copy_jabber_id">Copier le chat address</string>
     <string name="copy_link">Copier l’adresse Web</string>
     <string name="server_hint">Sélectionnez un service</string>
     <string name="choose_your_server">Choisissez votre fournisseur jabber</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index a81121672..c389e73f3 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -164,7 +164,7 @@
     <string name="account_settings_jabber_id">ID Jabber</string>
     <string name="account_settings_example_jabber_id">nome_de_usuario@monocles.de</string>
     <string name="password">Contrasinal</string>
-    <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
+    <string name="invalid_jid">O identificador non é un identificador de chat válido</string>
     <string name="error_out_of_memory">Exceso de memoria. A imaxe é demasiado grande</string>
     <string name="add_phone_book_text">Quere engadir a 1%s a súa libreta de enderezos?</string>
     <string name="server_info_show_more">Info do servidor</string>
@@ -453,7 +453,7 @@
     <string name="captcha_required">Requírese Captcha</string>
     <string name="captcha_hint">Introduza o texto da imaxe superior</string>
     <string name="certificate_chain_is_not_trusted">A cadea de certificados non é de confianza</string>
-    <string name="jid_does_not_match_certificate">O ID Jabber non coincide co certificado</string>
+    <string name="jid_does_not_match_certificate">O chat address non coincide co certificado</string>
     <string name="action_renew_certificate">Anvoar certificado</string>
     <string name="error_fetching_omemo_key">Fallo obtendo a chave OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Verificouse a chave OMEMO co certificado!</string>
@@ -509,7 +509,7 @@
     <string name="mgmt_account_reconnect">Volverse a conectar</string>
     <string name="welcome_text">XMPP é un protocolo independente do proveedor. Pode utilizar este cliente con calquer servidor XMPP que escolla.\nPara a súa conveniencia facilitamos a creación de unha conta en conversations.im; un proveedor especialmente adaptado ao uso con Conversations.</string>
     <string name="magic_create_text">Guiarémola a través do proceso de crear unha conta en conversations.im.\nCando escolla conversations.im como proveedor poderá comunicarse con outras usuarias de outros proveedores que lle proporcionen un ID Jabber completo.</string>
-    <string name="your_full_jid_will_be">O seu ID Jabber será: %s</string>
+    <string name="your_full_jid_will_be">O seu chat address será: %s</string>
     <string name="create_account"><a href="https://ocean.monocles.de/apps/registration/">Crear conta</a></string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Teño unha conta</string>
@@ -558,7 +558,7 @@
     <string name="remote_server_not_found">Non se atopa o servidor remoto</string>
     <string name="error_file_corrupt">Este arquivo parece estar corrupto.</string>
     <string name="unable_to_update_account">Non se puido actualizar a conta</string>
-    <string name="report_jid_as_spammer">Informe de este JID como emisor de mensaxes non desexadas.</string>
+    <string name="report_jid_as_spammer">Informe de este chat adress como emisor de mensaxes non desexadas.</string>
     <string name="create_issue">Informar dun problema</string>
     <string name="pref_delete_omemo_identities">Borrar identidades OMEMO</string>
     <string name="pref_delete_omemo_identities_summary">Rexenerar as súas chaves OMEMO. Todos os seus contactos deberán verificalo de novo. Utilice esto como último recurso.</string>
@@ -672,7 +672,7 @@
     <string name="yesterday">Onte</string>
     <string name="pref_validate_hostname">Validar servidor con DNSSEC</string>
     <string name="pref_validate_hostname_summary">Certificados de servidor que conteñen o servidor validado son considerados de verificados</string>
-    <string name="certificate_does_not_contain_jid">O certificado non contén un ID Jabber</string>
+    <string name="certificate_does_not_contain_jid">O certificado non contén un chat address</string>
     <string name="error_no_keys_to_trust_presence">Non hai chaves utilizables dispoñibles para este contacto.\nAsegúrese de que ambos teñen mutua suscrición de presenza.</string>
     <string name="mark_as_read">Marcar como lido</string>
     <string name="server_info_partial">parcial</string>
@@ -752,8 +752,8 @@
     <string name="gif">GIF</string>
     <string name="view_conversation">Ver conversa</string>
     <string name="web_address">enderezo Web</string>
-    <string name="jabber_id_copied_to_clipboard">Copiar o JID ao portapapeis</string>
-    <string name="copy_jabber_id">Copiar JID</string>
+    <string name="jabber_id_copied_to_clipboard">Copiar o chat adress ao portapapeis</string>
+    <string name="copy_jabber_id">Copiar chat address</string>
     <string name="copy_link">Copiar enderezo web</string>
     <string name="server_hint">Elixir provedor</string>
     <string name="choose_your_server">Elixir o provedor jabber</string>
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index ab8b6f5ec..8f8bed7ee 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -136,7 +136,7 @@
     <string name="attach_record_voice">Rekam suara</string>
     <string name="account_settings_jabber_id">Obrolan-Data diri</string>
     <string name="password">Kata sandi</string>
-    <string name="invalid_jid">Ini bukan ID Jabber yang sah</string>
+    <string name="invalid_jid">Ini bukan chat address yang sah</string>
     <string name="error_out_of_memory">Kehabisan ruang penyimpanan. Gambar terlalu besar</string>
     <string name="add_phone_book_text">Apakah anda ingin menambahkannya%s ke buku alamat anda?</string>
     <string name="server_info_show_more">Informasi server</string>
@@ -379,7 +379,7 @@
     <string name="captcha_required">Captcha dibutuhkan</string>
     <string name="captcha_hint">Masukkan teks dari gambar di atas</string>
     <string name="certificate_chain_is_not_trusted">Rantai sertifikat tidak dipercaya</string>
-    <string name="jid_does_not_match_certificate">Jabber-ID tidak cocok dengan sertifikat</string>
+    <string name="jid_does_not_match_certificate">chat address tidak cocok dengan sertifikat</string>
     <string name="action_renew_certificate">Perpanjang sertifikat</string>
     <string name="error_fetching_omemo_key">Kesalahan mengambil kunci OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Kunci OMEMO yang diverifikasi dengan sertifikat!</string>
@@ -418,7 +418,7 @@
     <string name="mgmt_account_reconnect">Sambung kembali</string>
     <string name="welcome_text">... adalah klien XMPP/Jabber yang bebas dan aman.</string>
     <string name="magic_create_text">Kami akan memandu anda dalam proses pembuatan akun dengan kata kunci acak, yang dapat anda gunakan atau ubah ke kata sandi anda sendiri di halaman berikutnya.\nAnda akan dapat berkomunikasi dengan pengguna dan penyedia layanan lainnya dengan memberi mereka Jabber-ID anda.</string>
-    <string name="your_full_jid_will_be">Jabber-ID anda adalah: %s</string>
+    <string name="your_full_jid_will_be">chat address anda adalah: %s</string>
     <string name="create_account">Buat akun baru</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="pick_your_username">Pilih nama pengguna Anda</string>
@@ -458,7 +458,7 @@
     <string name="remote_server_not_found">Server jarak jauh tidak ditemukan</string>
     <string name="error_file_corrupt">Berkas ini sepertinya rusak.</string>
     <string name="unable_to_update_account">Tidak dapat memperbarui akun</string>
-    <string name="report_jid_as_spammer">Laporkan JID ini sebagai pengiriman pesan yang tidak diinginkan.</string>
+    <string name="report_jid_as_spammer">Laporkan chat address ini sebagai pengiriman pesan yang tidak diinginkan.</string>
     <string name="create_issue">Laporkan masalah</string>
     <string name="pref_delete_omemo_identities">Hapus identitas OMEMO</string>
     <string name="pref_delete_omemo_identities_summary">Regenerasi kunci OMEMO Anda. Semua kontak Anda harus memverifikasi Anda lagi. Gunakan ini hanya sebagai upaya terakhir.</string>
@@ -530,7 +530,7 @@
     <string name="yesterday">Kemarin</string>
     <string name="pref_validate_hostname">Pengesahan nama perangkat dengan DNSSEC</string>
     <string name="pref_validate_hostname_summary">Sertifikat server yang berisi nama perangkat yang divalidasi dianggap telah diverifikasi</string>
-    <string name="certificate_does_not_contain_jid">Sertifikat tidak mengandung ID Jabber</string>
+    <string name="certificate_does_not_contain_jid">Sertifikat tidak mengandung chat address</string>
     <string name="error_no_keys_to_trust_presence">Tidak ada kunci yang bisa digunakan untuk kontak ini.\nPastikan Anda memiliki langganan kehadiran bersama.</string>
     <string name="mark_as_read">Tandai sudah dibaca</string>
     <string name="server_info_partial">sebagian</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 0d740cf45..4a942be0c 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -163,7 +163,7 @@
     <string name="account_settings_jabber_id">ID Jabber</string>
     <string name="account_settings_example_jabber_id">nomeutente@monocles.de</string>
     <string name="password">Password</string>
-    <string name="invalid_jid">Questo non è un ID Jabber valido</string>
+    <string name="invalid_jid">Questo non è un chat address valido</string>
     <string name="error_out_of_memory">Memoria esaurita. L’immagine è tropppo grande</string>
     <string name="add_phone_book_text">Vuoi aggiungere %s alla tua rubrica?</string>
     <string name="server_info_show_more">Info server</string>
@@ -452,7 +452,7 @@
     <string name="captcha_required">Captcha richiesto</string>
     <string name="captcha_hint">Inserisci il testo dell\'immagine soprastante</string>
     <string name="certificate_chain_is_not_trusted">Catena di certificati non affidabile</string>
-    <string name="jid_does_not_match_certificate">L\'ID Jabber non corrisponde al certificato</string>
+    <string name="jid_does_not_match_certificate">Les chat address non corrisponde al certificato</string>
     <string name="action_renew_certificate">Rinnova certificato</string>
     <string name="error_fetching_omemo_key">Errore ricezione chiave OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Chiave OMEMO verificata con certificato!</string>
@@ -508,7 +508,7 @@
     <string name="mgmt_account_reconnect">Riconnetti</string>
     <string name="welcome_text">…è un client XMPP/Jabber libero e sicuro.</string>
     <string name="magic_create_text">Ti guideremo nel processo di creazione di un account con una password casuale, che potrai utilizzare o cambiare con una tua nella prossima pagina. \nSuccessivamente potrai comunicare con altri utenti di questo e altri server dando loro il tuo ID-Jabber completo.</string>
-    <string name="your_full_jid_will_be">Il tuo ID Jabber completo sarà: %s</string>
+    <string name="your_full_jid_will_be">Il tuo ID chat address completo sarà: %s</string>
     <string name="create_account">Crea account</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Ho un account</string>
@@ -557,7 +557,7 @@
     <string name="remote_server_not_found">Server remoto non trovato</string>
     <string name="error_file_corrupt">Questo file sembra essere corrotto.</string>
     <string name="unable_to_update_account">Impossibile aggiornare l\'account</string>
-    <string name="report_jid_as_spammer">Questo JID invia messaggi non richiesti.</string>
+    <string name="report_jid_as_spammer">Questo chat address invia messaggi non richiesti.</string>
     <string name="create_issue">Segnala un problema</string>
     <string name="pref_delete_omemo_identities">Elimina identità OMEMO</string>
     <string name="pref_delete_omemo_identities_summary">Rigenera le tue chiavi OMEMO. I tuoi contatti dovranno verificare un\'altra volta la tua identità. Solo come ultima possibilità.</string>
@@ -671,7 +671,7 @@
     <string name="yesterday">Ieri</string>
     <string name="pref_validate_hostname">Convalida hostname con DNSSEC</string>
     <string name="pref_validate_hostname_summary">I certificati dei server che contengono l\'hostname convalidato sono considerati verificati</string>
-    <string name="certificate_does_not_contain_jid">Il certificato non contiene un ID Jabber</string>
+    <string name="certificate_does_not_contain_jid">Il certificato non contiene un chat address</string>
     <string name="error_no_keys_to_trust_presence">Non ci sono chiavi utilizzabili per questo contatto.\nAssicurati di avere reciprocamente la sottoscrizione sulla presenza.</string>
     <string name="mark_as_read">Segna come letto</string>
     <string name="server_info_partial">parziale</string>
@@ -751,8 +751,8 @@
     <string name="gif">GIF</string>
     <string name="view_conversation">Visualizza conversazione</string>
     <string name="web_address">indirizzo web</string>
-    <string name="jabber_id_copied_to_clipboard">Copiato JID negli appunti</string>
-    <string name="copy_jabber_id">Copia JID</string>
+    <string name="jabber_id_copied_to_clipboard">Copiato chat address negli appunti</string>
+    <string name="copy_jabber_id">Copia chat address</string>
     <string name="copy_link">Copia indirizzo web</string>
     <string name="server_hint">Scegli fornitore</string>
     <string name="choose_your_server">Scegli il tuo fornitore jabber</string>
diff --git a/src/main/res/values-kn/strings.xml b/src/main/res/values-kn/strings.xml
index 6abbf4e28..1630057b3 100644
--- a/src/main/res/values-kn/strings.xml
+++ b/src/main/res/values-kn/strings.xml
@@ -148,7 +148,7 @@
     <string name="attach_record_voice">ಧ್ವನಿ ಮುದ್ರಣ</string>
     <string name="account_settings_jabber_id">XMPP ವಿಳಾಸ</string>
     <string name="password">ಗುಪ್ತಪದ</string>
-    <string name="invalid_jid">ಇದು ಸರಿಯಾದ XMPP ವಿಳಾಸ ಅಲ್ಲ</string>
+    <string name="invalid_jid">ಇದು ಸರಿಯಾದ chat ವಿಳಾಸ ಅಲ್ಲ</string>
     <string name="error_out_of_memory">ಮೆಮೊರಿ(RAM) ತುಂಬೊಯ್ತು. ಚಿತ್ರ ತುಂಬಾ ದೊಡ್ಡದಾಗಿದೆ</string>
     <string name="add_phone_book_text">ಫೊನ್ ವಿಳಾಸ ಪುಸ್ತಕಕ್ಕೆ %s ಸೇರಿಸುವುದೇ?</string>
     <string name="server_info_show_more">ಸರ್ವರ್ ಮಾಹಿತಿ</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 10ad75047..d037b07ad 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -135,7 +135,7 @@
     <string name="attach_record_voice">Stem opnemen</string>
     <string name="account_settings_jabber_id">Jabber-ID:</string>
     <string name="password">Wachtwoord</string>
-    <string name="invalid_jid">Dit is geen geldige Jabber-ID</string>
+    <string name="invalid_jid">Dit is geen geldige chat address</string>
     <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
     <string name="add_phone_book_text">Wil je %s toevoegen aan je adresboek?</string>
     <string name="server_info_show_more">Server-info</string>
@@ -379,7 +379,7 @@
     <string name="captcha_required">Captcha vereist</string>
     <string name="captcha_hint">Voer de tekst van de afbeelding hierboven in</string>
     <string name="certificate_chain_is_not_trusted">Certificaatsketen is niet vertrouwd</string>
-    <string name="jid_does_not_match_certificate">Jabber-ID komt niet overeen met certificaat</string>
+    <string name="jid_does_not_match_certificate">chat address komt niet overeen met certificaat</string>
     <string name="action_renew_certificate">Certificaat vernieuwen</string>
     <string name="error_fetching_omemo_key">Fout bij ophalen van OMEMO-sleutel!</string>
     <string name="verified_omemo_key_with_certificate">OMEMO-sleutel geverifieerd met certificaat!</string>
@@ -418,7 +418,7 @@
     <string name="no_application_to_share_uri">Geen applicatie om URI te delen</string>
     <string name="share_uri_with">URI delen met…</string>
     <string name="mgmt_account_reconnect">Opnieuw verbinden</string>
-    <string name="your_full_jid_will_be">Je volledige Jabber-ID zal %s zijn</string>
+    <string name="your_full_jid_will_be">Je volledige chat address zal %s zijn</string>
     <string name="create_account">Account aanmaken</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Ik heb een account</string>
@@ -453,7 +453,7 @@
     <string name="no_permission_to_access_x">Geen toestemming om toegang te krijgen tot %s</string>
     <string name="remote_server_not_found">Externe server niet gevonden</string>
     <string name="unable_to_update_account">Kan account niet bijwerken</string>
-    <string name="report_jid_as_spammer">Rapporteer deze JID voor het sturen van ongewenste berichten</string>
+    <string name="report_jid_as_spammer">Rapporteer deze chat address voor het sturen van ongewenste berichten</string>
     <string name="create_issue">Een probleem melden</string>
     <string name="pref_delete_omemo_identities">OMEMO-identiteiten verwijderen</string>
     <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>
@@ -546,7 +546,7 @@
     <string name="yesterday">Gisteren</string>
     <string name="pref_validate_hostname">Valideer hostnaam met DNSSEC</string>
     <string name="pref_validate_hostname_summary">Servercertificaten die de gevalideerde hostnaam bevatten worden beschouwd als geverifieerd</string>
-    <string name="certificate_does_not_contain_jid">Certificaat bevat geen Jabber-ID</string>
+    <string name="certificate_does_not_contain_jid">Certificaat bevat geen chat address</string>
     <string name="error_no_keys_to_trust_presence">Er zijn geen bruikbare sleutels beschikbaar voor dit contact.\nZorg dat je allebei op elkaars aanwezigheidsupdates bent geabonneerd.</string>
     <string name="mark_as_read">Als gelezen markeren</string>
     <string name="server_info_partial">gedeeltelijk</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 8b8fbe4c4..c3732448e 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -154,7 +154,7 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
     <string name="account_settings_jabber_id">Jabber ID</string>
     <string name="account_settings_example_jabber_id">nazwaużytkownika@monocles.de</string>
     <string name="password">Hasło</string>
-    <string name="invalid_jid">Wprowadzono niepoprawny Jabber ID</string>
+    <string name="invalid_jid">Wprowadzono niepoprawny chat address</string>
     <string name="error_out_of_memory">Brak pamięci, obraz jest za duży</string>
     <string name="add_phone_book_text">Czy chcesz dodać %s do listy kontaktów?</string>
     <string name="server_info_show_more">Informacje o serwerze</string>
@@ -441,7 +441,7 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
     <string name="captcha_required">Captcha wymagana</string>
     <string name="captcha_hint">Wprowadź tekst z powyższego obrazka</string>
     <string name="certificate_chain_is_not_trusted">Łańcuch certyfikatu nie jest zaufany</string>
-    <string name="jid_does_not_match_certificate">Jabber ID nie odpowiada certyfikatowi</string>
+    <string name="jid_does_not_match_certificate">chat address nie odpowiada certyfikatowi</string>
     <string name="action_renew_certificate">Odnów certyfikat</string>
     <string name="error_fetching_omemo_key">Błąd pobierania klucza OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Zweryfikowano klucz OMEMO z certyfikatem</string>
@@ -496,7 +496,7 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
     <string name="mgmt_account_reconnect">Połącz ponownie</string>
     <string name="welcome_text">... jest darmowym i otwartym klientem sieci XMPP.</string>
     <string name="magic_create_text">Zostaniesz poprowadzony przez proces tworzenia konta z wygenerowanym losowo hasłem, które później możesz zmienić na następnym ekranie.</string>
-    <string name="your_full_jid_will_be">Twój pełen Jabber ID będzie następujący: %s</string>
+    <string name="your_full_jid_will_be">Twój pełen chat address będzie następujący: %s</string>
     <string name="create_account">Utwórz Konto</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Posiadam już konto</string>
@@ -542,7 +542,7 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
     <string name="remote_server_not_found">Nie znaleziono serwera</string>
     <string name="error_file_corrupt">Plik wygląda na uszkodzony.</string>
     <string name="unable_to_update_account">Nie można zaktualizować konta</string>
-    <string name="report_jid_as_spammer">Raportuj ten JID jako rozsyłający spam</string>
+    <string name="report_jid_as_spammer">Raportuj ten chat address jako rozsyłający spam</string>
     <string name="create_issue">Zgłoś problem</string>
     <string name="pref_delete_omemo_identities">Usuń tożsamości OMEMO</string>
     <string name="pref_delete_omemo_identities_summary">Wygeneruj jeszcze raz klucze OMEMO. Wszystkie Twoje kontakty będą musiały zweryfikować Twoje nowe klucze. Użyj tego tylko w ostateczności.</string>
@@ -663,7 +663,7 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
     <string name="yesterday">Wczoraj</string>
     <string name="pref_validate_hostname">Potwierdź nazwę hosta za pomocą DNSSEC</string>
     <string name="pref_validate_hostname_summary">Certyfikaty serwera posiadające prawidłową nazwę hosta są uznawane za zweryfikowane</string>
-    <string name="certificate_does_not_contain_jid">Certyfikat nie zawiera Jabber ID</string>
+    <string name="certificate_does_not_contain_jid">Certyfikat nie zawiera chat address</string>
     <string name="error_no_keys_to_trust_presence">Brak dostępnych kluczy dla tego kontaktu.\nUpewnij się, że wzajemnie powiadamiacie się o obecności.</string>
     <string name="mark_as_read">Przeczytane</string>
     <string name="server_info_partial">częściowo</string>
@@ -738,8 +738,8 @@ Nie spowoduje to usunięcia kopii wiadomości przechowywanych na innych urządze
     <string name="search_messages">Znajdź Wiadomość</string>
     <string name="view_conversation">Wyświetl komunikację</string>
     <string name="web_address">adres internetowy</string>
-    <string name="jabber_id_copied_to_clipboard">Skopiowano JID do schowka</string>
-    <string name="copy_jabber_id">Skopiuj JID</string>
+    <string name="jabber_id_copied_to_clipboard">Skopiowano chat address do schowka</string>
+    <string name="copy_jabber_id">Skopiuj chat address</string>
     <string name="copy_link">Skopiuj adres interenetowy</string>
     <string name="server_hint">Wybierz dostawce</string>
     <string name="choose_your_server">Wybierz dostawcę Jabber</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 93c928d3b..79fab1f6c 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -118,7 +118,7 @@
     <string name="attach_record_voice">Gravar voz</string>
     <string name="account_settings_jabber_id">ID Jabber</string>
     <string name="password">Palavra-passe</string>
-    <string name="invalid_jid">Esse não é um ID Jabber válido</string>
+    <string name="invalid_jid">Esse não é um chat address válido</string>
     <string name="error_out_of_memory">Memória insuficiente. A imagem é muito grande</string>
     <string name="add_phone_book_text">Deseja adicionar %s aos seus contactos?</string>
     <string name="server_info_show_more">Informações do servidor</string>
@@ -324,7 +324,7 @@
     <string name="unable_to_fetch_mam_prefs">Não foi possível obter as preferências de arquivamento</string>
     <string name="captcha_required">Captcha obrigatório</string>
     <string name="certificate_chain_is_not_trusted">A cadeia de certificados não é confiável</string>
-    <string name="jid_does_not_match_certificate">O ID Jabber não coincide com o certificado</string>
+    <string name="jid_does_not_match_certificate">O chat address não coincide com o certificado</string>
     <string name="action_renew_certificate">Renovar certificado</string>
     <string name="error_fetching_omemo_key">Erro ao obter a chave OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">A chave OMEMO foi verificada com o certificado!</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 87ec2ef57..c32ce1778 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -138,9 +138,9 @@
     <string name="openpgp_has_been_published">Cheia publică OpenPGP a fost publicată.</string>
     <string name="mgmt_account_are_you_sure">Sigur doriți asta?</string>
     <string name="attach_record_voice">Înregistrare voce</string>
-    <string name="account_settings_jabber_id">Adresă XMPP</string>
+    <string name="account_settings_jabber_id">Adresă chat</string>
     <string name="password">Parolă</string>
-    <string name="invalid_jid">Aceasta nu este o adresă XMPP valabilă</string>
+    <string name="invalid_jid">Aceasta nu este o adresă chat valabilă</string>
     <string name="error_out_of_memory">Memorie epuizată. Imaginea este prea mare.</string>
     <string name="add_phone_book_text">Vreți să adăugați pe %s în lista de contacte?</string>
     <string name="server_info_show_more">Informații server</string>
@@ -409,7 +409,7 @@
     <string name="captcha_required">Text captcha de verificare necesar</string>
     <string name="captcha_hint">Introduceți textul din imaginea de mai sus</string>
     <string name="certificate_chain_is_not_trusted">Seria de certificate nu este de încredere</string>
-    <string name="jid_does_not_match_certificate">Adresa XMPP nu corespunde cu certificatul</string>
+    <string name="jid_does_not_match_certificate">Adresa chat nu corespunde cu certificatul</string>
     <string name="action_renew_certificate">Înnoiește certificatul</string>
     <string name="error_fetching_omemo_key">Eroare la preluarea cheii OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Verifica cheia OMEMO cu un certificat</string>
@@ -457,7 +457,7 @@
     <string name="mgmt_account_reconnect">Reconectare</string>
     <string name="welcome_text">…este un client XMPP/Jabber gratis și securizat.</string>
     <string name="magic_create_text">Vă vom ghida prin procesul de creare al unui cont cu o parolă aleatoare, pe care o puteți păstra sau schimba pe pagina următoare.\nApoi veți putea comunica cu utilizatorii acestui furnizor sau ai altor furnizori oferindu-le ID-ul dumneavoastră Jabber.</string>
-    <string name="your_full_jid_will_be">Adresa dumneavoastră XMPP completă va fi: %s</string>
+    <string name="your_full_jid_will_be">Adresa dumneavoastră chat completă va fi: %s</string>
     <string name="create_account">Creează cont</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Am un cont</string>
@@ -593,7 +593,7 @@
     <string name="yesterday">Ieri</string>
     <string name="pref_validate_hostname">Validează numele domeniului cu ajutorul DNSSEC</string>
     <string name="pref_validate_hostname_summary">Certificatele serverelor care conțin nume de domenii validate sunt considerate verificate</string>
-    <string name="certificate_does_not_contain_jid">Certificatul nu conține o adresă XMPP</string>
+    <string name="certificate_does_not_contain_jid">Certificatul nu conține o adresă chat</string>
     <string name="error_no_keys_to_trust_presence">Nu există chei disponibile ce pot fi folosite pentru acest contact.\nAsigurați-vă că ați activat trimiterea de actualizări de prezență reciproce.</string>
     <string name="mark_as_read">Marchează ca citit</string>
     <string name="server_info_partial">parțial</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 6f351ee8a..c022fd844 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -165,7 +165,7 @@
     <string name="account_settings_jabber_id">Jabber-ID</string>
     <string name="account_settings_example_jabber_id">username@monocles.de</string>
     <string name="password">Пароль</string>
-    <string name="invalid_jid">Недействительный Jabber-ID</string>
+    <string name="invalid_jid">Недействительный chat address</string>
     <string name="error_out_of_memory">Недостаточно памяти. Изображение слишком большое</string>
     <string name="add_phone_book_text">Хотите добавить %s в Вашу адресную книгу?</string>
     <string name="server_info_show_more">Информация о сервере</string>
@@ -456,7 +456,7 @@
     <string name="captcha_required">Требуется CAPTCHA</string>
     <string name="captcha_hint">Введите текст с картинки выше</string>
     <string name="certificate_chain_is_not_trusted">Связь сертификата не является доверенной</string>
-    <string name="jid_does_not_match_certificate">Jabber-ID не соответствует сертификату</string>
+    <string name="jid_does_not_match_certificate">chat address не соответствует сертификату</string>
     <string name="action_renew_certificate">Обновить сертификат</string>
     <string name="error_fetching_omemo_key">Не удалось получить ключ OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Ключ OMEMO был подтвержден сертификатом!</string>
@@ -514,7 +514,7 @@
     <string name="mgmt_account_reconnect">Переподключить</string>
     <string name="welcome_text">...это свободный и безопасный XMPP/Jabber клиент.</string>
     <string name="magic_create_text">Мы поможем Вам создать учетную запись со случайным паролем, который Вы сможете использовать или изменить на свой собственный пароль на следующей странице. \nВы сможете общаться с пользователями этого и других серверов, сообщив им свой полный Jabber-ID.</string>
-    <string name="your_full_jid_will_be">Ваш Jabber-ID был: %s</string>
+    <string name="your_full_jid_will_be">Ваш chat address был: %s</string>
     <string name="create_account">Создание нового учетной записи</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">У меня есть аккаунт</string>
@@ -563,7 +563,7 @@
     <string name="remote_server_not_found">Сервер не найден</string>
     <string name="error_file_corrupt">Возможно, файл поврежден.</string>
     <string name="unable_to_update_account">Не удается изменить учетную запись</string>
-    <string name="report_jid_as_spammer">Пометить этот JID, как отправляющий нежелательные сообщения.</string>
+    <string name="report_jid_as_spammer">Пометить этот chat address, как отправляющий нежелательные сообщения.</string>
     <string name="create_issue">Сообщить об ошибке</string>
     <string name="pref_delete_omemo_identities">Удалить OMEMO-отпечатки</string>
     <string name="pref_delete_omemo_identities_summary">Создать новые OMEMO ключи. Вашим контактам нужно будет проверить вашу личность снова. Используйте в случае крайней необходимости.</string>
@@ -691,7 +691,7 @@
     <string name="yesterday">Вчера</string>
     <string name="pref_validate_hostname">Проверять имя хоста через DNSSEC</string>
     <string name="pref_validate_hostname_summary">Сертификаты сервера, содержащие проверенное имя хоста, считаются проверенными</string>
-    <string name="certificate_does_not_contain_jid">Сертификат не содержит Jabber ID</string>
+    <string name="certificate_does_not_contain_jid">Сертификат не содержит chat address</string>
     <string name="error_no_keys_to_trust_presence">Для этого контакта не существует доступных ключей.\nMake убедитесь, что у вас есть подписка на взаимное присутствие.</string>
     <string name="mark_as_read">Отметить как прочитанное</string>
     <string name="server_info_partial">частичный</string>
@@ -771,8 +771,8 @@
     <string name="gif">GIF</string>
     <string name="view_conversation">Просмотр беседы</string>
     <string name="web_address">веб-адрес</string>
-    <string name="jabber_id_copied_to_clipboard">Скопировать JID в буфер обмена</string>
-    <string name="copy_jabber_id">Копировать JID</string>
+    <string name="jabber_id_copied_to_clipboard">Скопировать chat address в буфер обмена</string>
+    <string name="copy_jabber_id">Копировать chat address</string>
     <string name="copy_link">Копировать веб-адрес</string>
     <string name="server_hint">Выбрать сервер</string>
     <string name="choose_your_server">Выберите jabber-сервер</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 166a1ee90..82ce79cb9 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -122,7 +122,7 @@
     <string name="mgmt_account_are_you_sure">Är du säker?</string>
     <string name="attach_record_voice">Spela in röst</string>
     <string name="password">Lösenord</string>
-    <string name="invalid_jid">Detta är inte ett korrekt Jabber-ID</string>
+    <string name="invalid_jid">Detta är inte ett korrekt chat address</string>
     <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
     <string name="add_phone_book_text">Vill du lägga till %s i din enhets kontakter?</string>
     <string name="server_info_show_more">Server-info</string>
@@ -335,7 +335,7 @@
     <string name="captcha_required">CAPTCHA krävs</string>
     <string name="captcha_hint">Skriv i texten från bilden ovan</string>
     <string name="certificate_chain_is_not_trusted">Certifikatskedjan är inte betrodd</string>
-    <string name="jid_does_not_match_certificate">Jabber-ID matchar inte certifikat</string>
+    <string name="jid_does_not_match_certificate">chat address matchar inte certifikat</string>
     <string name="action_renew_certificate">Förnya certifikat</string>
     <string name="error_fetching_omemo_key">Misslyckades med att hämta OMEMO-nyckel!</string>
     <string name="verified_omemo_key_with_certificate">Verifierade OMEMO-nyckel med certifikat!</string>
@@ -363,7 +363,7 @@
     <string name="this_account_is_disabled">Du har deaktiverat detta konto</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="your_full_jid_will_be">Ditt jabber ID blir: %s</string>
+    <string name="your_full_jid_will_be">Ditt chat address blir: %s</string>
     <string name="create_account">Skapa konto</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="pick_your_username">Välj användarnamn</string>
@@ -390,7 +390,7 @@
     <string name="no_permission_to_access_x">Saknar rättigheter för access till %s</string>
     <string name="remote_server_not_found">Fjärrserver hittas inte</string>
     <string name="unable_to_update_account">Kan inte uppdatera konto</string>
-    <string name="report_jid_as_spammer">Rapportera detta JID för skickande av oönskade meddelanden.</string>
+    <string name="report_jid_as_spammer">Rapportera detta chat address för skickande av oönskade meddelanden.</string>
     <string name="pref_delete_omemo_identities">Ta bort OMEMO identiteter</string>
     <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>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index bf4bb0ae9..a63992205 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -160,7 +160,7 @@
     <string name="account_settings_jabber_id">Jabber Kimliği</string>
     <string name="account_settings_example_jabber_id">kullanıcıadı@monocles.de</string>
     <string name="password">Parola</string>
-    <string name="invalid_jid">Bu geçerli bir Jabber-ID değil</string>
+    <string name="invalid_jid">Bu geçerli bir chat address değil</string>
     <string name="error_out_of_memory">Bellek yetersiz. Görüntü çok büyük</string>
     <string name="add_phone_book_text">Adres defterinize %s\'i eklemek istiyor musunuz?</string>
     <string name="server_info_show_more">Sunucu bilgisi</string>
@@ -426,7 +426,7 @@
     <string name="captcha_required">Captcha gerekiyor</string>
     <string name="captcha_hint">Yukarıdaki resimde bulunan metni giriniz</string>
     <string name="certificate_chain_is_not_trusted">Sertifika güvenilir değil</string>
-    <string name="jid_does_not_match_certificate">Jabber-ID sertifika ile eşleşmiyor</string>
+    <string name="jid_does_not_match_certificate">chat address sertifika ile eşleşmiyor</string>
     <string name="action_renew_certificate">Sertifikayı yenile</string>
     <string name="error_fetching_omemo_key">OMEMO anahtarı getirilirken hata oluştu!</string>
     <string name="verified_omemo_key_with_certificate">Sertifikalı onaylanmış OMEMO anahtarı!</string>
@@ -478,7 +478,7 @@
     <string name="mgmt_account_reconnect">Yeniden bağlan</string>
     <string name="welcome_text">... ücretsiz ve güvenli bir XMPP/Jabber istemcisidir.</string>
     <string name="magic_create_text">Bir sonraki sayfada kendi şifrenizi değiştirebileceğiniz veya kullanabileceğiniz rastgele bir şifreyle bir hesap oluşturma sürecinde size yol göstereceğiz.\n Bu kişilere ve diğer sağlayıcıların kullanıcılarına tam Jabber Kimliği vererek iletişime geçebileceksiniz.</string>
-    <string name="your_full_jid_will_be">Jabber-ID\'niz şu şekilde olacaktır: %s</string>
+    <string name="your_full_jid_will_be">chat address\'niz şu şekilde olacaktır: %s</string>
     <string name="create_account">Yeni hesap oluştur</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Bir hesabım var</string>
@@ -520,7 +520,7 @@
     <string name="remote_server_not_found">Uzak sunucu bulunamadı</string>
     <string name="error_file_corrupt">Dosya bozuk gibi görünüyor.</string>
     <string name="unable_to_update_account">Hesap güncellenemiyor</string>
-    <string name="report_jid_as_spammer">Bu JID\'i istenmeyen mesajlar gönderdiğini bildirin.</string>
+    <string name="report_jid_as_spammer">Bu chat address\'i istenmeyen mesajlar gönderdiğini bildirin.</string>
     <string name="create_issue">Bir sorun bildir</string>
     <string name="pref_delete_omemo_identities">OMEMO kimliklerini sil</string>
     <string name="pref_delete_omemo_identities_summary">OMEMO anahtarlarınızı yeniden oluşturun. Tüm kişilerin seni tekrar doğrulaması gerekecek. Bunu son çözüm olarak kullanın.</string>
@@ -619,7 +619,7 @@
     <string name="yesterday">Dün</string>
     <string name="pref_validate_hostname">DNSSEC ile sunucu adını doğrula</string>
     <string name="pref_validate_hostname_summary">Onaylanmış ana makine adını içeren sunucu sertifikaları doğrulanmış olarak kabul edilir</string>
-    <string name="certificate_does_not_contain_jid">Sertifika bir Jabber ID içermiyor</string>
+    <string name="certificate_does_not_contain_jid">Sertifika bir chat address içermiyor</string>
     <string name="error_no_keys_to_trust_presence">Bu kişinin kullanabileceği kullanılabilir bir anahtar yok.\n Karşılıklı abone olduğunuzdan emin olun.</string>
     <string name="mark_as_read">Okundu olarak işaretle</string>
     <string name="server_info_partial">kısmi</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 68d3c1e0b..b04bb7887 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -147,9 +147,9 @@
     <string name="mgmt_account_are_you_sure">Ви впевнені?</string>
     <string name="mgmt_account_delete_confirm_message">Якщо ви вилучите ваш обліковий запис, ви втратите усю історію спілкування на пристрої.\n\nЯкщо ви вилучите ваш обліковий запис з сервера, то його буде вилучено також на сервері й ви не матимете змоги виходити, луки не зареєструєте новий обліковий запис.</string>
     <string name="attach_record_voice">Записати голос</string>
-    <string name="account_settings_jabber_id">Адреса XMPP</string>
+    <string name="account_settings_jabber_id">Адреса chat address</string>
     <string name="password">Пароль</string>
-    <string name="invalid_jid">Це неправильна адреса XMPP</string>
+    <string name="invalid_jid">Це неправильна адреса chat address</string>
     <string name="error_out_of_memory">Пам\'ять вичерпано. Завелике зображення.</string>
     <string name="add_phone_book_text">Бажаєте додати %s до своєї книги контактів?</string>
     <string name="server_info_show_more">Інформація про сервер</string>
@@ -432,7 +432,7 @@
     <string name="captcha_required">Потрібно вирішити головоломку</string>
     <string name="captcha_hint">Уведіть текст із зображення вище</string>
     <string name="certificate_chain_is_not_trusted">Ланцюжок сертифікатів не довірений</string>
-    <string name="jid_does_not_match_certificate">XMPP адрес не відповідає сертифікату</string>
+    <string name="jid_does_not_match_certificate">chat address адрес не відповідає сертифікату</string>
     <string name="action_renew_certificate">Оновити сертифікат</string>
     <string name="error_fetching_omemo_key">Помилка отримання ключа OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Ключ OMEMO звірено з сертифікатом!</string>
@@ -485,7 +485,7 @@
     <string name="mgmt_account_reconnect">Перез’єднатися</string>
     <string name="welcome_text">…вільний та безпечний клієнт XMPP/Jabber.</string>
     <string name="magic_create_text">Ми допоможемо вам створити обліковий запис. На наступній сторінці ви зможете змінити автоматично зґенерований пароль.\nПодалі ви зможете спілкуватися з користувачами вашого чи будь-якого іншого, для цього потрібно буде надати користувачеві вашу повну адресу XMPP.</string>
-    <string name="your_full_jid_will_be">Ваша повна адреса XMPP буде такою: %s</string>
+    <string name="your_full_jid_will_be">Ваша повна адреса chat address буде такою: %s</string>
     <string name="create_account">Створити обліковий запис</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">Я маю обліковий запис</string>
@@ -530,7 +530,7 @@
     <string name="remote_server_not_found">Віддалений сервер не знайдено</string>
     <string name="error_file_corrupt">Схоже, що файл було пошкоджено.</string>
     <string name="unable_to_update_account">Неможливо оновити обліковий запис</string>
-    <string name="report_jid_as_spammer">Надіслати скаргу про те, що контакт з цим ID розсилає спам.</string>
+    <string name="report_jid_as_spammer">Надіслати скаргу про те, що контакт з цим chat address розсилає спам.</string>
     <string name="create_issue">Повідомити про помилку</string>
     <string name="pref_delete_omemo_identities">Вилучити ідентифікаційні дані OMEMO</string>
     <string name="pref_delete_omemo_identities_summary">Створити наново ваші ключі OMEMO. Усі ваші контакти будуть змушені підтвердити вас знову. Використовуйте це, лише якщо немає іншого вибору.</string>
@@ -650,7 +650,7 @@
     <string name="yesterday">Учора</string>
     <string name="pref_validate_hostname">Перевіряти адресу за допомогою DNSSEC</string>
     <string name="pref_validate_hostname_summary">Сертифікати, які містять підтверджену адресу хосту, вважаються перевіреними</string>
-    <string name="certificate_does_not_contain_jid">Сертифікат не містить адресу XMPP</string>
+    <string name="certificate_does_not_contain_jid">Сертифікат не містить адресу chat address</string>
     <string name="error_no_keys_to_trust_presence">Для цього контакту відсутні потрібні ключі.\nПеревірте, що ви обмінялися інформацією про доступність.</string>
     <string name="mark_as_read">Позначити як прочитане</string>
     <string name="server_info_partial">частково</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index bfb83d047..1b8370a48 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -150,7 +150,7 @@
     <string name="attach_record_voice">语音录制</string>
     <string name="account_settings_jabber_id">Jabber用户名</string>
     <string name="password">密码</string>
-    <string name="invalid_jid">Jabber用户名无效</string>
+    <string name="invalid_jid">chat address用户名无效</string>
     <string name="error_out_of_memory">内存不足。图像太大了</string>
     <string name="add_phone_book_text">您想将%s添加到地址簿吗？</string>
     <string name="server_info_show_more">服务器信息</string>
@@ -431,7 +431,7 @@
     <string name="captcha_required">需要验证码</string>
     <string name="captcha_hint">输入图中的文字</string>
     <string name="certificate_chain_is_not_trusted">证书链不受信任</string>
-    <string name="jid_does_not_match_certificate">Jabber用户名与证书不匹配</string>
+    <string name="jid_does_not_match_certificate">chat address用户名与证书不匹配</string>
     <string name="action_renew_certificate">续签证书</string>
     <string name="error_fetching_omemo_key">获取OMEMO密钥时出错！</string>
     <string name="verified_omemo_key_with_certificate">已通过证书验证OMEMO密钥！</string>
@@ -480,7 +480,7 @@
     <string name="mgmt_account_reconnect">重新连接</string>
     <string name="welcome_text">…是一个免费且安全的XMPP/Jabber客户端。</string>
     <string name="magic_create_text">此向导将为您创建一个账户。账户的初始密码是随机的，但您可以在下一个界面上修改密码。\n完成向导后，您就可以把您的 Jabber-ID 告诉别人，和别人聊天了。</string>
-    <string name="your_full_jid_will_be">您的Jabber用户名为：%s</string>
+    <string name="your_full_jid_will_be">您的chat address用户名为：%s</string>
     <string name="create_account">创建新帐号</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">我已有账号</string>
@@ -624,7 +624,7 @@
     <string name="yesterday">昨天</string>
     <string name="pref_validate_hostname">使用DNSSEC验证主机名</string>
     <string name="pref_validate_hostname_summary">包含经过验证的主机名的服务器证书将被视为已验证</string>
-    <string name="certificate_does_not_contain_jid">证书不包含Jabber用户名</string>
+    <string name="certificate_does_not_contain_jid">证书不包含chat address用户名</string>
     <string name="error_no_keys_to_trust_presence">此联系人没有可用的密钥。\n确保你们有共同的在线订阅。</string>
     <string name="mark_as_read">标记为已读</string>
     <string name="server_info_partial">部分</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 63cd80897..cce82f21f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -165,7 +165,7 @@
     <string name="account_settings_jabber_id">Jabber-ID</string>
     <string name="account_settings_example_jabber_id">username@monocles.de</string>
     <string name="password">Password</string>
-    <string name="invalid_jid">This is not a valid Jabber-ID</string>
+    <string name="invalid_jid">This is not a valid chat address</string>
     <string name="error_out_of_memory">Out of memory. Image is too large</string>
     <string name="add_phone_book_text">Do you want to add %s to your address book?</string>
     <string name="server_info_show_more">Server info</string>
@@ -456,7 +456,7 @@
     <string name="captcha_required">Captcha required</string>
     <string name="captcha_hint">Enter the text from the image above</string>
     <string name="certificate_chain_is_not_trusted">Certificate chain is not trusted</string>
-    <string name="jid_does_not_match_certificate">Jabber-ID does not match certificate</string>
+    <string name="jid_does_not_match_certificate">chat address does not match certificate</string>
     <string name="action_renew_certificate">Renew certificate</string>
     <string name="error_fetching_omemo_key">Error fetching OMEMO key!</string>
     <string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string>
@@ -512,7 +512,7 @@
     <string name="mgmt_account_reconnect">Reconnect</string>
     <string name="welcome_text">…is a free and secure XMPP/Jabber client.</string>
     <string name="magic_create_text">We will guide you through the process of creating an account with a random password, which you can use or change to your own password on the next page. \nThen you will be able to communicate with users of this and other providers by giving them your full Jabber-ID.</string>
-    <string name="your_full_jid_will_be">Your Jabber-ID will be: %s</string>
+    <string name="your_full_jid_will_be">Your chat address will be: %s</string>
     <string name="create_account">Create new account</string>
     <string name="create_monocles_account"><a href="https://ocean.monocles.de/apps/registration/">Get a monocles account!</a></string>
     <string name="welcome_existing_account">I have an account</string>
@@ -561,7 +561,7 @@
     <string name="remote_server_not_found">Remote server not found</string>
     <string name="error_file_corrupt">This file seems to be corrupt.</string>
     <string name="unable_to_update_account">Unable to update account</string>
-    <string name="report_jid_as_spammer">Report this JID as sending unwanted messages.</string>
+    <string name="report_jid_as_spammer">Report this Chat adress as sending unwanted messages.</string>
     <string name="create_issue">Report an issue</string>
     <string name="pref_delete_omemo_identities">Delete OMEMO identities</string>
     <string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string>
@@ -675,7 +675,7 @@
     <string name="yesterday">Yesterday</string>
     <string name="pref_validate_hostname">Validate hostname with DNSSEC</string>
     <string name="pref_validate_hostname_summary">Server certificates that contain the validated hostname are considered verified</string>
-    <string name="certificate_does_not_contain_jid">Certificate does not contain a Jabber ID</string>
+    <string name="certificate_does_not_contain_jid">Certificate does not contain a chat address</string>
     <string name="error_no_keys_to_trust_presence">There are no usable keys available for this contact.\nMake sure you have mutual presence subscription.</string>
     <string name="mark_as_read">Mark as read</string>
     <string name="server_info_partial">partial</string>
@@ -755,8 +755,8 @@
     <string name="gif">GIF</string>
     <string name="view_conversation">View conversation</string>
     <string name="web_address">web address</string>
-    <string name="jabber_id_copied_to_clipboard">Copied JID to clipboard</string>
-    <string name="copy_jabber_id">Copy JID</string>
+    <string name="jabber_id_copied_to_clipboard">Copied Chat adress to clipboard</string>
+    <string name="copy_jabber_id">Copy chat address</string>
     <string name="copy_link">Copy web address</string>
     <string name="server_hint">Choose provider</string>
     <string name="choose_your_server">Choose your jabber provider</string>