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 30c5acb39..a31b6ee9a 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Yes</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Settings</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Check out the certificate</string>
     <string name="nc_certificate_dialog_text">Do you trust the until now unknown SSL certificate, issued by %1$s for %2$s, valid from %3$s to %4$s?</string>
-    <string name="nc_yes">Yes</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Your SSL setup prevented connection</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 62f27dd3b..97c37cd63 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Paràmetres</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Verifica el certificat</string>
     <string name="nc_certificate_dialog_text">Us en refieu del certificat SSL desconegut fins ara, emès per %1$s per %2$s, vàlid del %3$s fins el %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">La vostra configuració SSL ha impedit la connexió</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 2001f2f9f..985cf1741 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Ano</string>
+    <string name="nc_no">Ne</string>
     <string name="nc_common_error_sorry">Omlouváme se, něco se pokazilo!</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Zkontrolovat certifikát</string>
     <string name="nc_certificate_dialog_text">Věříte doposud neznámému SSL certifikátu, vydaném %1$s pro %2$s, platnému od %3$s do %4$s?</string>
-    <string name="nc_yes">Ano</string>
-    <string name="nc_no">Ne</string>
     <string name="nc_certificate_error">Vaše nastavení SSL zabránilo připojení</string>
 
     <!-- Settings -->
@@ -305,9 +305,7 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">Nahrát místní soubor</string>
     <string name="nc_upload_from_nextcloud">Sdílet z Nextcloudu</string>
-    <string name="nc_upload_failed">Nepodařilo se nahrát soubor</string>
     <string name="nc_upload_choose_local_files">Vyberte soubory</string>
-
     <string name="nc_settings_phone_book_integration_desc">Propojit kontakty na základě telefoního čísla k integraci Talk v telefoním seznamu</string>
     <string name="nc_settings_phone_book_integration_title">Propojení s telefoním seznamem</string>
     <string name="no_phone_book_integration_due_to_permissions">Bez propojení kontaktů v telefonu z důvodu neudělení oprávnění</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 49ea8f6a2..09ed6c812 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Ja</string>
+    <string name="nc_no">Nej</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Indstillinger</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Tjek certifikatet</string>
     <string name="nc_certificate_dialog_text">Stoler du på det, indtil nu, ukendte SSL certifikat ,udstedt af %1$s for %2$s,  gyldig fra %3$s til %4$s?</string>
-    <string name="nc_yes">Ja</string>
-    <string name="nc_no">Nej</string>
     <string name="nc_certificate_error">Din SSL indstilling forhindrede forbindelse</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 47235beb3..6b09ebcd9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Ja</string>
+    <string name="nc_no">Nein</string>
     <string name="nc_common_error_sorry">Leider ist etwas schiefgelaufen!</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Überprüfen Sie das Zertifikat</string>
     <string name="nc_certificate_dialog_text">Soll dem bisher unbekannten SSL-Zertifikat, ausgestellt von %1$s für %2$s, gültig von %3$s bis %4$s, vertraut werden?</string>
-    <string name="nc_yes">Ja</string>
-    <string name="nc_no">Nein</string>
     <string name="nc_certificate_error">Ihre SSL-Konfiguration hat die Verbindung verhindert</string>
 
     <!-- Settings -->
@@ -308,9 +308,7 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">Lokale Datei hochladen</string>
     <string name="nc_upload_from_nextcloud">Von Nextcloud teilen</string>
-    <string name="nc_upload_failed">Fehler beim Hochladen der Datei</string>
     <string name="nc_upload_choose_local_files">Dateien auswählen</string>
-
     <string name="nc_settings_phone_book_integration_desc">Abgleich von Kontakten basierend auf der Telefonnummer zur Integration der Talk-Verknüpfung im Telefonbuch</string>
     <string name="nc_settings_phone_book_integration_title">Telefonbuch-Einbindung</string>
     <string name="no_phone_book_integration_due_to_permissions">Keine Telefonbuch-Einbindung aufgrund fehlender Berechtigungen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 33962e0b3..0fc27e76c 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Ναι</string>
+    <string name="nc_no">Όχι</string>
     <string name="nc_common_error_sorry">Συγνώμη, κάτι πήγε στραβά!</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Ελέγξτε το πιστοποιητικό</string>
     <string name="nc_certificate_dialog_text">Eμπιστεύεσαι το άγνωστο έως τώρα πιστοποιητικό SSL που εκδόθηκε %1$s για %2$s, έγκυρο από %3$s σε%4$s;</string>
-    <string name="nc_yes">Ναι</string>
-    <string name="nc_no">Όχι</string>
     <string name="nc_certificate_error">Η ρύθμιση SSL απέτρεψε την σύνδεση</string>
 
     <!-- Settings -->
@@ -304,9 +304,7 @@
 
     <!-- Upload -->
     <string name="nc_upload_local_file">Μεταφόρτωση τοπικού αρχείου</string>
-    <string name="nc_upload_failed">Αποτυχία μεταφόρτωσης αρχείου</string>
     <string name="nc_upload_choose_local_files">Επιλογή αρχείων</string>
-
     <string name="nc_settings_phone_book_integration_title">Ενσωμάτωση τηλεφωνικού καταλόγου </string>
     <string name="no_phone_book_integration_due_to_permissions">Αδύνατη η ενσωμάτωση τηλεφωνικού καταλόγου λόγω έλλειψης δικαιωμάτων</string>
 
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index 6cdecb7b7..21b4d1b72 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Configuraciones </string>
 
@@ -47,8 +50,6 @@
 
     <string name="nc_certificate_dialog_title">Verifica el certificado</string>
     <string name="nc_certificate_dialog_text">¿Confias en el certificado SSL, hasta ahora desconocido, emitido por %1$s para %2$s, con validez del %3$s al %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Tu configuración de SSL impidió la conexión</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml
index 0efd0a894..0e9d1f6e7 100644
--- a/app/src/main/res/values-es-rCO/strings.xml
+++ b/app/src/main/res/values-es-rCO/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Configuraciones </string>
 
@@ -47,8 +50,6 @@
 
     <string name="nc_certificate_dialog_title">Verifica el certificado</string>
     <string name="nc_certificate_dialog_text">¿Confias en el certificado SSL, hasta ahora desconocido, emitido por %1$s para %2$s, con validez del %3$s al %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Tu configuración de SSL impidió la conexión</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-es-rCR/strings.xml b/app/src/main/res/values-es-rCR/strings.xml
index 9a3e80b94..6ed57c2d9 100644
--- a/app/src/main/res/values-es-rCR/strings.xml
+++ b/app/src/main/res/values-es-rCR/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Configuraciones </string>
 
@@ -47,8 +50,6 @@
 
     <string name="nc_certificate_dialog_title">Verifica el certificado</string>
     <string name="nc_certificate_dialog_text">¿Confias en el certificado SSL, hasta ahora desconocido, emitido por %1$s para %2$s, con validez del %3$s al %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Tu configuración de SSL impidió la conexión</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml
index 9a3e80b94..6ed57c2d9 100644
--- a/app/src/main/res/values-es-rDO/strings.xml
+++ b/app/src/main/res/values-es-rDO/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Configuraciones </string>
 
@@ -47,8 +50,6 @@
 
     <string name="nc_certificate_dialog_title">Verifica el certificado</string>
     <string name="nc_certificate_dialog_text">¿Confias en el certificado SSL, hasta ahora desconocido, emitido por %1$s para %2$s, con validez del %3$s al %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Tu configuración de SSL impidió la conexión</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml
index 9a3e80b94..6ed57c2d9 100644
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Configuraciones </string>
 
@@ -47,8 +50,6 @@
 
     <string name="nc_certificate_dialog_title">Verifica el certificado</string>
     <string name="nc_certificate_dialog_text">¿Confias en el certificado SSL, hasta ahora desconocido, emitido por %1$s para %2$s, con validez del %3$s al %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Tu configuración de SSL impidió la conexión</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-es-rGT/strings.xml b/app/src/main/res/values-es-rGT/strings.xml
index 0efd0a894..0e9d1f6e7 100644
--- a/app/src/main/res/values-es-rGT/strings.xml
+++ b/app/src/main/res/values-es-rGT/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Configuraciones </string>
 
@@ -47,8 +50,6 @@
 
     <string name="nc_certificate_dialog_title">Verifica el certificado</string>
     <string name="nc_certificate_dialog_text">¿Confias en el certificado SSL, hasta ahora desconocido, emitido por %1$s para %2$s, con validez del %3$s al %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Tu configuración de SSL impidió la conexión</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index e01f7fe78..6cfae6b93 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Configuraciones </string>
 
@@ -47,8 +50,6 @@
 
     <string name="nc_certificate_dialog_title">Verifica el certificado</string>
     <string name="nc_certificate_dialog_text">¿Confias en el certificado SSL, hasta ahora desconocido, emitido por %1$s para %2$s, con validez del %3$s al %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Tu configuración de SSL impidió la conexión</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml
index 9a3e80b94..6ed57c2d9 100644
--- a/app/src/main/res/values-es-rSV/strings.xml
+++ b/app/src/main/res/values-es-rSV/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Configuraciones </string>
 
@@ -47,8 +50,6 @@
 
     <string name="nc_certificate_dialog_title">Verifica el certificado</string>
     <string name="nc_certificate_dialog_text">¿Confias en el certificado SSL, hasta ahora desconocido, emitido por %1$s para %2$s, con validez del %3$s al %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Tu configuración de SSL impidió la conexión</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ea79d541a..c561c6e57 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Sí</string>
+    <string name="nc_no">No</string>
     <string name="nc_common_error_sorry">Lo sentimos. Algo ha ido mal.</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Comprobar el certificado</string>
     <string name="nc_certificate_dialog_text">¿Confías en el certificado SSL antes desconocido emitido por %1$s para %2$s, válido de %3$s a %4$s?</string>
-    <string name="nc_yes">Sí</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Tu configuración SSL impidió la conexión</string>
 
     <!-- Settings -->
@@ -308,9 +308,7 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">Subir archivo local</string>
     <string name="nc_upload_from_nextcloud">Compartir desde Nextcloud</string>
-    <string name="nc_upload_failed">Error al subir el archivo</string>
     <string name="nc_upload_choose_local_files">Seleccionar archivos</string>
-
     <string name="nc_settings_phone_book_integration_desc">Haga coincidir los contactos según el número del teléfono para integrar el acceso directo de Talk en la agenda telefónica</string>
     <string name="nc_settings_phone_book_integration_title">Integración de la agenda telefónica</string>
     <string name="no_phone_book_integration_due_to_permissions">No hubo integración de la agenda telefónica debido a pérdida de permisos</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index b3678dc20..23d085c84 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Bai</string>
+    <string name="nc_no">Ez</string>
     <string name="nc_common_error_sorry">Sentitzen dugu, zerbait gaizki joan da!</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Egiaztatu ziurtagiria</string>
     <string name="nc_certificate_dialog_text">Fio zara %1$s (e)k  %2$s(e)ntzat emandako SSL ziurtagiri ezezagunaz?,  %3$s tik %4$sra baliagarria?</string>
-    <string name="nc_yes">Bai</string>
-    <string name="nc_no">Ez</string>
     <string name="nc_certificate_error">Zure SSL konfigurazioak konexioa eragotzi du</string>
 
     <!-- Settings -->
@@ -309,9 +309,7 @@ Ez Molestatu modua</string>
     <!-- Upload -->
     <string name="nc_upload_local_file">Kargatu fitxategi lokala</string>
     <string name="nc_upload_from_nextcloud">Partekatu Nextcloud bidez</string>
-    <string name="nc_upload_failed">Fitxategia kargatzeak huts egin du</string>
     <string name="nc_upload_choose_local_files">Hautatu fitxategiak</string>
-
     <string name="nc_settings_phone_book_integration_desc">Lotu kontaktuak telefono zenbakian oinarrituta, Talk lasterbideak integratzeko telefono zerrendan</string>
     <string name="nc_settings_phone_book_integration_title">Telefono zerrendan integratzea</string>
     <string name="no_phone_book_integration_due_to_permissions">Ezin izan da telefono zerrenda integratu, baimen falta dela eta</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index d16013f2d..3a8cebc7a 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">بله</string>
+    <string name="nc_no">نه</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">تنظیمات</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">گواهی را بررسی کنید</string>
     <string name="nc_certificate_dialog_text">آیا به گواهی SSL ناشناخته ، صادر شده توسط ، اعتماد دارید %1$s برای %2$s, معتبر از %3$s به %4$s؟</string>
-    <string name="nc_yes">بله</string>
-    <string name="nc_no">نه</string>
     <string name="nc_certificate_error">راه اندازی SSL شما مانع از اتصال شد</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index c48b5b1cc..27c8f8e4f 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Kyllä</string>
+    <string name="nc_no">Ei</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Asetukset</string>
 
@@ -39,8 +42,6 @@
     <string name="nc_search">Etsi</string>
 
     <string name="nc_certificate_dialog_title">Tarkista varmenne</string>
-    <string name="nc_yes">Kyllä</string>
-    <string name="nc_no">Ei</string>
     <string name="nc_certificate_error">SSL-asetukset esti yhteyden</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6cb147393..d71ef658b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Oui</string>
+    <string name="nc_no">Non</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Paramètres</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Vérifier le certificat</string>
     <string name="nc_certificate_dialog_text">Faites-vous confiance au certificat SSL jusque-là inconnu, émis par %1$s pour%2$s, et est valide du %3$s au %4$s ?</string>
-    <string name="nc_yes">Oui</string>
-    <string name="nc_no">Non</string>
     <string name="nc_certificate_error">Votre configuration SSL a empêché la connexion</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 8eaa8c1cb..640a864ce 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Si</string>
+    <string name="nc_no">Non</string>
     <string name="nc_common_error_sorry">Sentímolo, algo foi mal!</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Verificar o certificado</string>
     <string name="nc_certificate_dialog_text">Quere confiar nun certificado SSL descoñecido, emitido por %1$s para %2$s, válido dende %3$s ata %4$s?</string>
-    <string name="nc_yes">Si</string>
-    <string name="nc_no">Non</string>
     <string name="nc_certificate_error">A súa configuración SSL impediu a conexión</string>
 
     <!-- Settings -->
@@ -308,9 +308,7 @@ móbiles. Pode tentar unirse á chamada empregando o navegador web.</string>
     <!-- Upload -->
     <string name="nc_upload_local_file">Enviar un ficheiro local</string>
     <string name="nc_upload_from_nextcloud">Compartir dende Nextcloud</string>
-    <string name="nc_upload_failed">Produciuse un fallo ao enviar o ficheiro</string>
     <string name="nc_upload_choose_local_files">Escolla os ficheiros</string>
-
     <string name="nc_settings_phone_book_integration_desc">Emparellar os contactos en función do número de teléfono para integrar o atallo de Talk na axenda telefónica</string>
     <string name="nc_settings_phone_book_integration_title">Integración da axenda de teléfonos</string>
     <string name="no_phone_book_integration_due_to_permissions">Non hai integración da axenda de teléfonos por mor da falta de permisos</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index c31636827..c8d17a387 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Da</string>
+    <string name="nc_no">Ne</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Postavke</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Pogledaj vjerodajnicu</string>
     <string name="nc_certificate_dialog_text">Vjerujete li dosad nepoznatoj SSL vjerodajnici koju je izdao %1$s za %2$s i koja vrijedi od %3$s do %4$s?</string>
-    <string name="nc_yes">Da</string>
-    <string name="nc_no">Ne</string>
     <string name="nc_certificate_error">Vezu je onemogućila vaša postavka SSL-a</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index bd45942c6..52d1a1495 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Igen</string>
+    <string name="nc_no">Nem</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Beállítások</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Ellenőrizze a tanúsítványt</string>
     <string name="nc_certificate_dialog_text">Megbízik a(z) %1$s által a(z) %2$s részére kiállított, %3$s és %4$s között érvényes, korábban ismeretlen SSL tanúsítványban?</string>
-    <string name="nc_yes">Igen</string>
-    <string name="nc_no">Nem</string>
     <string name="nc_certificate_error">Az SSL beállítás megakadályozta a kapcsolódást</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 4c5563642..49ec6dc03 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Já</string>
+    <string name="nc_no">Nei</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Stillingar</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Sannreyna skilríkið</string>
     <string name="nc_certificate_dialog_text">Treystirðu hinu hingað til óþekkta SSL-skilríki, útgefnu af %1$s fyrir %2$s, með gildistíma frá %3$s til %4$s?</string>
-    <string name="nc_yes">Já</string>
-    <string name="nc_no">Nei</string>
     <string name="nc_certificate_error">SSL-uppsetningin þín kom í veg fyrir tengingu</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d33f3364b..16d975865 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Sì</string>
+    <string name="nc_no">No</string>
     <string name="nc_common_error_sorry">Spiacenti, qualcosa non ha funzionato!</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Controlla il certificato</string>
     <string name="nc_certificate_dialog_text">Ti fidi del certificato SSL fino ad ora sconosciuto, rilasciato da %1$s per %2$s, valido da %3$s a %4$s?</string>
-    <string name="nc_yes">Sì</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">La tua configurazione SSL ha impedito la connessione</string>
 
     <!-- Settings -->
@@ -308,9 +308,7 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">Carica file locale</string>
     <string name="nc_upload_from_nextcloud">Condividi da Nextcloud</string>
-    <string name="nc_upload_failed">Invio del file non riuscito</string>
     <string name="nc_upload_choose_local_files">Scegli i file</string>
-
     <string name="nc_settings_phone_book_integration_desc">Verifica i contatti in base al numero di telefono per integrare il collegamento di Talk nella rubrica</string>
     <string name="nc_settings_phone_book_integration_title">Integrazione della rubrica</string>
     <string name="no_phone_book_integration_due_to_permissions">Nessuna integrazione della rubrica a causa di autorizzazioni mancanti</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index d520aa666..fc4063b40 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">כן</string>
+    <string name="nc_no">לא</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">הגדרות</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">חקירת האישור</string>
     <string name="nc_certificate_dialog_text">האם אתה סומך על אישור ה- SSL הלא ידוע עד כה, שהונפק על ידי %1$s עבור %2$s, תקף מ-%3$sעד %4$s?</string>
-    <string name="nc_yes">כן</string>
-    <string name="nc_no">לא</string>
     <string name="nc_certificate_error">הגדרות ה־SSL שלך מנעו חיבור</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index d0082e43a..b59c193c8 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">はい</string>
+    <string name="nc_no">いいえ</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">設定</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">証明書をチェックアウトする</string>
     <string name="nc_certificate_dialog_text">未確認のSSL証明書を信頼しますか？（ issued by %1$s for %2$s, valid from %3$s to %4$s）</string>
-    <string name="nc_yes">はい</string>
-    <string name="nc_no">いいえ</string>
     <string name="nc_certificate_error">SSL設定で接続が妨げられました</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 9409d1d02..f50b9be27 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">예</string>
+    <string name="nc_no">아니요</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">설정</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">인증서 확인</string>
     <string name="nc_certificate_dialog_text">%1$s에서 %2$s에게 발급한 %3$s부터 %4$s까지 유효한 알 수 없는 인증서를 신뢰하시겠습니까?</string>
-    <string name="nc_yes">예</string>
-    <string name="nc_no">아니요</string>
     <string name="nc_certificate_error">SSL 설정에서 연결을 거부함</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 782bd7b19..de3a34649 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Taip</string>
+    <string name="nc_no">Ne</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Nustatymai</string>
 
@@ -42,8 +45,6 @@
     <string name="nc_search">Ieškoti</string>
 
     <string name="nc_certificate_dialog_text">Ar pasitikite iki šiol nežinomu SSL liudijimu, kurį išdavė %1$s, kuris skirtas %2$s ir galioja nuo %3$s iki %4$s?</string>
-    <string name="nc_yes">Taip</string>
-    <string name="nc_no">Ne</string>
     <string name="nc_certificate_error">Jūsų SSL sąranka neleido ryšio</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index ad5cc0ebc..7d97ce9e0 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Ja</string>
+    <string name="nc_no">Nei</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Instillinger</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Sjekk sertifikatet</string>
     <string name="nc_certificate_dialog_text">Ønsker du å stole på det hittil ukjente SSL-sertifikatet, utstedt av %1$s for %2$s gyldig fra %3$s til %4$s?</string>
-    <string name="nc_yes">Ja</string>
-    <string name="nc_no">Nei</string>
     <string name="nc_certificate_error">Ditt SSL-oppsett forhindret tilkobling</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 651ed1cf4..c545f4c4a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Ja</string>
+    <string name="nc_no">Nee</string>
     <string name="nc_common_error_sorry">Sorry, er is iets fout gegaan!</string>
 
     <!-- Bottom Navigation -->
@@ -53,8 +55,6 @@ Kies er eentje van een provider.</string>
 
     <string name="nc_certificate_dialog_title">Verifieer het certificaat</string>
     <string name="nc_certificate_dialog_text">Vertrouw je het tot nu onbekende SSL certificaat, uitgegeven door %1$s voor %2$s, geldig van %3$s tot %4$s?</string>
-    <string name="nc_yes">Ja</string>
-    <string name="nc_no">Nee</string>
     <string name="nc_certificate_error">Je SSL-instellingen blokkeerden de verbinding</string>
 
     <!-- Settings -->
@@ -310,9 +310,7 @@ Je kunt proberen om aan het gesprek deel te nemen via een browser.</string>
     <!-- Upload -->
     <string name="nc_upload_local_file">Upload lokaal bestand</string>
     <string name="nc_upload_from_nextcloud">Delen vanuit Nextcloud</string>
-    <string name="nc_upload_failed">Kon bestand niet uploaden</string>
     <string name="nc_upload_choose_local_files">Kies bestanden</string>
-
     <string name="nc_settings_phone_book_integration_desc">Combineer contactpersonen gebaseerd op telefoonnummer om Talk-snelkoppelingen te integreren in je telefoonboek</string>
     <string name="nc_settings_phone_book_integration_title">Telefoonboek-integratie</string>
     <string name="no_phone_book_integration_due_to_permissions">Geen telefoonboekintegratie wegens ontbrekende permissies</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8a6eb78d4..d4c67d3bf 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Tak</string>
+    <string name="nc_no">Nie</string>
     <string name="nc_common_error_sorry">Przepraszamy, coś poszło nie tak!</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Sprawdź certyfikat</string>
     <string name="nc_certificate_dialog_text">Czy ufasz dotychczas nieznanemu certyfikatowi SSL, wydanemu przez %1$s dla %2$s, ważnemu od %3$s do %4$s?</string>
-    <string name="nc_yes">Tak</string>
-    <string name="nc_no">Nie</string>
     <string name="nc_certificate_error">Twoje ustawienia SSL uniemożliwiają połaczenie</string>
 
     <!-- Settings -->
@@ -308,9 +308,7 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">Wyślij plik lokalny</string>
     <string name="nc_upload_from_nextcloud">Udostępnij z Nextcloud</string>
-    <string name="nc_upload_failed">Nie udało się wysłać pliku</string>
     <string name="nc_upload_choose_local_files">Wybierz plik</string>
-
     <string name="nc_settings_phone_book_integration_desc">Dopasuj kontakty na podstawie numeru telefonu, aby zintegrować skrót Talk w książce telefonicznej</string>
     <string name="nc_settings_phone_book_integration_title">Integracja książki telefonicznej</string>
     <string name="no_phone_book_integration_due_to_permissions">Brak integracji książki telefonicznej z powodu braku uprawnień</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f681f0472..925b20db3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Sim</string>
+    <string name="nc_no">Não</string>
     <string name="nc_common_error_sorry">Desculpe, algo deu errado! </string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Confira o certificado</string>
     <string name="nc_certificate_dialog_text">Quer confiar em um certificado SSL desconhecido, emitido por %1$s para %2$s, válido de %3$s a %4$s?</string>
-    <string name="nc_yes">Sim</string>
-    <string name="nc_no">Não</string>
     <string name="nc_certificate_error">Sua configuração SSL impediu a conexão</string>
 
     <!-- Settings -->
@@ -308,9 +308,7 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">Enviar arquivo local </string>
     <string name="nc_upload_from_nextcloud">Compartilhe do Nextcloud </string>
-    <string name="nc_upload_failed">Falha ao enviar o arquivo </string>
     <string name="nc_upload_choose_local_files">Escolher os arquivos </string>
-
     <string name="nc_settings_phone_book_integration_desc">Combinar contatos com base no número de telefone para integrar o atalho do Talk na lista de telefones</string>
     <string name="nc_settings_phone_book_integration_title">Integração da lista de telefones</string>
     <string name="no_phone_book_integration_due_to_permissions">Nenhuma integração da lista de telefones devido à falta de permissões</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1eb1174c8..1d6c21e93 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Sim</string>
+    <string name="nc_no">Não</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Definições</string>
 
@@ -42,8 +45,6 @@
     <string name="nc_search">Pesquisar</string>
 
     <string name="nc_certificate_dialog_title">Confira o certificado</string>
-    <string name="nc_yes">Sim</string>
-    <string name="nc_no">Não</string>
     <string name="nc_certificate_error">A sua configuração de SSL impediu a ligação</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 42e979d49..4d8cab4db 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Да</string>
+    <string name="nc_no">Нет</string>
     <string name="nc_common_error_sorry">Что-то пошло не так :(</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Проверьте сертификат</string>
     <string name="nc_certificate_dialog_text">Доверять неизвестному сертификату SSL: выпущен %1$s для %2$s, действителен с %3$s по %4$s?</string>
-    <string name="nc_yes">Да</string>
-    <string name="nc_no">Нет</string>
     <string name="nc_certificate_error">Заданные параметры SSL не позволяют подключиться</string>
 
     <!-- Settings -->
@@ -286,7 +286,5 @@
     <string name="nc_99_plus">99+</string>
     <string name="nc_copy_message">Копировать</string>
     <string name="nc_reply">Ответить</string>
-    <string name="nc_upload_failed">Не удалось загрузить файл</string>
     <string name="nc_upload_choose_local_files">Выберите файлы</string>
-
     </resources>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index c5aca8f18..5fc59b35c 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Eja</string>
+    <string name="nc_no">No</string>
     <string name="nc_common_error_sorry">Ddoe at àpidu un\'errore!</string>
 
     <!-- Bottom Navigation -->
@@ -52,13 +54,12 @@
 
     <string name="nc_certificate_dialog_title">Controlla su tzertificadu</string>
     <string name="nc_certificate_dialog_text">Ti fidas de su tzertificadu SSL, disconnotu finas a immoe, frunidu dae %1$s pro %2$s, vàlidu dae %3$s a %4$s?</string>
-    <string name="nc_yes">Eja</string>
-    <string name="nc_no">No</string>
     <string name="nc_certificate_error">Sa cunfiguratzione SSL at refudadu sa connessione</string>
 
     <!-- Settings -->
     <string name="nc_settings_proxy_title">Proxy</string>
     <string name="nc_settings_proxy_type_title">Genia de proxy</string>
+    <string name="nc_settings_proxy_host_title">Istrangiadore Proxy</string>
     <string name="nc_settings_proxy_port_title">Ghenna de su proxy</string>
     <string name="nc_settings_use_credentials_title">Imprea credentziales</string>
     <string name="nc_settings_switch_account">Passa a àteros contos</string>
@@ -67,7 +68,7 @@
     <string name="nc_client_cert_change">Càmbia tzertificadu cliente</string>
     <string name="nc_settings_remove">Boga</string>
     <string name="nc_settings_remove_confirmation">Cunfirma s\'intentzione tua de nde bogare su contu atuale.</string>
-    <string name="nc_settings_remove_account">Boga contu</string>
+    <string name="nc_settings_remove_account">Boga·nche su contu</string>
     <string name="nc_settings_add_account">Agiunghe unu contu nou</string>
     <string name="nc_add">Agiunghe</string>
     <string name="nc_settings_wrong_account">Isceti su contu atuale si podet torrare a autorizare</string>
@@ -211,6 +212,9 @@
     <string name="nc_configure_cert_auth">Seletziona tzertificadu autenticatzione</string>
     <string name="nc_change_cert_auth">Càmbia tzertificadu autenticatzione</string>
 
+    <!-- Moderation -->
+    <string name="nc_demote">Botza dae moderadore</string>
+    <string name="nc_promote">Approva a moderadore</string>
     <string name="nc_remove_participant"> Boga·nche partetzipante</string>
 
     <!-- Chat -->
@@ -237,6 +241,14 @@
     <!-- When translating to German, please use non-formal variant -->
     <string name="nc_formatted_message_you">Tue: %1$s</string>
 
+    <!-- Contacts endless loading -->
+    <string name="nc_no_more_load_retry">Non ddoe at àteros elementos de carrigare. Agiorna pro torrare a proare</string>
+    <string name="nc_endless_disabled">Non ddoe at àteros elementos de carrigare (cròmpidu a su màssimu).</string>
+    <string name="nc_endless_cancel">Cantzelladu dae s\'utente.</string>
+    <string name="nc_endless_error">Ddoe at àpidu un\'errore carrighende àteros elementos.</string>
+
+    <!-- Content descriptions -->
+    <string name="nc_description_more_menu_one_to_one">Menu pro tzarrada cun%1$s</string>
     <string name="nc_description_send_message_button">Imbia messàgiu</string>
 
     <string name="nc_hello">Salude</string>
@@ -266,7 +278,5 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">Càrriga documentu locale</string>
     <string name="nc_upload_from_nextcloud">Cumpartzi dae Nextcloud</string>
-    <string name="nc_upload_failed">No at fatu a carrigare su documentu</string>
     <string name="nc_upload_choose_local_files">Sèbera documentos</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 f3ee06f72..739c5437f 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Áno</string>
+    <string name="nc_no">Nie</string>
     <string name="nc_common_error_sorry">Prepáčte, niečo sa nepodarilo!</string>
 
     <!-- Bottom Navigation -->
@@ -51,8 +53,6 @@
 
     <string name="nc_certificate_dialog_title">Skontrolujte certifikát</string>
     <string name="nc_certificate_dialog_text">Dôverujete tomuto doteraz neznámemu SSL certifikátu, vydaného %1$s pre %2$s, platného od %3$s do %4$s ?</string>
-    <string name="nc_yes">Áno</string>
-    <string name="nc_no">Nie</string>
     <string name="nc_certificate_error">Vaša konfigurácia SSL zabránila pripojeniu</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 8bdcfeab3..f00cbf000 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Da</string>
+    <string name="nc_no">Ne</string>
     <string name="nc_common_error_sorry">Prišlo je do napake ...</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Preveri potrdilo</string>
     <string name="nc_certificate_dialog_text">Ali zaupate do sedaj neznanemu potrdilu SSL, izdanem s strani %1$s za %2$s, z obdobjem veljavnosti od %3$s do %4$s?</string>
-    <string name="nc_yes">Da</string>
-    <string name="nc_no">Ne</string>
     <string name="nc_certificate_error">Nastavitve SSL onemogočajo vzpostavitev povezave</string>
 
     <!-- Settings -->
@@ -309,9 +309,7 @@ Pozdravite prijatelje in znance.</string>
     <!-- Upload -->
     <string name="nc_upload_local_file">Pošlji krajevno datoteko</string>
     <string name="nc_upload_from_nextcloud">Pošlji iz oblaka Nextcloud</string>
-    <string name="nc_upload_failed">Pošiljanje datoteke je spodletelo</string>
     <string name="nc_upload_choose_local_files">Izbor datotek</string>
-
     <string name="nc_settings_phone_book_integration_desc">Poveži stike po telefonski številki za povezavo imenika s programom Talk</string>
     <string name="nc_settings_phone_book_integration_title">Združevalnik telefonskega imenika</string>
     <string name="no_phone_book_integration_due_to_permissions">Povezava s telefonskim imenikom ni na voljo zaradi neustreznih dovoljenj.</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 1b8ee9b44..ce152acb7 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Po</string>
+    <string name="nc_no">Jo</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Rregullimet</string>
 
@@ -44,8 +47,6 @@
 
     <string name="nc_certificate_dialog_title">Kontrollo çertifikaten</string>
     <string name="nc_certificate_dialog_text">A e beson deri tani çertifikatën e panjohur deri tani SSL, lëshuar nga %1$spër %2$s, e vlefshme nga %3$s në %4$s?</string>
-    <string name="nc_yes">Po</string>
-    <string name="nc_no">Jo</string>
     <string name="nc_certificate_error">Struktura juaj SSL e ndaloi lidhjen</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index cfafbf8fc..9367a11d7 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Da</string>
+    <string name="nc_no">Ne</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Postavke</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Proveri sertifikat</string>
     <string name="nc_certificate_dialog_text">Da li verujete, do sada nepoznatom, SSL sertifikatu, koji je izdao %1$s na %2$s, validnim od %3$s do %4$s?</string>
-    <string name="nc_yes">Da</string>
-    <string name="nc_no">Ne</string>
     <string name="nc_certificate_error">Vaša SSL postava je onemogućila povezivanje</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 357d48bdb..0ac5c21f5 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Да</string>
+    <string name="nc_no">Не</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Поставке</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Провери сертификат</string>
     <string name="nc_certificate_dialog_text">Да ли верујете, до сада непознатом, SSL сертификату, који је издао %1$s на %2$s, валидним од %3$s до %4$s?</string>
-    <string name="nc_yes">Да</string>
-    <string name="nc_no">Не</string>
     <string name="nc_certificate_error">Ваша ССЛ постава је онемогућила повезивање</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 694b807fc..fa1bef935 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Ja</string>
+    <string name="nc_no">Nej</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Inställningar</string>
 
@@ -48,8 +51,6 @@
 
     <string name="nc_certificate_dialog_title">Kontrollera certifikatet</string>
     <string name="nc_certificate_dialog_text">Litar du på det tills nu okända SSL-certifikatet, skapad av  %1$s för %2$s, giltig från%3$s till %4$s?</string>
-    <string name="nc_yes">Ja</string>
-    <string name="nc_no">Nej</string>
     <string name="nc_certificate_error">Dina SSL-inställningar förhindrade anslutning</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f6e56526a..c5867516c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">Evet</string>
+    <string name="nc_no">Hayır</string>
     <string name="nc_common_error_sorry">Maalesef bir sorun çıktı!</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">Sertifikayı denetleyin</string>
     <string name="nc_certificate_dialog_text">Şimdiye kadar bilinmeyen, %1$s tarafından %2$s için yayınlanmış %3$s ile %4$s tarihleri arasında geçerli olan sertifikaya güvenilsin mi?</string>
-    <string name="nc_yes">Evet</string>
-    <string name="nc_no">Hayır</string>
     <string name="nc_certificate_error">SSL kurulumunuz bağlantı kurulmasını engelliyor</string>
 
     <!-- Settings -->
@@ -308,9 +308,7 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">Yerel dosya yükle</string>
     <string name="nc_upload_from_nextcloud">Nextcloud üzerinden paylaş</string>
-    <string name="nc_upload_failed">Dosya yüklenemedi</string>
     <string name="nc_upload_choose_local_files">Dosyaları seçin</string>
-
     <string name="nc_settings_phone_book_integration_desc">Telefon defterinde kişileri telefon numaralarına göre eşleştirerek Talk kısa yolunu görüntüler</string>
     <string name="nc_settings_phone_book_integration_title">Telefon defteri bütünleştirmesi</string>
     <string name="no_phone_book_integration_due_to_permissions">İzinler eksik olduğundan telefon defteri bütünleştirmesi yok</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 82247b2a8..9dc7392c1 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">Đồng ý</string>
+    <string name="nc_no">Không</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">Thiết lập</string>
 
@@ -47,8 +50,6 @@
 
     <string name="nc_certificate_dialog_title">Kiểm tra chứng chỉ</string>
     <string name="nc_certificate_dialog_text">Bạn có tin tưởng vào chứng thực SSL chưa biết này không, phát sinh này bởi %1$s cho %2$s, hiệu lực từ %3$s đến %4$s?</string>
-    <string name="nc_yes">Đồng ý</string>
-    <string name="nc_no">Không</string>
     <string name="nc_certificate_error">Thiết lập SSL của bạn đã ngăn chặn kết nối</string>
 
     <!-- Settings -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e15358f5e..60dc20ef2 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">是的</string>
+    <string name="nc_no">不</string>
     <string name="nc_common_error_sorry">抱歉，出问题了！</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">检查证书</string>
     <string name="nc_certificate_dialog_text">您是否信任由 %1$s 颁发给 %2$s，生效时间从 %3$s 至 %4$s的未知证书？</string>
-    <string name="nc_yes">是的</string>
-    <string name="nc_no">不</string>
     <string name="nc_certificate_error">您的 SSL 设置阻止了连接</string>
 
     <!-- Settings -->
@@ -305,9 +305,7 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">上传本地文件</string>
     <string name="nc_upload_from_nextcloud">从 Nextcloud 共享</string>
-    <string name="nc_upload_failed">上传文件失败</string>
     <string name="nc_upload_choose_local_files">选择文件</string>
-
     <string name="nc_settings_phone_book_integration_desc">根据电话号码匹配联系人，集成 Talk 快捷方式到电话簿。</string>
     <string name="nc_settings_phone_book_integration_title">电话簿集成</string>
     <string name="no_phone_book_integration_due_to_permissions">由于缺少权限，没有电话簿集成</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 4f5f0b5c3..985e09682 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -20,6 +20,8 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Common -->
+    <string name="nc_yes">是</string>
+    <string name="nc_no">否</string>
     <string name="nc_common_error_sorry">發生錯誤了 :(</string>
 
     <!-- Bottom Navigation -->
@@ -52,8 +54,6 @@
 
     <string name="nc_certificate_dialog_title">請檢查憑證</string>
     <string name="nc_certificate_dialog_text">您是否信任由%1$s提交給%2$s，有效時間為%3$s至%4$s的不詳證書？</string>
-    <string name="nc_yes">是</string>
-    <string name="nc_no">否</string>
     <string name="nc_certificate_error">您的SSL設定阻擋這連線。</string>
 
     <!-- Settings -->
@@ -308,9 +308,7 @@
     <!-- Upload -->
     <string name="nc_upload_local_file">上傳本地文件</string>
     <string name="nc_upload_from_nextcloud">透過 Nextcloud 分享</string>
-    <string name="nc_upload_failed">上傳檔案失敗</string>
     <string name="nc_upload_choose_local_files">選擇檔案</string>
-
     <string name="nc_settings_phone_book_integration_desc">根據電話號碼匹配聯絡人以將 Talk 快捷方式集成到電話簿中</string>
     <string name="nc_settings_phone_book_integration_title">電話簿整合</string>
     <string name="no_phone_book_integration_due_to_permissions">由於缺少權限而無法集成電話簿</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9f6594cd8..8d21a9039 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -19,6 +19,9 @@
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Common -->
+    <string name="nc_yes">是</string>
+    <string name="nc_no">否</string>
     <!-- Bottom Navigation -->
     <string name="nc_settings">設定</string>
 
@@ -45,8 +48,6 @@
     <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_certificate_error">您的SSL設定阻擋這連線。</string>
 
     <!-- Settings -->