diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index 091f7eecf..6a6ccba92 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -130,8 +130,6 @@
     <string name="nc_share_subject">%1$s invitation</string>
     <string name="nc_share_text_pass">\nPassword: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Have private video calls and chat using your own server.</string>
     <string name="nc_store_full_desc">Use Nextcloud Talk to have one-on-one or group audio or video calls, create or join web conferences and send chat messages. All communication is fully encrypted and mediated by your own server, providing the highest degree of privacy possible.
 
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index e0accd3ea..f00cfaab5 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -129,8 +129,6 @@
     <string name="nc_share_subject">%1$sEinladung </string>
     <string name="nc_share_text_pass">\nPasswort: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Nutzen Sie private Videoanrufe und den Chat durch die Verwendung eines eigenen Servers.</string>
     <string name="nc_store_full_desc">Verwenden Sie Nextcloud Talk, um Einzel- oder Gruppen-Audio- oder Videoanrufe zu führen, Webkonferenzen zu erstellen oder daran teilzunehmen und Chatnachrichten zu senden. Die gesamte Kommunikation wird vollständig verschlüsselt und von Ihrem eigenen Server vermittelt, um ein höchstmögliches Maß an Privatsphäre zu gewährleisten.
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5dbbfb340..f1d184cc1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -129,8 +129,6 @@ Probiere mit einem Internetbrowser dem Anruf beizutreten.</string>
     <string name="nc_share_subject">%1$s Einladung</string>
     <string name="nc_share_text_pass">\nPasswort: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Nutze private Videoanrufe und den Chat durch die Verwendung eines eigenen Servers.</string>
     <string name="nc_store_full_desc">Verwende Nextcloud Talk, um Einzel- oder Gruppen-Audio- oder Videoanrufe zu führen, Webkonferenzen zu erstellen oder daran teilzunehmen und Chatnachrichten zu senden. Die gesamte Kommunikation wird vollständig verschlüsselt und von deinem eigenen Server vermittelt, um ein höchstmögliches Maß an Privatsphäre zu gewährleisten.
 
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 3b82552f1..0feb84230 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -130,8 +130,6 @@ Puedes intentar unirte a la llamada via el navegador web.</string>
     <string name="nc_share_subject">%1$s invitación</string>
     <string name="nc_share_text_pass">\nContraseña:%1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Haz video llamadas y chats privados usnaod tu propio servidor.</string>
     <string name="nc_store_full_desc">Usa Nextcloud Talk para hacer llamadas de audio o video en grupos o uno-a-uno, crear o unirse conferencias web y enviar mensajes de chat. Toda la comunicacion es completamente encriptada y mediada por tu propio servidor, proporcionando el más alto grado de privacidad posible.
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0b6b10742..b692bee70 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -130,8 +130,6 @@
     <string name="nc_share_subject">%1$s invitación</string>
     <string name="nc_share_text_pass">\nContraseña: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Haz llamadas de vídeo y conversaciones usando tu propio servidor.</string>
     <string name="nc_store_full_desc">Usa Nextcloud Talk para tener llamadas de audio y vídeo individuales o de grupo, crear o unirte a conferencias web y enviar mensajes de chat. Todas las comunicaciones están totalmente cifradas y mediadas por tu propio servidor, proporcionando el máximo grado posible de privacidad.
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 622f525d3..884a81ff6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -129,8 +129,6 @@ Veuillez essayer de joindre l\'appel depuis un navigateur web.</string>
     <string name="nc_share_subject">%1$s invitation</string>
     <string name="nc_share_text_pass">\nLe mot de passe : %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Ayez des appels vidéos et des discussions privés en utilisant votre propre serveur.</string>
     <string name="nc_store_full_desc">Utilisez Nextcloud Talk pour faire des appels vidéo ou audio en groupe ou en tête-à-tête, créer ou rejoindre des web-conférences et envoyer des messages dans un salon de discussion. Toutes les communications sont entièrement cryptées et  gérées par votre propre serveur, fournissant le plus haut niveau de confidentialité possible.
 
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index b40a9d0e9..da6c7aa15 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -130,8 +130,6 @@ Megpróbálhatod weben keresztül.</string>
     <string name="nc_share_subject">%1$s meghívás</string>
     <string name="nc_share_text_pass">\nJelszó: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Intézz videóhívásokat és magánbeszélgetéseket saját szervered segítségével.</string>
     <string name="nc_store_full_desc">Használd a Nextcloud Talk-ot egy-egy vagy csoportos videó és hanghívásokhoz, Hozz létre, vagy csatlakozz videó konferenciákhoz és küldj szöveges üzeneteket. Minden kapcsolat teljesen titkosított és a te szervered közvetíti, biztosítva az elérhető legmagasabb biztonsági szintet.
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d98b8a17c..68818143f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -129,8 +129,6 @@
     <string name="nc_share_subject">%1$s invito</string>
     <string name="nc_share_text_pass">\nPassword: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Videochiamate e chat utilizzando il tuo server.</string>
     <string name="nc_store_full_desc">Usa Nextcloud Talk per avere chiamate audio e video uno a uno o di gruppo, creare o partecipare a conferenze web e inviare messaggi di chat. Tutte le comunicazioni sono completamente cifrate e mediate dal proprio server, fornendo il più alto grado di riservatezza possibile.
 
diff --git a/app/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml
index 9ceb133a2..f5b289b1d 100644
--- a/app/src/main/res/values-ka-rGE/strings.xml
+++ b/app/src/main/res/values-ka-rGE/strings.xml
@@ -130,8 +130,6 @@
     <string name="nc_share_subject">%1$s მოწვევა</string>
     <string name="nc_share_text_pass">\nპაროლი: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">იქონიეთ პირადი ვიდეო ზარები და ჩეთი საკუთარი სერვერით.</string>
     <string name="nc_store_full_desc">გამოიყენეთ Nextcloud Talk, რათა იქონიოთ პირადი ან ჯგუფური აუდიო ან ვიდეო ზარები, შექმნათ ან შეუერთდეთ ვებ-კონფერენციებს და გააგზავნოთ ჩეთ წერილები. ყველა კომუნიკაცია სრულად დაშიფრულია, მას შუამავლობას უწევს თქვენი სერვერი, რაც უზრუნველყოფს კონფიდენციალურობის უმაღლეს ხარისხს.
 
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index c759baa14..2f7056a3f 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -131,8 +131,6 @@
     <string name="nc_share_subject">%1$s invitasjon</string>
     <string name="nc_share_text_pass">\nPassord: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Få private videosamtaler og chat ved å bruke din egen tjener.</string>
     <string name="nc_store_full_desc">Bruk Nextcloud Talk for lyd- eller video- samtaler for 2 eller flere personer, opprette eller delta i webkonferanser og send chat- meldinger. All kommunikasjon er kryptert og organisert av din egen server, og sørger derfor for den høyeste grad av personvern som mulig.
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3c4c4ff50..9b2d1737b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -133,8 +133,6 @@ Je kunt proberen om aan het gesprek deel te nemen via een browser.</string>
     <string name="nc_share_subject">%1$s uitnodiging</string>
     <string name="nc_share_text_pass">\nWachtwoord: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Heb vertrouwelijke videogesprekken en chats via je eigen server.</string>
     <string name="nc_store_full_desc">Gebruik Nextcloud Talk om een één-op-één of groeps- audio- of videogesprek te houden, voor het starten of deelnemen aan web conferenties en voor het versturen van berichten. Alle communicatie is volledig versleuteld en verwerkt via je eigen server, waardoor je de hoogst mogelijke graad van privacy bereikt.
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 37d8dfa3a..9b34185a5 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -130,8 +130,6 @@
     <string name="nc_share_subject">%1$s convite</string>
     <string name="nc_share_text_pass">\nSenha: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Tenha um chat com chamadas de vídeo privadas usando seu próprio servidor.</string>
     <string name="nc_store_full_desc">Use o Nextcloud Talk para fazer chamadas de áudio ou vídeo individuais, crie ou junte-se a conferências na web e envie mensagens de bate-papo. Toda comunicação é totalmente criptografada e mediada por seu próprio servidor, proporcionando o maior grau de privacidade possível.
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ea49e2695..50c819326 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -128,8 +128,6 @@
     <string name="nc_share_subject">%1$s приглашение</string>
     <string name="nc_share_text_pass">\nПароль: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Возможность иметь частные видео звонки и переписку, используя ваш собственный сервер.</string>
     <string name="nc_store_full_desc">Приложение Nexcloud Talk предназначено для осуществления вызовов между двумя или несколькими абонентами, в том числе с использованием видеосвязи. Соединения обслуживаются вашим собственным сервером, и все данные передаются в зашифрованном виде, что обеспечивает максимальную защиту.
 
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 1e54d23c5..1a6665394 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -130,7 +130,5 @@
     <string name="nc_share_subject">%1$s позивница</string>
     <string name="nc_share_text_pass">\nЛозинка: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Обављајте приватне видео позиве и ћаскајте користећи Ваш сервер.</string>
     </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 26287008d..c20659f12 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -130,7 +130,5 @@
     <string name="nc_share_subject">%1$s çağrısı</string>
     <string name="nc_share_text_pass">\nParola: %1$s</string>
 
-    <!-- Magical stuff -->
-    <string name="nc_empty"></string>
     <string name="nc_store_short_desc">Kendi sunucunuz üzerinden görüntülü görüşme ve sohbet yapın.</string>
     </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 69a4d5f1e..98382c82d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -6,13 +6,23 @@
 
     <!-- Server selection -->
     <string name="nc_server_url">服务器地址</string>
+    <string name="nc_server_not_installed">请完成你的 %1$s 安装</string>
     <string name="nc_server_db_upgrade_needed">请升级你的%1$s数据库</string>
+    <string name="nc_server_maintenance">请将你的 %1$s 退出维护模式</string>
+    <string name="nc_server_version">%1$s 仅支持 %2$s 13 及更高版本</string>
     <string name="nc_server_import_account_plain">导入账户</string>
     <string name="nc_server_import_accounts_plain">导入账户</string>
+    <string name="nc_server_import_account">从 %1$s 应用导入账号</string>
+    <string name="nc_server_import_accounts">从 %1$s 应用导入账号</string>
     <string name="nc_server_failed_to_import_account">选择的账户导入失败</string>
     <string name="nc_Server_account_imported">选择的账户导入成功并可立即使用</string>
+    <string name="nc_get_from_provider">还没有服务器吗？\n 点此查看供应商</string>
+
     <!-- Account verification -->
     <string name="nc_display_name_fetched">显示名称已获取</string>
+    <string name="nc_display_name_not_fetched">无法获取显示名，中止</string>
+    <string name="nc_nextcloud_talk_app_installed">找到应用 %1$s</string>
+    <string name="nc_nextcloud_talk_app_not_installed">服务器未安装 %1$s 应用，中止</string>
     <string name="nc_display_name_stored">显示储存的名称</string>
     <string name="nc_display_name_not_stored">无法储存显示名称，终止中</string>
 
@@ -23,6 +33,8 @@
     <string name="nc_yes">是的</string>
     <string name="nc_no">不</string>
     <string name="nc_details">详情</string>
+    <string name="nc_certificate_error">你的 SSL 设置阻止了连接</string>
+
     <!-- Settings -->
     <string name="nc_settings_proxy_title">代理</string>
     <string name="nc_settings_proxy_type_key">代理服务类型</string>
@@ -33,33 +45,50 @@
     <string name="nc_settings_proxy_port_title">代理端口</string>
     <string name="nc_settings_proxy_username_key">代理用户名</string>
     <string name="nc_settings_proxy_password_key">代理密码</string>
+    <string name="nc_settings_use_credentials_title">使用凭据</string>
+    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">切换账户</string>
     <string name="nc_settings_reauthorize">重新认证</string>
     <string name="nc_settings_remove_account">移除账户</string>
     <string name="nc_settings_add_account">添加一个新账户</string>
     <string name="nc_settings_wrong_account">仅当前帐户可以重新授权</string>
+    <string name="nc_settings_no_talk_installed">你尝试授权的服务器上未安装 Talk 应用</string>
+    <string name="nc_account_scheduled_for_deletion">此账户已计划删除，且无法更改</string>
+
     <string name="nc_no_proxy">无代理</string>
     <string name="nc_username">用户名</string>
     <string name="nc_password">密码</string>
+    <string name="nc_conversation_link">对话连接</string>
     <string name="nc_new_password">新密码</string>
     <string name="nc_wrong_password">错误的密码</string>
     <string name="nc_about">关于</string>
     <string name="nc_privacy">隐私</string>
     <string name="nc_get_source_code">获取源代码</string>
     <string name="nc_license_title">许可证</string>
+    <string name="nc_license_summary">GNU 通用公共许可证，第3版</string>
+
     <string name="nc_select_an_account">选择一个账户</string>
 
     <!-- Room menu -->
     <string name="nc_what">今天想干点什么呢？</string>
     <string name="nc_leave">离开通话</string>
+    <string name="nc_rename">重命名电话</string>
     <string name="nc_set_password">设置一个密码</string>
     <string name="nc_change_password">修改密码</string>
     <string name="nc_clear_password">清除密码</string>
     <string name="nc_share_link">共享链接</string>
+    <string name="nc_share_link_via">共享链接通过</string>
+    <string name="nc_make_call_public">公开呼叫</string>
+    <string name="nc_make_call_private">私有呼叫</string>
     <string name="nc_delete_call">删除通话</string>
     <string name="nc_new_conversation">开始一个新对话</string>
+    <string name="nc_join_via_link">通过链接加入</string>
+    <string name="nc_join_via_web">通过网页加入</string>
+
     <!-- Contacts -->
     <string name="nc_select_contacts">选择联系人</string>
+    <string name="nc_one_contact_selected">已选联系人</string>
+    <string name="nc_more_contacts_selected">已选联系人</string>
     <string name="nc_contacts_clear">清除</string>
     <string name="nc_contacts_done">完成</string>