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 47d64df6c..5beb31b8c 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -148,4 +148,4 @@
     <string name="nc_endless_cancel">Cancelled by the user.</string>
     <string name="nc_endless_error">An error occurred while loading more items.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index bb0e13fa9..d5d5b1475 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -189,4 +189,4 @@ Finden Sie Nextcloud auf https://nextcloud.com</string>
     <string name="nc_endless_cancel">Abbruch durch den Benutzer.</string>
     <string name="nc_endless_error">Es ist ein Fehler beim Laden weiterer Kontakte aufgetreten.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9ea82a75a..5a4a974ac 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -189,4 +189,4 @@ Finde Nextcloud auf https://nextcloud.com</string>
     <string name="nc_endless_cancel">Abbruch durch den Benutzer.</string>
     <string name="nc_endless_error">Es ist ein Fehler beim Laden weiterer Kontakte aufgetreten.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index ea14b32f7..331d1f28e 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -148,4 +148,4 @@ teléfonos móviles. Puedes intentar unirte a la conversación a través de un n
     <string name="nc_endless_cancel">Cancelado por el usuario.</string>
     <string name="nc_endless_error">Se presentó un error al cargar más elementos. </string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml
index ea14b32f7..331d1f28e 100644
--- a/app/src/main/res/values-es-rCO/strings.xml
+++ b/app/src/main/res/values-es-rCO/strings.xml
@@ -148,4 +148,4 @@ teléfonos móviles. Puedes intentar unirte a la conversación a través de un n
     <string name="nc_endless_cancel">Cancelado por el usuario.</string>
     <string name="nc_endless_error">Se presentó un error al cargar más elementos. </string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-es-rCR/strings.xml b/app/src/main/res/values-es-rCR/strings.xml
index ea14b32f7..331d1f28e 100644
--- a/app/src/main/res/values-es-rCR/strings.xml
+++ b/app/src/main/res/values-es-rCR/strings.xml
@@ -148,4 +148,4 @@ teléfonos móviles. Puedes intentar unirte a la conversación a través de un n
     <string name="nc_endless_cancel">Cancelado por el usuario.</string>
     <string name="nc_endless_error">Se presentó un error al cargar más elementos. </string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml
index ea14b32f7..331d1f28e 100644
--- a/app/src/main/res/values-es-rDO/strings.xml
+++ b/app/src/main/res/values-es-rDO/strings.xml
@@ -148,4 +148,4 @@ teléfonos móviles. Puedes intentar unirte a la conversación a través de un n
     <string name="nc_endless_cancel">Cancelado por el usuario.</string>
     <string name="nc_endless_error">Se presentó un error al cargar más elementos. </string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml
index ea14b32f7..331d1f28e 100644
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@@ -148,4 +148,4 @@ teléfonos móviles. Puedes intentar unirte a la conversación a través de un n
     <string name="nc_endless_cancel">Cancelado por el usuario.</string>
     <string name="nc_endless_error">Se presentó un error al cargar más elementos. </string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-es-rGT/strings.xml b/app/src/main/res/values-es-rGT/strings.xml
index ea14b32f7..331d1f28e 100644
--- a/app/src/main/res/values-es-rGT/strings.xml
+++ b/app/src/main/res/values-es-rGT/strings.xml
@@ -148,4 +148,4 @@ teléfonos móviles. Puedes intentar unirte a la conversación a través de un n
     <string name="nc_endless_cancel">Cancelado por el usuario.</string>
     <string name="nc_endless_error">Se presentó un error al cargar más elementos. </string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index ea14b32f7..331d1f28e 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -148,4 +148,4 @@ teléfonos móviles. Puedes intentar unirte a la conversación a través de un n
     <string name="nc_endless_cancel">Cancelado por el usuario.</string>
     <string name="nc_endless_error">Se presentó un error al cargar más elementos. </string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml
index ea14b32f7..331d1f28e 100644
--- a/app/src/main/res/values-es-rSV/strings.xml
+++ b/app/src/main/res/values-es-rSV/strings.xml
@@ -148,4 +148,4 @@ teléfonos móviles. Puedes intentar unirte a la conversación a través de un n
     <string name="nc_endless_cancel">Cancelado por el usuario.</string>
     <string name="nc_endless_error">Se presentó un error al cargar más elementos. </string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d01eaaef0..55485ac81 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -62,7 +62,9 @@
     <string name="nc_account_scheduled_for_deletion">La cuenta está programada para borrado y no se puede operar con ella</string>
     <string name="nc_settings_notification_sounds">Sonidos de notificación</string>
     <string name="nc_settings_call_ringtone">Llamadas</string>
+    <string name="nc_settings_call_ringtone_key">call_ringtone</string>
     <string name="nc_settings_message_ringtone">Mensajes</string>
+    <string name="nc_settings_message_ringtone_key">message_ringtone</string>
     <string name="nc_settings_no_ringtone">Sonido NO</string>
 
     <string name="nc_no_proxy">Sin proxy</string>
@@ -82,9 +84,11 @@
     <!-- Room menu -->
     <string name="nc_start_conversation">Comienza una conversación</string>
     <string name="nc_configure_room">Configura la conversación</string>
+    <string name="nc_configure_named_room">%1$s</string>
     <string name="nc_leave">Abandonar conversación</string>
     <string name="nc_rename">Renombrar conversación</string>
     <string name="nc_set_password">Configura una contraseña</string>
+    <string name="nc_change_password">Cambiar contraseña</string>
     <string name="nc_clear_password">Limpiar contraseña</string>
     <string name="nc_share_link">Compartir enlace</string>
     <string name="nc_share_link_via">Compartir enlace vía</string>
@@ -186,4 +190,4 @@ Encuentra Nextcloud en https://nextcloud.com</string>
     <string name="nc_endless_cancel">Cancelado por el usuario.</string>
     <string name="nc_endless_error">Ha ocurrido un error al cargar más ítems.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2cfaca0d1..366f48b41 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -190,4 +190,4 @@ Trouvez Nextcloud sur https://nextcloud.com</string>
     <string name="nc_endless_cancel">Annulé par l\'utilisateur.</string>
     <string name="nc_endless_error">Une erreur est survenue lors du chargement d\'éléments supplémentaires.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index b11b96b27..a287b3e19 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -118,4 +118,4 @@
     <string name="nc_endless_cancel">Notandinn hætti við.</string>
     <string name="nc_endless_error">Villa kom upp við að hlaða inn fleiri aðgerðum.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 2b7224932..58eb4490a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -190,4 +190,4 @@ Trovi Nextcloud su https://nextcloud.com</string>
     <string name="nc_endless_cancel">Annullato dall\'utente.</string>
     <string name="nc_endless_error">Si è verificato un errore durante il caricamento di altri elementi.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 327c90c98..2c1c9493f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -190,4 +190,4 @@ Encontre o Nextcloud em https://nextcloud.com</string>
     <string name="nc_endless_cancel">Cancelado pelo usuário.</string>
     <string name="nc_endless_error">Ocorreu um erro ao carregar mais itens.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 321d7d424..79c3c69ce 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -186,4 +186,4 @@ Nextcloud Talk поддерживает:
     <string name="nc_endless_cancel">Прервано пользователем</string>
     <string name="nc_endless_error">Ошибка загрузки дополнительных объектов.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index d0790d771..f34c404a6 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -148,4 +148,4 @@
     <string name="nc_endless_cancel">Zrušené používateľom</string>
     <string name="nc_endless_error">Počas načítavania ďalších položiek sa vyskytla chyba.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index e9da64c58..66d779765 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -139,4 +139,4 @@
     <string name="nc_endless_cancel">Preklicano s strani uporabnika.</string>
     <string name="nc_endless_error">Med nalaganjem predmetov je prišlo do napake.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 5361e7afd..43e7868bb 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -162,4 +162,4 @@
     <string name="nc_endless_cancel">Прекинуо корисник</string>
     <string name="nc_endless_error">Десила се грешка приликом учитавања још ставки.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 051134098..39bf09990 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -190,4 +190,4 @@ Nextcloud web sitesi https://nextcloud.com</string>
     <string name="nc_endless_cancel">Kullanıcı tarafından iptal edildi.</string>
     <string name="nc_endless_error">Daha fazla öge yüklenirken bir sorun çıktı.</string>
 
-</resources>
+    </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 8c3b8d3f7..000000000
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<resources>
-    <string name="nc_bottom_navigation_title_contacts">聯絡人</string>
-    <string name="nc_bottom_navigation_title_settings">設定</string>
-
-    <!-- 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$s13版以上運作</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個app已找到</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>
-
-    <string name="nc_never">從未加入</string>
-    <string name="nc_search">搜尋</string>
-
-    <string name="nc_certificate_dialog_title">請檢查憑證</string>
-    <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">proxy代理</string>
-    <string name="nc_settings_proxy_type_key">proxy_類型</string>
-    <string name="nc_settings_proxy_type_title">proxy類型</string>
-    <string name="nc_settings_proxy_host_key">proxy代理主機</string>
-    <string name="nc_settings_proxy_host_title">proxy代理主機</string>
-    <string name="nc_settings_proxy_port_key">proxy_連接埠</string>
-    <string name="nc_settings_proxy_port_title">proxy連接埠</string>
-    <string name="nc_settings_proxy_username_key">proxy使用者</string>
-    <string name="nc_settings_proxy_password_key">proxy密碼</string>
-    <string name="nc_settings_use_credentials_title">使用憑證</string>
-    <string name="nc_settings_use_credentials_key">proxy憑證</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">聊天的app尚未安裝在您試著要授權的伺服器。</string>
-    <string name="nc_account_scheduled_for_deletion">此帳號已經被排定要刪除，也不能被修改。</string>
-    <string name="nc_no_proxy">無proxy代理</string>
-    <string name="nc_username">使用者</string>
-    <string name="nc_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>
-
-    <string name="nc_share_link">分享連結</string>
-    <string name="nc_one_contact_selected">聯絡人已選</string>
-    <string name="nc_more_contacts_selected">聯絡人已選</string>
-    <!-- Permissions -->
-    <string name="nc_permissions">允許的權限需要被同意，用以建立影像及/或語音電話。請在來源的系統對話中點選\"允許\"。</string>
-    <string name="nc_permissions_audio">為了開啟語音電話，麥克風的需求需要被同意。請在來源的系統對話中點選\"允許\"。</string>
-    <string name="nc_permissions_video">為了開啟影像電話，相機的需求需要被同意。請在來源的系統對話中點選\"允許\"。</string>
-    <string name="nc_camera_permission_permanently_denied">為了開啟影像的通訊請在系統設定內同意\"相機\"的需求。</string>
-    <string name="nc_microphone_permission_permanently_denied">為了開啟聲音的通訊請在系統設定內同意\"麥克風\"的需求。</string>
-    <string name="nc_permissions_settings">開啟設定</string>
-
-    <!-- Notification channels -->
-    <string name="nc_notification_channel">%1$s在%2$s的通知頻道</string>
-    <string name="nc_notification_channel_calls">來電通知頻道</string>
-    <string name="nc_notification_channel_messages">訊息通知頻道</string>
-    <string name="nc_notification_channel_calls_description">顯示來電</string>
-    <string name="nc_notification_channel_messages_description">顯示來電訊息</string>
-
-    </resources>