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 5beb31b8c..8a4d47578 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Proxy type</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Proxy host</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Proxy port</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Use credentials</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Switch between accounts</string>
     <string name="nc_settings_reauthorize">Reauthorise</string>
     <string name="nc_client_cert_setup">Set up client certificate</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index d5d5b1475..b5f3593da 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_typ</string>
     <string name="nc_settings_proxy_type_title">Proxy-Typ</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Proxy-Host</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Proxy-Port</string>
-    <string name="nc_settings_proxy_username_key">proxy_nutzername</string>
-    <string name="nc_settings_proxy_password_key">proxy_passwort</string>
     <string name="nc_settings_use_credentials_title">Anmeldeinformationen verwenden</string>
-    <string name="nc_settings_use_credentials_key">proxy_anmeldeinformationen</string>
     <string name="nc_settings_switch_account">Zwischen Konten wechseln</string>
     <string name="nc_settings_reauthorize">Erneut autorisieren</string>
     <string name="nc_client_cert_setup">Client-Zertifikat einrichten</string>
@@ -62,9 +56,7 @@
     <string name="nc_account_scheduled_for_deletion">Das Konto ist zur Löschung vorgesehen und kann nicht verändert werden</string>
     <string name="nc_settings_notification_sounds">Benachrichtigungstöne</string>
     <string name="nc_settings_call_ringtone">Anrufe</string>
-    <string name="nc_settings_call_ringtone_key">call_ringtone</string>
     <string name="nc_settings_message_ringtone">Nachrichten</string>
-    <string name="nc_settings_message_ringtone_key">message_ringtone</string>
     <string name="nc_settings_no_ringtone">Kein Ton</string>
 
     <string name="nc_no_proxy">Kein Proxy</string>
@@ -189,4 +181,10 @@ 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>
+    <!-- Content descriptions -->
+    <string name="nc_description_more_menu_one_to_one">Menü für die Unterhaltung mit %1$s</string>
+    <string name="nc_description_more_menu_public">Menü für die Gruppenunterhaltung %1$s</string>
+    <string name="nc_description_more_menu_group">Menü für die öffentliche Unterhaltung %1$s</string>
+    <string name="nc_description_send_message_button">Nachricht senden</string>
+
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5a4a974ac..0b33bf648 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_typ</string>
     <string name="nc_settings_proxy_type_title">Proxy-Typ</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Proxy-Host</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Proxy-Port</string>
-    <string name="nc_settings_proxy_username_key">proxy_nutzername</string>
-    <string name="nc_settings_proxy_password_key">proxy_passwort</string>
     <string name="nc_settings_use_credentials_title">Anmeldeinformationen verwenden</string>
-    <string name="nc_settings_use_credentials_key">proxy_anmeldeinformationen</string>
     <string name="nc_settings_switch_account">Zwischen Konten wechseln</string>
     <string name="nc_settings_reauthorize">Erneut autorisieren</string>
     <string name="nc_client_cert_setup">Client-Zertifikat einrichten</string>
@@ -62,9 +56,7 @@
     <string name="nc_account_scheduled_for_deletion">Das Konto ist zur Löschung vorgesehen und kann nicht verändert werden</string>
     <string name="nc_settings_notification_sounds">Benachrichtigungstöne</string>
     <string name="nc_settings_call_ringtone">Anrufe</string>
-    <string name="nc_settings_call_ringtone_key">call_ringtone</string>
     <string name="nc_settings_message_ringtone">Nachrichten</string>
-    <string name="nc_settings_message_ringtone_key">message_ringtone</string>
     <string name="nc_settings_no_ringtone">Kein Ton</string>
 
     <string name="nc_no_proxy">Kein Proxy</string>
@@ -189,4 +181,10 @@ 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>
+    <!-- Content descriptions -->
+    <string name="nc_description_more_menu_one_to_one">Menü für die Unterhaltung mit %1$s</string>
+    <string name="nc_description_more_menu_public">Menü für die Gruppenunterhaltung %1$s</string>
+    <string name="nc_description_more_menu_group">Menü für die öffentliche Unterhaltung %1$s</string>
+    <string name="nc_description_send_message_button">Nachricht senden</string>
+
+</resources>
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index 331d1f28e..dd4160fe4 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">servidor de proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Puerto del proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar credenciales</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Compartir entre cuentas</string>
     <string name="nc_settings_reauthorize">Volver a autorizar</string>
     <string name="nc_client_cert_setup">Configura un certificado de cliente</string>
diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml
index 331d1f28e..dd4160fe4 100644
--- a/app/src/main/res/values-es-rCO/strings.xml
+++ b/app/src/main/res/values-es-rCO/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">servidor de proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Puerto del proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar credenciales</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Compartir entre cuentas</string>
     <string name="nc_settings_reauthorize">Volver a autorizar</string>
     <string name="nc_client_cert_setup">Configura un certificado de cliente</string>
diff --git a/app/src/main/res/values-es-rCR/strings.xml b/app/src/main/res/values-es-rCR/strings.xml
index 331d1f28e..dd4160fe4 100644
--- a/app/src/main/res/values-es-rCR/strings.xml
+++ b/app/src/main/res/values-es-rCR/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">servidor de proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Puerto del proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar credenciales</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Compartir entre cuentas</string>
     <string name="nc_settings_reauthorize">Volver a autorizar</string>
     <string name="nc_client_cert_setup">Configura un certificado de cliente</string>
diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml
index 331d1f28e..dd4160fe4 100644
--- a/app/src/main/res/values-es-rDO/strings.xml
+++ b/app/src/main/res/values-es-rDO/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">servidor de proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Puerto del proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar credenciales</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Compartir entre cuentas</string>
     <string name="nc_settings_reauthorize">Volver a autorizar</string>
     <string name="nc_client_cert_setup">Configura un certificado de cliente</string>
diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml
index 331d1f28e..dd4160fe4 100644
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">servidor de proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Puerto del proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar credenciales</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Compartir entre cuentas</string>
     <string name="nc_settings_reauthorize">Volver a autorizar</string>
     <string name="nc_client_cert_setup">Configura un certificado de cliente</string>
diff --git a/app/src/main/res/values-es-rGT/strings.xml b/app/src/main/res/values-es-rGT/strings.xml
index 331d1f28e..dd4160fe4 100644
--- a/app/src/main/res/values-es-rGT/strings.xml
+++ b/app/src/main/res/values-es-rGT/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">servidor de proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Puerto del proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar credenciales</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Compartir entre cuentas</string>
     <string name="nc_settings_reauthorize">Volver a autorizar</string>
     <string name="nc_client_cert_setup">Configura un certificado de cliente</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 331d1f28e..dd4160fe4 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">servidor de proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Puerto del proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar credenciales</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Compartir entre cuentas</string>
     <string name="nc_settings_reauthorize">Volver a autorizar</string>
     <string name="nc_client_cert_setup">Configura un certificado de cliente</string>
diff --git a/app/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml
index 331d1f28e..dd4160fe4 100644
--- a/app/src/main/res/values-es-rSV/strings.xml
+++ b/app/src/main/res/values-es-rSV/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">servidor de proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Puerto del proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar credenciales</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Compartir entre cuentas</string>
     <string name="nc_settings_reauthorize">Volver a autorizar</string>
     <string name="nc_client_cert_setup">Configura un certificado de cliente</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 55485ac81..7e0e7410e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Host del proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Puerto del proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar credenciales</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Cambiar entre cuentas</string>
     <string name="nc_settings_reauthorize">Reautorizar</string>
     <string name="nc_client_cert_setup">Configurar certificado de cliente</string>
@@ -62,9 +56,7 @@
     <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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 366f48b41..0159a98b3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key"> proxy_type</string>
     <string name="nc_settings_proxy_type_title">Type du proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Hôte du proxy</string>
-    <string name="nc_settings_proxy_port_key"> proxy_port</string>
     <string name="nc_settings_proxy_port_title">Port du proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Utiliser les informations d’identification</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Changer de compte</string>
     <string name="nc_settings_reauthorize">Réautoriser</string>
     <string name="nc_client_cert_setup">Configurer le certificat du client</string>
@@ -62,9 +56,7 @@
     <string name="nc_account_scheduled_for_deletion">Le compte va être supprimé et ne peut donc pas être utilisé</string>
     <string name="nc_settings_notification_sounds">Sons de notification</string>
     <string name="nc_settings_call_ringtone">Appels</string>
-    <string name="nc_settings_call_ringtone_key">call_ringtone</string>
     <string name="nc_settings_message_ringtone">Messages</string>
-    <string name="nc_settings_message_ringtone_key">message_ringtone</string>
     <string name="nc_settings_no_ringtone">Aucun son</string>
 
     <string name="nc_no_proxy">Aucun proxy</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 4d9c8dbc4..a5e292580 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -36,16 +36,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Proxy típusa</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Proxy hoszt</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Proxy port</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Hitelesítő adatok használata</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Váltás fiókok között</string>
     <string name="nc_settings_reauthorize">Újraengedélyezés</string>
     <string name="nc_client_cert_setup">Kliens tanúsítvány beállítása</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index a287b3e19..d484508ea 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -38,16 +38,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Milliþjónn</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Gerð milliþjóns</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Milliþjónn</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Gátt milliþjóns</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Auðkenni notanda</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Skipta á milli aðganga</string>
     <string name="nc_settings_reauthorize">Endurheimila</string>
     <string name="nc_client_cert_setup">Setja upp skilríki biðlara</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 58eb4490a..8e9101a2e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">tipo_proxy</string>
     <string name="nc_settings_proxy_type_title">Tipo proxy</string>
-    <string name="nc_settings_proxy_host_key">host_proxy</string>
     <string name="nc_settings_proxy_host_title">Host proxy</string>
-    <string name="nc_settings_proxy_port_key">porta_proxy</string>
     <string name="nc_settings_proxy_port_title">Porta proxy</string>
-    <string name="nc_settings_proxy_username_key">nomeutente_proxy</string>
-    <string name="nc_settings_proxy_password_key">password_proxy</string>
     <string name="nc_settings_use_credentials_title">Usa credenziali</string>
-    <string name="nc_settings_use_credentials_key">credenziali_proxy</string>
     <string name="nc_settings_switch_account">Cambia account</string>
     <string name="nc_settings_reauthorize">Autorizza nuovamente</string>
     <string name="nc_client_cert_setup">Configura certificato client</string>
@@ -62,9 +56,7 @@
     <string name="nc_account_scheduled_for_deletion">L\'eliminazione dell\'account è stata pianificata, e non può essere modificata</string>
     <string name="nc_settings_notification_sounds">Suoni delle notifiche</string>
     <string name="nc_settings_call_ringtone">Chiamate</string>
-    <string name="nc_settings_call_ringtone_key">call_ringtone</string>
     <string name="nc_settings_message_ringtone">Messaggi</string>
-    <string name="nc_settings_message_ringtone_key">message_ringtone</string>
     <string name="nc_settings_no_ringtone">Nessun suono</string>
 
     <string name="nc_no_proxy">Nessun proxy</string>
@@ -190,4 +182,10 @@ 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>
+    <!-- Content descriptions -->
+    <string name="nc_description_more_menu_one_to_one">Menu per conversazione con %1$s</string>
+    <string name="nc_description_more_menu_public">Menu per conversazione di gruppo %1$s</string>
+    <string name="nc_description_more_menu_group">Menu per conversazione pubblica %1$s</string>
+    <string name="nc_description_send_message_button">Invia messaggio</string>
+
+</resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
new file mode 100644
index 000000000..1641de6f3
--- /dev/null
+++ b/app/src/main/res/values-iw/strings.xml
@@ -0,0 +1,115 @@
+<resources>
+    <!-- Bottom Navigation -->
+    <string name="nc_bottom_navigation_title_conversations">דיונים</string>
+    <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_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_push_disabled">התראות בדחיפה הושבתו</string>
+    <string name="nc_capabilities_failed">אחזור היכולות נכשל, התהליך נפסק</string>
+    <string name="nc_display_name_not_fetched">לא ניתן לאחזר את שם התצוגה, התהליך נפסק</string>
+    <string name="nc_display_name_stored">שם התצוגה אוחסן</string>
+    <string name="nc_display_name_not_stored">לא ניתן לאחסן את שם התצוגה, התהליך נפסק</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">מתווך</string>
+    <string name="nc_settings_proxy_type_title">סוג מתווך</string>
+    <string name="nc_settings_proxy_host_title">מארח מתווך</string>
+    <string name="nc_settings_proxy_port_title">פתחת מתווך</string>
+    <string name="nc_settings_use_credentials_title">שימוש בפרטי גישה</string>
+    <string name="nc_settings_switch_account">החלפה בין חשבונות</string>
+    <string name="nc_settings_remove_account">הסרת חשבון</string>
+    <string name="nc_settings_add_account">הוספת חשבון חדש</string>
+    <string name="nc_settings_call_ringtone">שיחות</string>
+    <string name="nc_settings_message_ringtone">הודעות</string>
+    <string name="nc_settings_no_ringtone">אין צליל</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_select_an_account">בחירת חשבון</string>
+
+    <!-- Room menu -->
+    <string name="nc_start_conversation">התחלת דיון</string>
+    <string name="nc_configure_room">הגדרת דיון</string>
+    <string name="nc_configure_named_room">%1$s</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_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>
+
+    <string name="nc_permissions_settings">פתיחת הגדרות</string>
+
+    <string name="nc_incoming_call">שיחה נכנסת מאת</string>
+    <string name="nc_nick_guest">אורח/ת</string>
+    <string name="nc_public_call">דיון ציבורי חדש</string>
+    <string name="nc_notification_channel_calls">ערוץ התראות על שיחות</string>
+    <string name="nc_notification_channel_messages">ערוץ התראות על הודעות</string>
+    <string name="nc_all_ok_operation">סבבה, הכול בוצע!</string>
+    <string name="nc_ok">אישור</string>
+    <string name="nc_call_name">שם הדיון</string>
+    <string name="nc_proceed">להמשיך</string>
+    <string name="nc_share_text_pass">\nססמה: %1$s</string>
+
+    <string name="nc_date_header_yesterday">אתמול</string>
+    <string name="nc_date_header_today">היום</string>
+    <string name="nc_conversation_menu_voice_call">שיחה קולית</string>
+    <string name="nc_conversation_menu_video_call">שיחת וידאו</string>
+    <string name="nc_new_messages">הודעות חדשות</string>
+
+    <!-- Contacts endless loading -->
+    <string name="nc_no_more_load_retry">אין עוד פריטים לטעינה. יש לרענן כדי לנסות שוב.</string>
+    <string name="nc_endless_disabled">אין עוד פריטים לטעינה (זו הכמות המרבית).</string>
+    <string name="nc_endless_cancel">בוטל על ידי המשתמש.</string>
+    <string name="nc_endless_error">אירעה שגיאה בעת טעינת פריטים נוספים</string>
+
+    <!-- Content descriptions -->
+    <string name="nc_description_more_menu_one_to_one">תפריט לדיון עם %1$s</string>
+    <string name="nc_description_more_menu_public">תפריט לדיון קבוצתי %1$s</string>
+    <string name="nc_description_more_menu_group">תפריט לדיון ציבורי %1$s</string>
+    <string name="nc_description_send_message_button">שליחת הודעה</string>
+
+</resources>
diff --git a/app/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml
index e6fa626ba..af733e6b2 100644
--- a/app/src/main/res/values-ka-rGE/strings.xml
+++ b/app/src/main/res/values-ka-rGE/strings.xml
@@ -36,16 +36,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">პროქსი</string>
-    <string name="nc_settings_proxy_type_key">პროქსი_სახეობა</string>
     <string name="nc_settings_proxy_type_title">პროქსი სახეობა</string>
-    <string name="nc_settings_proxy_host_key">პროქსი_ჰოსტი</string>
     <string name="nc_settings_proxy_host_title">პროქსი ჰოსტი</string>
-    <string name="nc_settings_proxy_port_key">პროქსი_პორტი</string>
     <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">პროქსი_უფლებამოსილებები</string>
     <string name="nc_settings_switch_account">ანგარიშების შეცვლა</string>
     <string name="nc_settings_reauthorize">რეავტორიზაცია</string>
     <string name="nc_settings_remove_account">ანგარიშის გაუქმება</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 671471af8..8ab95871d 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -36,16 +36,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">프록시</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">프록시 종류</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">프록시 호스트</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">프록시 포트</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</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>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 5b2a832a2..147574e38 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -36,16 +36,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Mellomtjener</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Proxy type</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Proxy vert</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Proxy port</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Påloggingsdetaljer</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Bytt mellom kontoer</string>
     <string name="nc_settings_reauthorize">Reautoriser</string>
     <string name="nc_settings_remove_account">Fjern konto</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index c0cfa9ce0..088ffe54e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -37,16 +37,10 @@ Kies er eentje van een provider.</string>
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Proxy type</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Proxy host</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Proxy poort</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Gebruik inloggegevens</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Omschakelen tussen accounts</string>
     <string name="nc_settings_reauthorize">Opnieuw autoriseren</string>
     <string name="nc_client_cert_setup">Instellen clientcertificaat</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2c1c9493f..77c289192 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Tipo de Proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Endereço do proxy</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Porta do proxy</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Usar autenticação</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Alternar entre contas</string>
     <string name="nc_settings_reauthorize">Reautorizar</string>
     <string name="nc_client_cert_setup">Configurar certificado do cliente</string>
@@ -62,9 +56,7 @@
     <string name="nc_account_scheduled_for_deletion">A conta está agendada para exclusão e não pode ser alterada</string>
     <string name="nc_settings_notification_sounds">Sons de notificação</string>
     <string name="nc_settings_call_ringtone">Chamadas</string>
-    <string name="nc_settings_call_ringtone_key">call_ringtone</string>
     <string name="nc_settings_message_ringtone">Mensagens</string>
-    <string name="nc_settings_message_ringtone_key">message_ringtone</string>
     <string name="nc_settings_no_ringtone">Sem som</string>
 
     <string name="nc_no_proxy">Sem proxy</string>
@@ -190,4 +182,10 @@ 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>
+    <!-- Content descriptions -->
+    <string name="nc_description_more_menu_one_to_one">Menu para conversa com %1$s</string>
+    <string name="nc_description_more_menu_public">Menu para conversa em grupo %1$s</string>
+    <string name="nc_description_more_menu_group">Menu para conversa pública %1$s</string>
+    <string name="nc_description_send_message_button">Enviar mensagem</string>
+
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 79c3c69ce..e15df3ee5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Прокси-сервер</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Тип прокси-сервера</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Узел прокси-сервера</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Порт прокси-сервера</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</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_client_cert_setup">Установка клиентского сертификата</string>
@@ -62,9 +56,7 @@
     <string name="nc_account_scheduled_for_deletion">Учётная запись запланирована к удалению и не может быть использована</string>
     <string name="nc_settings_notification_sounds">Звук уведомления</string>
     <string name="nc_settings_call_ringtone">Вызовы</string>
-    <string name="nc_settings_call_ringtone_key">call_ringtone</string>
     <string name="nc_settings_message_ringtone">Сообщения</string>
-    <string name="nc_settings_message_ringtone_key">message_ringtone</string>
     <string name="nc_settings_no_ringtone">Нет звука</string>
 
     <string name="nc_no_proxy">Не использовать прокси-сервер</string>
@@ -84,9 +76,11 @@
     <!-- Room menu -->
     <string name="nc_start_conversation">Начать беседу</string>
     <string name="nc_configure_room">Настроить беседу</string>
+    <string name="nc_configure_named_room">%1$s</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>
@@ -186,4 +180,10 @@ Nextcloud Talk поддерживает:
     <string name="nc_endless_cancel">Прервано пользователем</string>
     <string name="nc_endless_error">Ошибка загрузки дополнительных объектов.</string>
 
-    </resources>
+    <!-- Content descriptions -->
+    <string name="nc_description_more_menu_one_to_one">Меню для беседы с %1$s</string>
+    <string name="nc_description_more_menu_public">Меню для групповой беседы %1$s</string>
+    <string name="nc_description_more_menu_group">Меню для общей беседы %1$s</string>
+    <string name="nc_description_send_message_button">Отправить сообщение</string>
+
+</resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index f34c404a6..76b1bcf29 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">typ_proxy</string>
     <string name="nc_settings_proxy_type_title">Typ proxy</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Proxy host</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Proxy port</string>
-    <string name="nc_settings_proxy_username_key">proxy_užívateľské_meno</string>
-    <string name="nc_settings_proxy_password_key">proxy_heslo</string>
     <string name="nc_settings_use_credentials_title">Použi prihlasovacie údaje</string>
-    <string name="nc_settings_use_credentials_key">proxy_prihlasovacie_údaje</string>
     <string name="nc_settings_switch_account">Prepínať medzi účtami</string>
     <string name="nc_settings_reauthorize">Znova prihlásiť</string>
     <string name="nc_client_cert_setup">Nastaviť klientský certifikát</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 66d779765..58c4606e2 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -36,16 +36,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Posredniški strežnik</string>
-    <string name="nc_settings_proxy_type_key">vrsta_posredniškega_strežnika</string>
     <string name="nc_settings_proxy_type_title">Vrsta posredniškega strežnika</string>
-    <string name="nc_settings_proxy_host_key">gostitelj_posredniškega_strežnika</string>
     <string name="nc_settings_proxy_host_title">Gostitelj posredniškega strežnika</string>
-    <string name="nc_settings_proxy_port_key">vrata_posredniškega_strežnika</string>
     <string name="nc_settings_proxy_port_title">Vrata posredniškega strežnika</string>
-    <string name="nc_settings_proxy_username_key">uporabniško_ime_posredniškega_strežnika</string>
-    <string name="nc_settings_proxy_password_key">geslo_posredniškega_strežnika</string>
     <string name="nc_settings_use_credentials_title">Uporabi poverila</string>
-    <string name="nc_settings_use_credentials_key">poverila_posredniškega_strežnika</string>
     <string name="nc_settings_switch_account">Preklopi med računi</string>
     <string name="nc_settings_reauthorize">Ponovno overi dostop</string>
     <string name="nc_client_cert_setup">Nastavi potrdilo odjemalca</string>
@@ -58,9 +52,7 @@
     <string name="nc_account_scheduled_for_deletion">Račun je pripravljen za brisanje in ga ni mogoče spreminjati</string>
     <string name="nc_settings_notification_sounds">Obvestilni zvoki</string>
     <string name="nc_settings_call_ringtone">Klici</string>
-    <string name="nc_settings_call_ringtone_key">zvokovni_opomnik_klica</string>
     <string name="nc_settings_message_ringtone">Sporočila</string>
-    <string name="nc_settings_message_ringtone_key">zvokovni_opomnik_sporočila</string>
     <string name="nc_settings_no_ringtone">Brez zvoka</string>
 
     <string name="nc_no_proxy">Brez posredniškega strežnika</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 43e7868bb..db131adfa 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Посредник</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Тип посредника</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Домаћин</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Порт посредника</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</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_client_cert_setup">Подесите клијентски сертификат</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 1db1a8727..c96efe4e6 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -36,16 +36,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_key">proxy_type</string>
     <string name="nc_settings_proxy_type_title">Proxy-typ</string>
-    <string name="nc_settings_proxy_host_key">proxy_host</string>
     <string name="nc_settings_proxy_host_title">Proxy-värd</string>
-    <string name="nc_settings_proxy_port_key">proxy_port</string>
     <string name="nc_settings_proxy_port_title">Proxy-port</string>
-    <string name="nc_settings_proxy_username_key">proxy_username</string>
-    <string name="nc_settings_proxy_password_key">proxy_password</string>
     <string name="nc_settings_use_credentials_title">Använd uppgifter</string>
-    <string name="nc_settings_use_credentials_key">proxy_credentials</string>
     <string name="nc_settings_switch_account">Växla mellan konton</string>
     <string name="nc_settings_reauthorize">Återautentisera</string>
     <string name="nc_settings_remove_account">Ta bort konto</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 39bf09990..9e28332c1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -40,16 +40,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Vekil Sunucu</string>
-    <string name="nc_settings_proxy_type_key">vekil_sunucu_turu</string>
     <string name="nc_settings_proxy_type_title">Vekil sunucu türü</string>
-    <string name="nc_settings_proxy_host_key">vekil_sunucu_adi</string>
     <string name="nc_settings_proxy_host_title">Vekil Sunucu Adı</string>
-    <string name="nc_settings_proxy_port_key">vekil_sunucu_kapi_no</string>
     <string name="nc_settings_proxy_port_title">Vekil sunucu kapı numarası</string>
-    <string name="nc_settings_proxy_username_key">vekil_sunucu_kullanici_adi</string>
-    <string name="nc_settings_proxy_password_key">vekil_sunucu_parolasi</string>
     <string name="nc_settings_use_credentials_title">Kullanıcı bilgileri</string>
-    <string name="nc_settings_use_credentials_key">vekil_sunucu_kullanici_bilgileri</string>
     <string name="nc_settings_switch_account">Hesaplar arasında geçiş yap</string>
     <string name="nc_settings_reauthorize">Yeniden izin ver</string>
     <string name="nc_client_cert_setup">İstemci sertifikası kurulumu</string>
@@ -62,9 +56,7 @@
     <string name="nc_account_scheduled_for_deletion">Hesap silinmek üzere zamanlandı ve üzerinde işlem yapılamaz</string>
     <string name="nc_settings_notification_sounds"> Bildirim sesleri</string>
     <string name="nc_settings_call_ringtone">Çağrılar</string>
-    <string name="nc_settings_call_ringtone_key">çağrı_sesi</string>
     <string name="nc_settings_message_ringtone">İletiler</string>
-    <string name="nc_settings_message_ringtone_key">ileti_sesi</string>
     <string name="nc_settings_no_ringtone">Ses yok</string>
 
     <string name="nc_no_proxy">Vekil sunucu yok</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2f4aad3e2..854e140ba 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -37,16 +37,10 @@
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">代理</string>
-    <string name="nc_settings_proxy_type_key">代理服务类型</string>
     <string name="nc_settings_proxy_type_title">代理类型</string>
-    <string name="nc_settings_proxy_host_key">代理主机地址</string>
     <string name="nc_settings_proxy_host_title">代理主机</string>
-    <string name="nc_settings_proxy_port_key">代理主机端口</string>
     <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>