diff --git a/src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java b/src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java
index 2dc9232527..7c7558be2e 100644
--- a/src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/ParticipateActivity.java
@@ -84,13 +84,12 @@ public class ParticipateActivity extends FileActivity {
         TextView contributeTranslationView = (TextView) findViewById(R.id.participate_contribute_translate_text);
         contributeTranslationView.setMovementMethod(LinkMovementMethod.getInstance());
         contributeTranslationView.setText(Html.fromHtml(
-                getString(R.string.participate_contribute_translate_text,
-                        getString(R.string.translation_link)
-                )));
+                getString(R.string.participate_contribute_translate_text, getString(R.string.translation_link))));
 
         TextView contributeGithubView = (TextView) findViewById(R.id.participate_contribute_github_text);
         contributeGithubView.setMovementMethod(LinkMovementMethod.getInstance());
-        contributeGithubView.setText(Html.fromHtml(getString(R.string.participate_contribute_github_text)));
+        contributeGithubView.setText(Html.fromHtml(getString(R.string.participate_contribute_github_text,
+                getString(R.string.contributing_link))));
 
         findViewById(R.id.participate_testing_report).setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/src/main/res/values-ast/strings.xml b/src/main/res/values-ast/strings.xml
index 9424617444..6853699aa4 100644
--- a/src/main/res/values-ast/strings.xml
+++ b/src/main/res/values-ast/strings.xml
@@ -91,6 +91,7 @@
     <string name="file_list_empty_search">¿Quiciabes tea nuna carpeta diferente?</string>
     <string name="file_list_empty_recently_modified_filter">La to gueta nun devolvió ficheros
         modificaos nos caberos 7 díes.</string>
+    <string name="file_list_empty_recently_added_filter">La to gueta nun devolvió ficheros amestaos apocayá</string>
     <string name="file_list_empty_text_videos_filter">La to gueta nun devolvió vídeos.</string>
     <string name="upload_list_empty_headline">Nun hai xubes disponibles</string>
     <string name="file_list_folder">Carpeta</string>
diff --git a/src/main/res/values-cs-rCZ/strings.xml b/src/main/res/values-cs-rCZ/strings.xml
index a52b6a1dce..eb2c48e98a 100644
--- a/src/main/res/values-cs-rCZ/strings.xml
+++ b/src/main/res/values-cs-rCZ/strings.xml
@@ -540,9 +540,6 @@
     <string name="participate_release_candidate_headline">Předběžná verze</string>
     <string name="participate_release_candidate_text">Předběžná verze nebo také Release Candidate (RC) je stabilní stav připravované, finální verze. Přihlas se jako tester v Play store nebo si najdi a instaluj hodící se verzi z F-Droid pod \"Verze\".</string>
     <string name="participate_contribute_headline">Aktivně něčím přispět</string>
-    <string name="participate_contribute_irc_text">Diskutovat na IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Pomozte ostatním na &lt;a href="%1$s">fóru&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">Přeložte&lt;/a> aplikaci</string>
     <string name="move_to">Přesunout do&#8230;</string>
     <string name="copy_to">Kopírovat do&#8230;</string>
     <string name="choose_remote_folder">Vybrat adresář&#8230;</string>
diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml
index 3cd9da4c89..4e684e0e0c 100644
--- a/src/main/res/values-de-rDE/strings.xml
+++ b/src/main/res/values-de-rDE/strings.xml
@@ -108,7 +108,7 @@
     <string name="file_list_empty_headline_server_search">Keine Ergebnisse</string>
     <string name="file_list_empty_favorite_headline">Noch keine Favoriten vorhanden</string>
     <string name="file_list_empty_shared_headline">Noch nichts geteilt</string>
-    <string name="file_list_empty_shared">Von dir geteilte Dateien und Ordner werden hier erscheinen</string>
+    <string name="file_list_empty_shared">Von Ihnen geteilte Dateien und Ordner werden hier erscheinen</string>
     <string name="file_list_empty_headline_server_search_videos">Keine Videos</string>
     <string name="file_list_empty_headline_server_search_photos">Keine Fotos</string>
     <string name="file_list_empty_search">Vielleicht befindet es sich in einem anderen Ordner?</string>
@@ -172,7 +172,7 @@
     <string name="uploads_view_group_finished_uploads">Hochgeladen</string>
     <string name="uploads_view_upload_status_succeeded">Fertiggestellt</string>
     <string name="uploads_view_upload_status_cancelled">Abgebrochen</string>
-    <string name="uploads_view_upload_status_paused">pausiert</string>
+    <string name="uploads_view_upload_status_paused">Pausiert</string>
     <string name="uploads_view_upload_status_failed_connection_error">Verbindungsfehler</string>
     <string name="uploads_view_upload_status_failed_retry">Hochladen wird in Kürze erneut versucht</string>
     <string name="uploads_view_upload_status_failed_credentials_error">Zugangsdaten falsch</string>
@@ -214,7 +214,7 @@
     <string name="upload_query_move_foreign_files">Es steht nicht genügend Speicherplatz zur Verfügung, um die ausgewählten Dateien in das Verzeichnis %1$s zu kopieren. Sollen diese stattdessen verschoben werden?</string>
     <string name="pass_code_enter_pass_code">Bitte geben Sie Ihre PIN ein</string>
     
-    <string name="pass_code_configure_your_pass_code">Bitte PIN eingeben</string>
+    <string name="pass_code_configure_your_pass_code">PIN eingeben</string>
     <string name="pass_code_configure_your_pass_code_explanation">Die PIN wird jedes mal beim Start der App abgefragt</string>
     <string name="pass_code_reenter_your_pass_code">Bitte Ihre PIN nochmals eingeben</string>
     <string name="pass_code_remove_your_pass_code">PIN entfernen</string>
@@ -241,7 +241,7 @@
     <string name="media_err_unexpected">Ein unerwarteter Fehler ist aufgetreten beim Versuch %1$s wiederzugeben</string>
     <string name="media_rewind_description">Rückspulknopf</string>
     <string name="media_play_pause_description">Wiedergabe-/Pause Knopf</string>
-    <string name="media_forward_description">Vorspul Knopf</string>
+    <string name="media_forward_description">Vorspulknopf</string>
 
 	<string name="auth_getting_authorization">Genehmigung erhalten &#8230;</string>
 	<string name="auth_trying_to_login">Der Versuch, sich anzumelden &#8230;</string>
@@ -249,17 +249,17 @@
 	<string name="auth_nossl_plain_ok_title">Sichere Verbindung nicht verfügbar.</string>
 	<string name="auth_connection_established">Verbindung hergestellt</string>
 	<string name="auth_testing_connection">Verbindung testen</string>
-	<string name="auth_not_configured_title">Fehlerhafte Server Konfiguration</string>
+	<string name="auth_not_configured_title">Fehlerhafte Serverkonfiguration</string>
 	<string name="auth_account_not_new">Ein Benutzerkonto für den gleichen Benutzer und Server existiert auf diesem Gerät bereits</string>
 	<string name="auth_account_not_the_same">Der eingegebene Benutzer passt nicht zu dem Benutzer dieses Benutzerkontos</string>
 	<string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
 	<string name="auth_unknown_host_title">Konnte den Host nicht finden</string>
 	<string name="auth_incorrect_path_title">Server nicht gefunden</string>
 	<string name="auth_timeout_title">Der Server braucht zu lange für eine Antwort.</string>
-	<string name="auth_incorrect_address_title">Falsches Adress-Format für den Server</string>
-	<string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen.</string>
+	<string name="auth_incorrect_address_title">Falsches Adressformat für den Server</string>
+	<string name="auth_ssl_general_error_title">SSL-Initialisierung fehlgeschlagen</string>
 	<string name="auth_ssl_unverified_server_title">SSL-Server-Identität konnte nicht überprüft werden</string>
-	<string name="auth_bad_oc_version_title">Unbekannte Server-Version</string>
+	<string name="auth_bad_oc_version_title">Unbekannte Serverversion</string>
 	<string name="auth_wrong_connection_title">Verbindung konnte nicht hergestellt werden</string>
 	<string name="auth_secure_connection">Sichere Verbindung hergestellt</string>
 	<string name="auth_unauthorized">Falscher Benutzername oder Passwort</string>
@@ -560,10 +560,10 @@
     <string name="participate_release_candidate_headline">Vorabversion</string>
     <string name="participate_release_candidate_text">Eine Vorabversion, auch Release Candidate (RC) genannt, ist ein stabiler Stand der kommenden, finalen Version. Ein Test in der eigenen Umgebung hilft uns diese Stabilität sicherzustellen. Melden Sie sich als Tester im Play Store an oder suchen und installieren Sie die passende Version bei F-Droid unter „Versionen“.</string>
     <string name="participate_contribute_headline">Aktiv etwas beitragen</string>
-    <string name="participate_contribute_irc_text">An Chats teilnehmen auf IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Hilf anderen im &lt;a href="%1$s">Forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">Die App &lt;a href="%1$s">Übersetzen&lt;/a></string>
-    <string name="participate_contribute_github_text">Zum Überprüfen, Ändern und Schreiben von Quellcode schaue bitte unter &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> für weitere Details.</string>
+    <string name="participate_contribute_irc_text">An Chats auf IRC teil: &lt;a href=\"%1$s\">#nexcloud-mobile&lt;/a></string>
+    <string name="participate_contribute_forum_text">Helfe anderen im &lt;a href=\\"%1$s\\">Forum&lt;/a></string>
+    <string name="participate_contribute_translate_text">&lt;a href=\\"%1$s\\">Übersetze&lt;/a>die App</string>
+    <string name="participate_contribute_github_text">Prüfen, ändern und schreiben Sie Code. Siehe auch  &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> für Einzelheiten</string>
     <string name="move_to">Verschieben nach&#8230;</string>
     <string name="copy_to">Kopieren nach&#8230;</string>
     <string name="choose_remote_folder">Wähle Verzeichnis&#8230;</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 9572d38a92..ef49c573e2 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -561,10 +561,10 @@
     <string name="participate_release_candidate_headline">Vorabversion</string>
     <string name="participate_release_candidate_text">Eine Vorabversion, auch Release Candidate (RC) genannt, ist ein stabiler Stand der kommenden, finalen Version. Ein Test in der eigenen Umgebung hilft uns diese Stabilität sicherzustellen. Melden Sie sich als Tester im Play Store an oder suchen und installieren Sie die passende Version bei F-Droid unter „Versionen“.</string>
     <string name="participate_contribute_headline">Aktiv etwas beitragen</string>
-    <string name="participate_contribute_irc_text">An Chats teilnehmen auf IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Hilf anderen im &lt;a href="%1$s">Forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">Die App &lt;a href="%1$s">Übersetzen&lt;/a></string>
-    <string name="participate_contribute_github_text">Zum Überprüfen, Ändern und Schreiben von Quellcode schaue bitte unter &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> für weitere Details.</string>
+    <string name="participate_contribute_irc_text">Trete dem Chat auf IRC bei: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
+    <string name="participate_contribute_forum_text">Hilf Anderen im &lt;a href=\"%1$s\">Forum&lt;/a></string>
+    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Übersetze&lt;/a> die App</string>
+    <string name="participate_contribute_github_text">Prüfe, ändere und schreibe Code. Siehe auch &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> für Einzelheiten</string>
     <string name="move_to">Verschieben nach&#8230;</string>
     <string name="copy_to">Kopieren nach&#8230;</string>
     <string name="choose_remote_folder">Wähle Verzeichnis&#8230;</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 8498ef6c61..8b13948abe 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -557,10 +557,6 @@
     <string name="participate_release_candidate_headline">Release candidate</string>
     <string name="participate_release_candidate_text">Η υποψήφια κυκλοφορία (RC) είναι ένα στιγμιότυπο της επερχόμενης έκδοσης και αναμένεται να είναι σταθερή. Η δοκιμή της μεμονωμένης εγκατάστασής σας θα βοηθήσει στην εξασφάλιση αυτού. Εγγραφείτε για δοκιμές στο Play store ή χειροκίνητα αναζητείστε στο τμήμα \"εκδόσεις\" στο F-Droid.</string>
     <string name="participate_contribute_headline">Ενεργή συνεισφορά</string>
-    <string name="participate_contribute_irc_text">Συμμετέχετε στη συνομιλία στο IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Βοηθήστε χρήστες στο &lt;a href=\"%1$s\">forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Μεταφράστε&lt;/a> την εφαρμογή</string>
-    <string name="participate_contribute_github_text">Συνεισφέρετε ως προγραμματιστής, για περισσότερες λεπτομέρειες δείτε &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a></string>
     <string name="move_to">Μετακίνηση σε&#8230;</string>
     <string name="copy_to">Αντιγραφή σε&#8230;</string>
     <string name="choose_remote_folder">Επιλογή φακέλου&#8230;</string>
diff --git a/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml
index 94401353f9..a26926baad 100644
--- a/src/main/res/values-en-rGB/strings.xml
+++ b/src/main/res/values-en-rGB/strings.xml
@@ -542,6 +542,8 @@
     <string name="local_file_not_found_toast">File not found in local file system</string>
     <string name="confirmation_remove_files_alert">Do you really want to remove the selected items?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to remove the selected items and their contents?</string>
+    <string name="maintenance_mode">Server in maintenance mode</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
     <string name="actionbar_search">Search</string>
     <string name="files_drop_not_supported">This is a Nextcloud feature, please update.</string>
@@ -557,9 +559,6 @@
     <string name="participate_release_candidate_headline">Release candidate</string>
     <string name="participate_release_candidate_text">The release candidate (RC) is a snapshot of the upcoming release and is expected to be stable. Testing your individual setup could help ensure this. Sign up for testing on the Play store or manually look in the \"versions\" section on F-Droid.</string>
     <string name="participate_contribute_headline">Actively Contribute</string>
-    <string name="participate_contribute_irc_text">Join the chat on IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Help others on the &lt;a href="%1$s">forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">Translate&lt;/a> the app</string>
     <string name="move_to">Move to&#8230;</string>
     <string name="copy_to">Copy to&#8230;</string>
     <string name="choose_remote_folder">Choose folder&#8230;</string>
@@ -650,4 +649,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">New notification received</string>
     <string name="drawer_logout">Logout</string>
-    </resources>
+    <string name="privacy">Privacy</string>
+
+
+</resources>
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index e2847c6ec1..5c70c833e3 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -543,6 +543,8 @@ en los últimos 7 días. </string>
     <string name="local_file_not_found_toast">No se encontró el archivo en sistema de archivos local</string>
     <string name="confirmation_remove_files_alert">¿Realmente desea eliminar los elementos seleccionados?</string>
     <string name="confirmation_remove_folders_alert">¿Realmente desea eliminar los elementos seleccionados y su contenido?</string>
+    <string name="maintenance_mode">El servidor se encuentra en modo mantenimiento</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Aguardando la regarga del dispositivo </string>
     <string name="actionbar_search">Buscar</string>
     <string name="files_drop_not_supported">Esta es una característica de Nextcloud, favor de actualizar.</string>
@@ -558,10 +560,6 @@ en los últimos 7 días. </string>
     <string name="participate_release_candidate_headline">Candidato a lanzamiento</string>
     <string name="participate_release_candidate_text">El candidato a lanzamiento (CL) es una foto del más próximo lanzamiento y se espera que sea estable. Las pruebas a su configuración individual podrían ayudarnos a asegurar esto. Regístrese para hacer pruebas en la Play Store o consulte directamente la sección de \"versiones\" en F-Droid. </string>
     <string name="participate_contribute_headline">Contribuya activamente</string>
-    <string name="participate_contribute_irc_text">Únase a las conversaciones en IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Ayude a los demás en el &lt;a href=\"%1$s\">foro&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Traduzca&lt;/a> la aplicación</string>
-    <string name="participate_contribute_github_text">Revise, corrija y escriba código, consulte &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUIR.md&lt;/a> para más detalles</string>
     <string name="move_to">Mover a&#8230;</string>
     <string name="copy_to">Copiar a&#8230;</string>
     <string name="choose_remote_folder">Seleccione la carpeta&#8230;</string>
@@ -652,4 +650,7 @@ en los últimos 7 días. </string>
     <!-- Notifications -->
     <string name="new_notification_received">No se han recibido nuevas notificaciones </string>
     <string name="drawer_logout">Salir de la sesión</string>
-    </resources>
+    <string name="privacy">Privacidad</string>
+
+
+</resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index c803a2debf..46f3ac382c 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -558,10 +558,6 @@
     <string name="participate_release_candidate_headline">Versión a ser liberada</string>
     <string name="participate_release_candidate_text">La versión a ser liberada (release candidate - RC) es una instantánea de la próxima versión y se espera que sea estable. Probar su configuración individual podría ayudar a asegurar esto. Regístrate para probarla en Play Store o busca manualmente en la sección \"versiones\" de F-Droid.</string>
     <string name="participate_contribute_headline">Colabore activamente</string>
-    <string name="participate_contribute_irc_text">Únase a la conversación en IRC:  &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Ayude a otros en el foro &lt;a href=\"%1$s\">&lt;/a>.</string>
-    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Traducen&lt;/a> la app</string>
-    <string name="participate_contribute_github_text">Revisa, corrige y escribe código, lee  &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> para más detalles</string>
     <string name="move_to">Mover a&#8230;</string>
     <string name="copy_to">Copiar a&#8230;</string>
     <string name="choose_remote_folder">Elija carpeta&#8230;</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 2f46357a1d..d6316736c7 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -559,10 +559,10 @@
     <string name="participate_release_candidate_headline">Testez la version Release Candidate</string>
     <string name="participate_release_candidate_text">La version « release candidate » (RC) est un instantanné de la prochaine version et est supposée stable. Le test de votre configuration pourrait nous aider à nous assurer que cette version est entièrement stable. Inscrivez vous pour être testeur sur le Play store ou allez jeter un œil dans la section \"versions\" de F-Droid.</string>
     <string name="participate_contribute_headline">Participez activement</string>
-    <string name="participate_contribute_irc_text">Rejoignez la discussion sur IRC &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a>.</string>
-    <string name="participate_contribute_forum_text">Aidez les autres sur le &lt;a href=\"%1$s\">forum&lt;/a>.</string>
+    <string name="participate_contribute_irc_text">Rejoingnez la discussion sur le canal IRC : &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a>.</string>
+    <string name="participate_contribute_forum_text">Aidez les autres utilisateurs sur &lt;a href=\"%1$s\">le forum&lt;/a>.</string>
     <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Traduisez&lt;/a> l\'application.</string>
-    <string name="participate_contribute_github_text">Vous êtes développeur ? Consultez &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> pour plus d\'informations</string>
+    <string name="participate_contribute_github_text">Pour contrôler, réviser ou écrire du code, consultez &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a>.</string>
     <string name="move_to">Déplacer vers&#8230;</string>
     <string name="copy_to">Copier vers&#8230;</string>
     <string name="choose_remote_folder">Sélectionner le dossier&#8230;</string>
diff --git a/src/main/res/values-is/strings.xml b/src/main/res/values-is/strings.xml
index 3b43ccb84e..c142c4745d 100644
--- a/src/main/res/values-is/strings.xml
+++ b/src/main/res/values-is/strings.xml
@@ -134,6 +134,7 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="filedetails_modified">Breytt:</string>
     <string name="filedetails_download">Niðurhal</string>
     <string name="filedetails_sync_file">Samstilla</string>
+    <string name="filedetails_renamed_in_upload_msg">Skrá endurnefnd sem %1$s við innsendingu</string>
     <string name="action_share">Deila</string>
     <string name="common_yes">Já</string>
     <string name="common_no">Nei</string>
@@ -226,9 +227,13 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="media_err_nothing_to_play">Engin margmiðlunarskrá fannst</string>
     <string name="media_err_no_account">Enginn notandaaðgangur uppgefinn</string>
     <string name="media_err_unsupported">Óstudd margmiðlunarlyklun (codec)</string>
+    <string name="media_err_io">Gat ekki lesið margmiðlunarskrána</string>
+    <string name="media_err_malformed">Margmiðlunarskráin er með ranga kóðun</string>
+    <string name="media_err_timeout">Tilraun til að spila skrá rann út á tíma</string>
     <string name="media_err_invalid_progressive_playback">Ekki tókst að streyma margmiðlunarskrá</string>
     <string name="media_err_security_ex">Öryggissvilla kom upp við að reyna að spila  %1$s</string>
     <string name="media_err_io_ex">Óvænt villa kom upp við að reyna að spila  %1$s</string>
+    <string name="media_err_unexpected">Óvænt villa kom upp við að reyna að spila  %1$s</string>
     <string name="media_rewind_description">Spóla-til-baka hnappur</string>
     <string name="media_play_pause_description">Afspilun-eða-hlé hnappur</string>
     <string name="media_forward_description">Spóla-hratt-áfram hnappur</string>
@@ -245,13 +250,16 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
 	<string name="auth_unknown_host_title">Gat ekki fundið hýsilvél</string>
 	<string name="auth_incorrect_path_title">Þjónn finnst ekki</string>
 	<string name="auth_timeout_title">Þjónninn var of lengi að svara</string>
+	<string name="auth_incorrect_address_title">Rangt snið á vistfangi þjóns</string>
 	<string name="auth_ssl_general_error_title">Mistókst að frumstilla SSL</string>
+	<string name="auth_ssl_unverified_server_title">Gate ekki sannreynt auðkenni SSL-þjónsins</string>
 	<string name="auth_bad_oc_version_title">Óþekkjanleg útgáfa af þjóni</string>
 	<string name="auth_wrong_connection_title">Gat ekki komið á tengingu</string>
 	<string name="auth_secure_connection">Öruggri tengingu komið á</string>
 	<string name="auth_unauthorized">Rangt notandanafn eða lykilorð</string>
 	<string name="auth_oauth_error">Auðkenning mistókst</string>
 	<string name="auth_oauth_error_access_denied">Aðgangi hafnað af auðkenningarþjóni</string>
+	<string name="auth_wtf_reenter_URL">Óvænt ástand, settu aftur inn vistfang þjónsins</string>
 	<string name="auth_expired_oauth_token_toast">Heimild þín er útrunnin. Skráðu þig aftur inn.</string>
 	<string name="auth_expired_basic_auth_toast">Settu inn núgildandi lykilorð</string>
 	<string name="auth_expired_saml_sso_token_toast">Setan þín er útrunnin. Skráðu þig aftur inn.</string>
@@ -259,6 +267,9 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
 	<string name="auth_unsupported_auth_method">Þjónninn styður ekki þessa auðkenningaraðferð</string>
 	<string name="auth_unsupported_multiaccount">%1$s styður ekki fjölaðganga</string>
 	<string name="auth_can_not_auth_against_server">Get ekki auðkennt á þessum þjóni</string>
+    <string name="auth_account_does_not_exist">Aðgangur er ekki ennþá til á tækinu</string>
+
+
     <string name="favorite">Stilla sem tiltækt án nettengingar</string>
     <string name="unfavorite">Afstilla sem tiltækt án nettengingar</string>
     <string name="favorite_real">Setja í eftirlæti</string>
@@ -271,6 +282,7 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="remove_success_msg">Fjarlægt</string>
     <string name="remove_fail_msg">Fjarlæging mistókst</string>
     <string name="rename_dialog_title">Settu inn nýtt nafn</string>
+    <string name="rename_server_fail_msg">Gat ekki gefið þjóni nýtt nafn</string>
     <string name="sync_file_fail_msg">Gat ekki athugað fjartengda skrá</string>
     <string name="sync_file_nothing_to_do_msg">Efni skrár er þegar samstillt</string>
     <string name="create_dir_fail_msg">Gat ekki búið til möppu</string>
@@ -279,6 +291,7 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="filename_empty">Skráarheiti má ekki vera tómt</string>
     <string name="wait_a_moment">Bíddu augnablik…</string>
     <string name="wait_checking_credentials">Athuga geymd auðkenni</string>
+    <string name="filedisplay_unexpected_bad_get_content">Óvænt vandamál, veldu skrána úr öðru forriti</string>
     <string name="filedisplay_no_file_selected">Engin skrá valin</string>
     <string name="activity_chooser_title">Senda tengil til &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">Afrita skrá úr einkageymslu</string>
@@ -344,6 +357,7 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Nota undirmöppur</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">Geyma í undirmöppum byggðum á ári og mánuðum</string>
 
+	<string name="share_link_no_support_share_api">Deiling er ekki virk á þjóninum þínum. Hafðu samband við kerfisstjóra.</string>
 	<string name="share_link_file_no_exist">Get ekki deilt. Athugaðu hvort skráin sé til</string>
 	<string name="share_link_file_error">Villa kom upp við að reyna að deila þessari skrá eða möppu</string>
 	<string name="unshare_link_file_no_exist">Get ekki hætt deilingu. Athugaðu hvort skráin sé til</string>
@@ -361,6 +375,8 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="clipboard_uxexpected_error">Óvænt villa kom upp við afritun á klippispjald</string>
     <string name="clipboard_label">Texti afritaður úr %1$s</string>
 
+    <string name="error_cant_bind_to_operations_service">Alvarleg villa: Ekki hægt að framkvæma aðgerðir</string>
+
     <string name="network_error_socket_exception">Villa kom upp við að tengjast þjóninum.</string>
     <string name="network_error_socket_timeout_exception">Villa kom upp á meðan beðið var eftir þjóninum. Ekki var hægt að ljúka aðgerðinni</string>
     <string name="network_error_connect_timeout_exception">Villa kom upp á meðan beðið var eftir þjóninum. Ekki var hægt að ljúka aðgerðinni</string>
@@ -401,12 +417,14 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
 	<string name="folder_picker_choose_button_text">Veldu</string>
 
     <string name="move_file_invalid_into_descendent">Ekki er hægt að færa möppu inn í eina af undirmöppum sínum</string>
+    <string name="move_file_invalid_overwrite">Skráin er þegar til í móttökumöppunni</string>
     <string name="move_file_error">Villa kom upp við að reyna að færa þessa skrá eða möppu</string>
     <string name="forbidden_permissions_move">til að færa þessa skrá</string>
 
 
     <string name="copy_file_not_found">Get ekki afritað. Athugaðu hvort skráin sé til</string>
-    <string name="copy_file_invalid_overwrite">Skráin er þegar til í móttökusmöppunni</string>
+    <string name="copy_file_invalid_into_descendent">Ekki er hægt að afrita möppu inn í eina af undirmöppum sínum</string>
+    <string name="copy_file_invalid_overwrite">Skráin er þegar til í móttökumöppunni</string>
     <string name="copy_file_error">Villa kom upp við að reyna að afrita þessa skrá eða möppu</string>
     <string name="forbidden_permissions_copy">til að afrita þessa skrá</string>
 
@@ -482,6 +500,8 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="action_retry_uploads">Ný tilraun mistókst</string>
     <string name="action_clear_failed_uploads">Hreinsun mistókst</string>
     <string name="action_clear_successful_uploads">Hreinsað</string>
+    <string name="action_clear_finished_uploads">Hreinsa innsendingar sem er lokið</string>
+
     <string name="action_switch_grid_view">Reitir</string>
     <string name="action_switch_list_view">Listi</string>
 
@@ -489,6 +509,7 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="manage_space_clear_data">Hreinsa gögn</string>
     <string name="manage_space_error">Ekki tókst að eyða öllum skrám.</string>
 
+    <string name="permission_storage_access">Krafist er viðbótarheimilda til að senda inn og sækja skrár.</string>
     <string name="local_file_not_found_toast">Skrá fannst ekki á staðværu skráakerfi</string>
     <string name="confirmation_remove_files_alert">Ertu viss um að þú viljir fjarlægja valin atriði?</string>
     <string name="confirmation_remove_folders_alert">Ertu viss um að þú viljir fjarlægja valin atriði og innihald þeirra?</string>
@@ -509,10 +530,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="participate_release_candidate_headline">Forútgáfa</string>
     <string name="participate_release_candidate_text">Útgáfukandídat (RC) er stöðutaka á væntanlegri útgáfu og er vænst til að hún sé nokkuð stöðug. Með prófun á uppsetningunni þinni værirðu að hjálpa til við að tryggja þann stöðugleika. Skráðu þig til prófana í Play-safninu eða skoðaðu handvirkt í \"útgáfur\" hlutanum á F-Droid.</string>
     <string name="participate_contribute_headline">Vertu virkur þáttakandi</string>
-    <string name="participate_contribute_irc_text">Taktu þátt í spjalli á IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Hjálpaðu öðrum á &lt;a href=\"%1$s\">spjallvefnum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Þýða&lt;/a> forritið</string>
-    <string name="participate_contribute_github_text">Yfirfarðu kóða, bættu við og skrifaðu, sjá &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> fyrir nánari upplýsingar</string>
     <string name="move_to">Færa í&#8230;</string>
     <string name="copy_to">Afrita í&#8230;</string>
     <string name="choose_remote_folder">Veldu möppu&#8230;</string>
@@ -585,8 +602,11 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="contacts_header_backup">Taka öryggisafrit</string>
     <string name="contacts_automatic_backup">Öryggisafrit af tengiliðum</string>
     <string name="contacts_last_backup">Síðasta öryggisafrit</string>
+    <string name="contacts_read_permission">Nauðsynlegt er að hafa heimild til að lesa tengiliðalista</string>
+    <string name="contacts_write_permission">Nauðsynlegt er að hafa heimild til að breyta tengiliðalista</string>
     <string name="contactlist_title">Endurheimta tengiliði</string>
     <string name="contaclist_restore_selected">Endurheimta valda tengiliði</string>
+    <string name="contactlist_account_chooser_title">Veldu aðgang til að flytja inn</string>
     <string name="contacts_preference_choose_date">Veldu dagsetningu</string>
     <string name="contacts_preference_backup_never">aldrei</string>
     <string name="contacts_preferences_no_file_found">Engin skrá fannst</string>
diff --git a/src/main/res/values-ja-rJP/strings.xml b/src/main/res/values-ja-rJP/strings.xml
index f8b2865ae9..aff2449b91 100644
--- a/src/main/res/values-ja-rJP/strings.xml
+++ b/src/main/res/values-ja-rJP/strings.xml
@@ -436,9 +436,6 @@
     <string name="participate_beta_headline">開発バージョンをテスト</string>
     <string name="participate_release_candidate_headline">リリース候補</string>
     <string name="participate_contribute_headline">積極的な貢献</string>
-    <string name="participate_contribute_irc_text">IRCでチャットに参加してください: &lt;a href=\"%1$s\">#nextcloud-モバイル&lt;/a></string>
-    <string name="participate_contribute_forum_text">&lt;a href=\"%1$s\">フォーラム&lt;/a> で他の人を助けてください</string>
-    <string name="participate_contribute_translate_text">アプリを &lt;a href=\"%1$s\">翻訳する&lt;/a></string>
     <string name="move_to">&#8230;に移動</string>
     <string name="copy_to">&#8230;にコピー</string>
     <string name="choose_remote_folder">&#8230; フォルダーを選択</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 26051c473b..5546ed6c4a 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -543,6 +543,8 @@
     <string name="local_file_not_found_toast">Filen ble ikke funnet i lokalt filsystem</string>
     <string name="confirmation_remove_files_alert">Vil du virkelig fjerne de valgte elementene?</string>
     <string name="confirmation_remove_folders_alert">Vil du virkelig fjerne de valgte elementene og dets innhold?</string>
+    <string name="maintenance_mode">Tjener i vedlikeholdsmodus</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Venter på lading av enhet.</string>
     <string name="actionbar_search">Søk</string>
     <string name="files_drop_not_supported">Dette er en Nextcloud funksjon, vennligst oppdater.</string>
@@ -558,9 +560,6 @@
     <string name="participate_release_candidate_headline">Release candidate</string>
     <string name="participate_release_candidate_text">Release candidate (RC) er en pakke av den kommende utgaven og er forventet å være stabil. Ved å teste denne med ditt oppsett vil kunne hjelpe oss å sikre dette. Meld deg på for testen i Play butikken eller se i versjonsseksjonen i F-Droid.</string>
     <string name="participate_contribute_headline">Bidra aktivt</string>
-    <string name="participate_contribute_irc_text">Delta i chat på IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a> </string>
-    <string name="participate_contribute_forum_text">Hjelp andre på &lt;a href="%1$s">forumet&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">Oversette&lt;/a> app\'en</string>
     <string name="move_to">Flytt til&#8230;</string>
     <string name="copy_to">Kopier til&#8230;</string>
     <string name="choose_remote_folder">Velg mappe&#8230;</string>
@@ -651,4 +650,7 @@
     <!-- Notifications -->
     <string name="new_notification_received">Nytt varsel mottatt</string>
     <string name="drawer_logout">Utlogging</string>
-    </resources>
+    <string name="privacy">Personvern</string>
+
+
+</resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 8013aab577..e5fe453e1c 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -544,6 +544,8 @@ Kies er eentje van een provider.</string>
     <string name="local_file_not_found_toast">Het bestand is niet te vinden binnen het lokale bestandssysteem.</string>
     <string name="confirmation_remove_files_alert">Wil je de geselecteerde objecten echt verwijderen?</string>
     <string name="confirmation_remove_folders_alert">Wil je de geselecteerde objecten en hun inhoud echt verwijderen?</string>
+    <string name="maintenance_mode">Server in onderhoudsmodus</string>
+
     <string name="uploads_view_upload_status_waiting_for_charging">Wachten to apparaat wordt opgeladen</string>
     <string name="actionbar_search">Zoeken</string>
     <string name="files_drop_not_supported">Dit is een Nextcloud-optie, gelieve te updaten.</string>
@@ -559,10 +561,12 @@ Kies er eentje van een provider.</string>
     <string name="participate_release_candidate_headline">Release candidate</string>
     <string name="participate_release_candidate_text">De Release Candidate (RC) is een kopie van de komende release en zou stabiel moeten zijn. Testen van jouw installatie kan ons helpen om dit te bevestigen. Meld je aan om te testen op de Play Store of bekijk handmatig de \"versies\"-sectie op F-Droid.</string>
     <string name="participate_contribute_headline">Actief meedoen</string>
-    <string name="participate_contribute_irc_text">Doe mee met de chat op IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Help andere gebruikers in de &lt;a href="%1$s">forums&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">Vertaal&lt;/a> de app</string>
-    <string name="participate_contribute_github_text">Review, voeg toe en schrijf code, bekijk &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> voor details</string>
+    <string name="participate_contribute_irc_text">Bezoek de IRC chat op IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a>
+</string>
+    <string name="participate_contribute_forum_text">Help anderen op het &lt;a href=\"%1$s\">forum&lt;/a>
+</string>
+    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Vertaal&lt;/a> de app</string>
+    <string name="participate_contribute_github_text">Bekijk, schrijf of pas code aan. Kijk in &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> voor meer details</string>
     <string name="move_to">Verplaats naar&#160;&#8230;</string>
     <string name="copy_to">Kopieer naar&#160;&#8230;</string>
     <string name="choose_remote_folder">Kies map&#160;&#8230;</string>
@@ -653,4 +657,7 @@ Kies er eentje van een provider.</string>
     <!-- Notifications -->
     <string name="new_notification_received">Nieuwe meldingen ontvangen</string>
     <string name="drawer_logout">Uitloggen</string>
-    </resources>
+    <string name="privacy">Privacy</string>
+
+
+</resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 657591a791..ec2785a3bd 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -559,10 +559,6 @@
     <string name="participate_release_candidate_headline">Wydanie kandydujące</string>
     <string name="participate_release_candidate_text">Release Candidate (RC) jest zarysem nadchodzącego wydania i oczekujemy że będzie stabilne. Testowanie indywidualnej konfiguracji może pomóc, aby to zapewnić. Zapisz się do testowania w sklepie Play lub ręcznie szukaj w sekcji \"wersje\" na F-Droid.</string>
     <string name="participate_contribute_headline">Aktywni członkowie projektu</string>
-    <string name="participate_contribute_irc_text">Dołącz do chatu (IRC): &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Pomóż innym na &lt;a href="%1$s">forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">Tłumacz&lt;/a> aplikację</string>
-    <string name="participate_contribute_github_text">Wspomóż nas jako programista, po więcej szczegółów odwiedź &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a></string>
     <string name="move_to">Przenieś do&#8230;</string>
     <string name="copy_to">Skopiuj do&#8230;</string>
     <string name="choose_remote_folder">Wybierz folder&#8230;</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index e903bd2c7d..158dea2ec0 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -560,10 +560,6 @@
     <string name="participate_release_candidate_headline">Candidato a versão</string>
     <string name="participate_release_candidate_text">O release candidate (RC) é um instantâneo da próxima versão e espera-se que seja estável. Testar sua configuração individual pode ajudar a garantir isso. Inscreva-se para testar na Play Store ou confira a seção \"versões\" no F-Droid.</string>
     <string name="participate_contribute_headline">Contribuir ativamente</string>
-    <string name="participate_contribute_irc_text">Participe de uma conversa no IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Ajude outros no &lt;a href="%1$s">forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">Traduza&lt;/a> the app</string>
-    <string name="participate_contribute_github_text">Revisar, alterar e escrever código, veja &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> para detalhes</string>
     <string name="move_to">Mover para&#8230;</string>
     <string name="copy_to">Copiar para&#8230;</string>
     <string name="choose_remote_folder">Escolha a pasta&#8230;</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 46c02b775f..e5ca3d391d 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -459,7 +459,7 @@
     <string name="forbidden_permissions_copy">для копирования этого файла</string>
 
     <string name="prefs_category_instant_uploading">Немедленная загрузка</string>
-    <string name="prefs_category_details">Подробно</string>
+    <string name="prefs_category_details">Дополнительные</string>
 
 	<string name="prefs_instant_video_upload_path_title">Каталог для немедленной загрузки видео</string>
     <string name="sync_folder_failed_content">Синхронизация каталога %1$s не может быть завершена</string>
@@ -530,7 +530,7 @@
 
     <string name="action_retry_uploads">Повторить неудавшиеся</string>
     <string name="action_clear_failed_uploads">Очистить неудавшиеся</string>
-    <string name="action_clear_successful_uploads">Очищено</string>
+    <string name="action_clear_successful_uploads">Очистить успешные</string>
     <string name="action_clear_finished_uploads">Очистить завершенные</string>
 
     <string name="action_switch_grid_view">Вид сеткой</string>
@@ -562,10 +562,6 @@
     <string name="participate_release_candidate_headline">Кандидат в релизы</string>
     <string name="participate_release_candidate_text">Релиз-кандидат (RC) — это текущее состояние готовящегося выпуска, и, ожидается, что он будет стабильным. Проверка с вашими индивидуальными настройками может помочь убедится в этом. Зарегистрируйтесь для тестирования в Google Play или используйте раздел «версии» в каталоге приложений F-Droid.</string>
     <string name="participate_contribute_headline">Активное участие</string>
-    <string name="participate_contribute_irc_text">Присоединяйтесь к IRC-чату: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Помогайте другим на нашем &lt;a href=\"%1$s\">форуме&lt;/a></string>
-    <string name="participate_contribute_translate_text">Участвуйте в &lt;a href=\"%1$s\">переводе&lt;/a> приложения</string>
-    <string name="participate_contribute_github_text">Рецензируйте, изменяйте и пишите код, подробности по ссылке &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a>.</string>
     <string name="move_to">Переместить в&#8230;</string>
     <string name="copy_to">Копировать в&#8230;</string>
     <string name="choose_remote_folder">Выберите каталог &#8230;</string>
diff --git a/src/main/res/values-sq/strings.xml b/src/main/res/values-sq/strings.xml
index 208a48d2ad..0a8baf671f 100644
--- a/src/main/res/values-sq/strings.xml
+++ b/src/main/res/values-sq/strings.xml
@@ -558,10 +558,6 @@ në 7 ditët e fundit.</string>
     <string name="participate_release_candidate_headline">Lëshimi i kandidatit</string>
     <string name="participate_release_candidate_text">Lëshimi i kandidatit  (RC) është një fragment i lëshimit të ardhshme dhe pritet të jetë i qëndrueshëm. Testimi i setup-it tuaj individuale mund të ndihmojë për ta siguruar këtë. Regjistrohuni për testimin në Play Store ose manualisht  shikoni në seksionin \"versionet\" në F-Droid.</string>
     <string name="participate_contribute_headline">Kontribim aktiv</string>
-    <string name="participate_contribute_irc_text">Bashkohu në bisedat në IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Ndihmo të tjerët në &lt;a href="%1$s">forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Përktheni&lt;/a> aplikacionin</string>
-    <string name="participate_contribute_github_text">Kontriboni si një zhvillues, shih&lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">CONTRIBUTING.md&lt;/a> për detaje</string>
     <string name="move_to">Levizni tek&#8230;</string>
     <string name="copy_to">Kopjojeni tek&#8230;</string>
     <string name="choose_remote_folder">Zgjidh dosjen&#8230;</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 8080a7b9a7..68431c8897 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -150,7 +150,7 @@
     <string name="common_error">Hata</string>
     <string name="common_loading">Yükleniyor&#8230;</string>
     <string name="common_unknown">bilinmiyor</string>
-    <string name="common_error_unknown">Bilinmeyen hata</string>
+    <string name="common_error_unknown">Bilinmeyen sorun</string>
     <string name="common_pending">Bekliyor</string>
     <string name="about_title">Hakkında</string>
     <string name="change_password">Parola değiştir</string>
@@ -173,16 +173,16 @@
     <string name="uploads_view_upload_status_succeeded">Tamamlandı</string>
     <string name="uploads_view_upload_status_cancelled">İptal Edildi</string>
     <string name="uploads_view_upload_status_paused">Duraklatıldı</string>
-    <string name="uploads_view_upload_status_failed_connection_error">Bağlantı hatası</string>
+    <string name="uploads_view_upload_status_failed_connection_error">Bağlantı sorunu</string>
     <string name="uploads_view_upload_status_failed_retry">Yükleme kısa bir süre sonra yeniden denenecek</string>
-    <string name="uploads_view_upload_status_failed_credentials_error">Kimlik bilgileri hatası</string>
-    <string name="uploads_view_upload_status_failed_folder_error">Klasör hatası</string>
-    <string name="uploads_view_upload_status_failed_file_error">Dosya hatası</string>
+    <string name="uploads_view_upload_status_failed_credentials_error">Kimlik bilgileri sorunu</string>
+    <string name="uploads_view_upload_status_failed_folder_error">Klasör sorunu</string>
+    <string name="uploads_view_upload_status_failed_file_error">Dosya sorunu</string>
     <string name="uploads_view_upload_status_failed_localfile_error">Yerel dosya bulunamadı</string>
-    <string name="uploads_view_upload_status_failed_permission_error">İzin hatası</string>
+    <string name="uploads_view_upload_status_failed_permission_error">İzin sorunu</string>
     <string name="uploads_view_upload_status_conflict">Çakışma</string>
     <string name="uploads_view_upload_status_service_interrupted">Uygulama sonlandırıldı</string>
-    <string name="uploads_view_upload_status_unknown_fail">Bilinmeyen hata</string>
+    <string name="uploads_view_upload_status_unknown_fail">Bilinmeyen sorun</string>
     <string name="uploads_view_upload_status_waiting_for_wifi">WiFi bağlantısı bekleniyor</string>
     <string name="uploads_view_later_waiting_to_upload">Yüklenmeyi bekliyor</string>
     <string name="downloader_download_in_progress_ticker">İndiriliyor&#8230;</string>
@@ -219,7 +219,7 @@
     <string name="pass_code_reenter_your_pass_code">Lütfen parolanızı yeniden yazın</string>
     <string name="pass_code_remove_your_pass_code">Parolanızı kaldırın</string>
     <string name="pass_code_mismatch">Parola ile onayı aynı değil</string>
-    <string name="pass_code_wrong">Parola hatalı</string>
+    <string name="pass_code_wrong">Parola yanlış</string>
     <string name="pass_code_removed">Parola kaldırıldı</string>
     <string name="pass_code_stored">Parola depolandı</string>
     
@@ -249,20 +249,20 @@
 	<string name="auth_nossl_plain_ok_title">Güvenli bağlantı kullanılamıyor.</string>
 	<string name="auth_connection_established">Bağlantı kuruldu</string>
 	<string name="auth_testing_connection">Bağlantı sınanıyor</string>
-	<string name="auth_not_configured_title">Sunucu ayarları hatalı</string>
+	<string name="auth_not_configured_title">Sunucu ayarları doğru değil</string>
 	<string name="auth_account_not_new">Aygıt üzerinde aynı kullanıcı adı ve sunucu için bir hesap zaten var</string>
 	<string name="auth_account_not_the_same">Yazdığınız kullanıcı adı bu hesabın kullanıcı adı ile eşleşmiyor</string>
 	<string name="auth_unknown_error_title">Bilinmeyen bir sorun çıktı!</string>
 	<string name="auth_unknown_host_title">Sunucu adı bulunamadı</string>
 	<string name="auth_incorrect_path_title">Sunucu bulunamadı</string>
 	<string name="auth_timeout_title">Sunucu çok geç yanıt veriyor</string>
-	<string name="auth_incorrect_address_title">Sunucu adresi biçimi hatalı</string>
+	<string name="auth_incorrect_address_title">Sunucu adresi biçimi yanlış</string>
 	<string name="auth_ssl_general_error_title">SSL başlatılamadı</string>
 	<string name="auth_ssl_unverified_server_title">SSL sunucusunun kimliği doğrulanamadı</string>
 	<string name="auth_bad_oc_version_title">Sunucu sürümü anlaşılamadı</string>
 	<string name="auth_wrong_connection_title">Bağlantı kurulamadı</string>
 	<string name="auth_secure_connection">Güvenli bağlantı kuruldu</string>
-	<string name="auth_unauthorized">Kullanıcı adı ya da parola hatalı</string>
+	<string name="auth_unauthorized">Kullanıcı adı ya da parola yanlış</string>
 	<string name="auth_oauth_error">Kimlik doğrulanamadı</string>
 	<string name="auth_oauth_error_access_denied">Kimlik doğrulama sunucusu erişime izin vermedi</string>
 	<string name="auth_wtf_reenter_URL">Beklenilmeyen durum; Lütfen sunucu adresini yeniden yazın</string>
@@ -437,7 +437,7 @@
 	<string name="log_progress_dialog_text">Veri yükleniyor&#8230;</string>
 
 	<string name="saml_authentication_required_text">Kimlik doğrulaması gerekli</string>
-	<string name="saml_authentication_wrong_pass">Parola hatalı</string>
+	<string name="saml_authentication_wrong_pass">Parola yanlış</string>
 	<string name="actionbar_move">Taşı</string>
     <string name="actionbar_copy">Kopyala</string>
 	<string name="file_list_empty_moving">Burada bir şey yok. Bir klasör ekleyebilirsiniz!</string>
@@ -556,14 +556,14 @@
     <string name="participate_testing_report_text">Github üzerinden bir sorun bildirin</string>
     <string name="participate_testing_version_text">Sonraki sürümü deneyerek bize yardımcı olmak ister misiniz?</string>
     <string name="participate_beta_headline">Geliştirici sürümünü deneyin</string>
-    <string name="participate_beta_text">Bu sürümde tüm yeni özellikler bulunur ve çok taze olduğundan hata ve sorunlar olabilir. Bir hata ya da soruna rastlarsanız bize iletin.</string>
+    <string name="participate_beta_text">Bu sürümde tüm yeni özellikler bulunur ve çok taze olduğundan eksikleri olabilir. Bir hata ya da soruna rastlarsanız bize iletin.</string>
     <string name="participate_release_candidate_headline">Yayın adayı</string>
     <string name="participate_release_candidate_text">Yayın adayı (Release Candidate, RC) yayınlanacak sürümün bir kopyasıdır ve kararlı olması beklenir. Kişisel olarak kullanmanız kararlı olduğundan emin olmamızı sağlar. Denemek için Play Store üzerinden kayıt olun ya da el ile F-Droid üzerindeki \"sürümler\" bölümüne bakın.</string>
     <string name="participate_contribute_headline">Etkin Katkıda Bulunun</string>
     <string name="participate_contribute_irc_text">IRC sohbetine katılın: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">&lt;a href=\"%1$s\">forum&lt;/a> üzerinde diğer kişilere yardımcı olun</string>
-    <string name="participate_contribute_translate_text">Uygulamayı &lt;a href="%1$s">çevirin&lt;/a> </string>
-    <string name="participate_contribute_github_text">Yazılımcı olarak katkıda bulunun! Ayrıntılı bilgi almak için &lt;a href=\"https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md\">KATKIDA BULUNMA.md&lt;/a> sayfasına bakın</string>
+    <string name="participate_contribute_forum_text">&lt;a href=\"%1$s\">Forumda&lt;/a> diğer kullanıcılara yardımcı olun</string>
+    <string name="participate_contribute_translate_text">Uygulamayı &lt;a href=\"%1$s\">Çevirin&lt;/a></string>
+    <string name="participate_contribute_github_text">Kodu gözden geçirin ve katkıda bulunun. Ayrıntılar için &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> dosyasına bakın</string>
     <string name="move_to">Taşı&#8230;</string>
     <string name="copy_to">Kopyala&#8230;</string>
     <string name="choose_remote_folder">Klasör seçin&#8230;</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 97a5e5a7a4..6cf839fbcc 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -99,6 +99,7 @@
     <string name="file_list_seconds_ago">几秒前</string>
     <string name="file_list_empty_headline">这里没有文件
 </string>
+    <string name="file_list_empty">上传一些内容或与您的设备同步。</string>
     <string name="file_list_empty_favorites">把一些文件设为“我喜欢的”或者从设备同步</string>
     <string name="file_list_empty_favorites_filter_list">你标记为“我喜欢的”文件和文件夹会显示在这里</string>
     <string name="file_list_empty_favorites_filter">没有找到您搜索的“我喜欢的”。</string>
@@ -117,7 +118,14 @@
     <string name="file_list_empty_recently_modified_filter">没有搜索到被修改的文件
  在最近7天。</string>
     <string name="file_list_empty_recently_added">没有找到最近添加的文件</string>
+    <string name="file_list_empty_recently_added_filter">您的搜索返回没有最近没有添加的文件。</string>
+    <string name="file_list_empty_text_photos">上传一些照片或启用自动上传。</string>
+    <string name="file_list_empty_text_photos_filter">你的搜索返回没有照片</string>
+    <string name="file_list_empty_text_videos">上传一些视频或启动自动上传</string>
+    <string name="file_list_empty_text_videos_filter">你的搜索返回没有视频</string>
     <string name="upload_list_empty_headline">没有可以上传的</string>
+    <string name="upload_list_empty_text">上传一些内容或启用即时上传。</string>
+    <string name="upload_list_empty_text_auto_upload">上传一些内容或启用自动上传。</string>
     <string name="file_list_folder">文件夹</string>
     <string name="file_list_folders">文件夹</string>
     <string name="file_list_file">文件</string>
@@ -129,11 +137,14 @@
     <string name="filedetails_modified">修改于：</string>
     <string name="filedetails_download">下载</string>
     <string name="filedetails_sync_file">同步</string>
+    <string name="filedetails_renamed_in_upload_msg">文件在上传时重命名为%1$s</string>
+    <string name="list_layout">列出的布局</string>
     <string name="action_share">共享</string>
     <string name="common_yes">是</string>
     <string name="common_no">否</string>
     <string name="common_ok">确定</string>
     <string name="common_remove_upload">移除上传任务</string>
+    <string name="common_retry_upload">重试上传</string>
     <string name="common_cancel_sync">取消同步</string>
     <string name="common_cancel">取消</string>
     <string name="common_back">返回</string>
@@ -153,8 +164,10 @@
     <string name="uploader_info_dirname">文件夹名称</string>
     <string name="uploader_upload_in_progress_ticker">上传 &#8230;</string>
     <string name="uploader_upload_in_progress_content">%1$d%% 上传 %2$s</string>
+    <string name="uploader_upload_succeeded_ticker">上传</string>
     <string name="uploader_upload_succeeded_content_single">%1$s 上传成功</string>
     <string name="uploader_upload_failed_ticker">上传失败</string>
+    <string name="uploader_upload_failed_content_single">无法上传%1$s</string>
     <string name="uploader_upload_failed_credentials_error">上传失败，你需要重新登录</string>
     <string name="uploads_view_title">上传</string>
     <string name="uploads_view_group_current_uploads">当前</string>
@@ -171,27 +184,36 @@
     <string name="uploads_view_upload_status_failed_localfile_error">本地文件未找到</string>
     <string name="uploads_view_upload_status_failed_permission_error">权限错误</string>
     <string name="uploads_view_upload_status_conflict">冲突</string>
+    <string name="uploads_view_upload_status_service_interrupted">应用程式已终止</string>
     <string name="uploads_view_upload_status_unknown_fail">未知错误</string>
+    <string name="uploads_view_upload_status_waiting_for_wifi">等待Wi-Fi连接</string>
     <string name="uploads_view_later_waiting_to_upload">等待上传...</string>
     <string name="downloader_download_in_progress_ticker">下载中 &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% 下载中 %2$s</string>
+    <string name="downloader_download_succeeded_ticker">下载</string>
     <string name="downloader_download_succeeded_content">%1$s 下载成功</string>
     <string name="downloader_download_failed_ticker">下载失败</string>
+    <string name="downloader_download_failed_content">无法下载%1$s</string>
     <string name="downloader_not_downloaded_yet">未下载完毕</string>
     <string name="downloader_download_failed_credentials_error">下载失败，你需要重新登录</string>
     <string name="common_choose_account">选择账户</string>
     <string name="sync_fail_ticker">同步失败</string>
+    <string name="sync_fail_ticker_unauthorized">同步失败，您需要重新登录</string>
+    <string name="sync_fail_content">无法完成%1$s的同步处理</string>
+    <string name="sync_fail_content_unauthorized">%1$s的密码错误</string>
     <string name="sync_conflicts_in_favourites_ticker">发现冲突</string>
     <string name="sync_conflicts_in_favourites_content">%1$d 文件无法同步</string>
     <string name="sync_fail_in_favourites_ticker">文件同步失败</string>
     <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(%2$d 冲突)</string>
     <string name="sync_foreign_files_forgotten_ticker">某些本地文件已被遗忘</string>
     <string name="sync_foreign_files_forgotten_content">%2$s 目录中的 %1$d 个文件不能被复制到</string>
+    <string name="sync_current_folder_was_removed">文件夹%1$s不再存在</string>
     <string name="foreign_files_move">移动所有</string>
     <string name="foreign_files_success">所有文件已被移动</string>
     <string name="foreign_files_fail">某些文件无法被移动</string>
     <string name="foreign_files_local_text">本地: %1$s</string>
     <string name="foreign_files_remote_text">远程:%1$s</string>
+    <string name="upload_query_move_foreign_files">空间不足将阻止将所选文件复制到%1$s文件夹中。 你想把它们移到那里吗？</string>
     <string name="pass_code_enter_pass_code">请输入你的密码</string>
     
     <string name="pass_code_configure_your_pass_code">输入您的密码</string>
@@ -209,7 +231,16 @@
     <string name="media_event_done">%1$s 播放完毕</string>
     <string name="media_err_nothing_to_play">没有发现播放文件</string>
     <string name="media_err_no_account">未提供账号</string>
+    <string name="media_err_not_in_owncloud">该文件不在有效的帐户</string>
     <string name="media_err_unsupported">不支持的编码格式</string>
+    <string name="media_err_io">无法读取媒体文件</string>
+    <string name="media_err_malformed">媒体文件的编码不正确</string>
+    <string name="media_err_timeout">尝试播放文件超时</string>
+    <string name="media_err_invalid_progressive_playback">无法流媒体文件</string>
+    <string name="media_err_unknown">陈旧的媒体播放器无法播放媒体文件</string>
+    <string name="media_err_security_ex">尝试播放%1$s时遇到安全错误</string>
+    <string name="media_err_io_ex">尝试播放%1$s时输入错误</string>
+    <string name="media_err_unexpected">尝试播放%1$s时发生意外错误</string>
     <string name="media_rewind_description">后退按钮</string>
     <string name="media_play_pause_description">播放暂停按钮</string>
     <string name="media_forward_description">快进按钮</string>
@@ -221,21 +252,33 @@
 	<string name="auth_connection_established">连接已建立。</string>
 	<string name="auth_testing_connection">测试连接</string>
 	<string name="auth_not_configured_title">服务器配置不正确</string>
+	<string name="auth_account_not_new">设备上已经存在相同用户和服务器的帐户</string>
 	<string name="auth_account_not_the_same">输入用户与此帐户的用户不符</string>
 	<string name="auth_unknown_error_title">发生未知错误！</string>
+	<string name="auth_unknown_host_title">找不到主机</string>
+	<string name="auth_incorrect_path_title">找不到服务</string>
 	<string name="auth_timeout_title">看起来服务器不太给力</string>
+	<string name="auth_incorrect_address_title">服务器地址格式错误</string>
 	<string name="auth_ssl_general_error_title">SSL初始化失败</string>
+	<string name="auth_ssl_unverified_server_title">无法验证SSL服务器的身份</string>
 	<string name="auth_bad_oc_version_title">不可辨识的服务器服务器版本</string>
+	<string name="auth_wrong_connection_title">无法建立连接</string>
 	<string name="auth_secure_connection">安全连接已建立</string>
 	<string name="auth_unauthorized">用户名或密码错误</string>
 	<string name="auth_oauth_error">认证不成功</string>
 	<string name="auth_oauth_error_access_denied">访问被认证服务器拒绝</string>
+	<string name="auth_wtf_reenter_URL">意外状态请重新输入服务器地址</string>
 	<string name="auth_expired_oauth_token_toast">你的授权已经过期。请重新授权。</string>
 	<string name="auth_expired_basic_auth_toast">请输入当前的密码</string>
 	<string name="auth_expired_saml_sso_token_toast">您的会话超时了，请重新连接</string>
+	<string name="auth_connecting_auth_server">连接到身份验证服务器...</string>
 	<string name="auth_unsupported_auth_method">服务器不支持这种验证方式</string>
 	<string name="auth_unsupported_multiaccount">%1$s不支持多个账户</string>
+	<string name="auth_fail_get_user_name">您的服务器没有返回正确的用户ID，请与管理员联系</string>
 	<string name="auth_can_not_auth_against_server">无法连接认证服务器</string>
+    <string name="auth_account_does_not_exist">设备上不存在帐户</string>
+
+
     <string name="favorite">可以设置离线</string>
     <string name="unfavorite">不可以设置离线</string>
     <string name="favorite_real">加入收藏</string>
@@ -243,24 +286,36 @@
     <string name="common_rename">重命名</string>
     <string name="common_remove">删除</string>
     <string name="confirmation_remove_file_alert">你确定要删除%1$s?</string>
+    <string name="confirmation_remove_folder_alert">你真的要删除%1$s及其内容吗？</string>
     <string name="confirmation_remove_local">仅本地</string>
+    <string name="remove_success_msg">删除</string>
     <string name="remove_fail_msg">无法完成删除</string>
     <string name="rename_dialog_title">请输出新的名字</string>
+    <string name="rename_local_fail_msg">本地副本无法重命名，尝试其他名称</string>
+    <string name="rename_server_fail_msg">不能给服务器新的名称</string>
+    <string name="sync_file_fail_msg">无法查看远程文件</string>
     <string name="sync_file_nothing_to_do_msg">文件内容已同步</string>
+    <string name="create_dir_fail_msg">无法创建文件夹</string>
     <string name="filename_forbidden_characters">禁用字符: / \\ &lt; &gt; : \" | ? *</string>
     <string name="filename_forbidden_charaters_from_server">文件名中存在至少一个非法字符</string>
     <string name="filename_empty">文件名不能为空</string>
+    <string name="wait_a_moment">稍等</string>
     <string name="wait_checking_credentials">检查保存的证书</string>
+    <string name="filedisplay_unexpected_bad_get_content">意外的问题，请从不同的应用程序选择文件</string>
+    <string name="filedisplay_no_file_selected">没有选择文件</string>
     <string name="activity_chooser_title">发送链接给 &#8230;</string>
     <string name="wait_for_tmp_copy_from_private_storage">从私有存储中拷贝文件</string>
     
     <string name="oauth_check_onoff">使用oAuth2登陆</string> 
+    <string name="oauth_login_connection">连接到OAuth 2服务器...</string>    
+        
     <string name="ssl_validator_header">站点身份无法验证</string>
     <string name="ssl_validator_reason_cert_not_trusted">- 不受信任的服务器证书</string>
     <string name="ssl_validator_reason_cert_expired">- 服务器证书过期</string>
     <string name="ssl_validator_reason_cert_not_yet_valid">- 服务器证书时间比当前时间还晚</string>
     <string name="ssl_validator_reason_hostname_not_verified">- 主机名与证书中的记录不匹配</string>
     <string name="ssl_validator_question">是否信任此证书？</string>
+    <string name="ssl_validator_not_saved">无法保存证书</string>
     <string name="ssl_validator_btn_details_see">详细信息</string>
     <string name="ssl_validator_btn_details_hide">隐藏</string>
     <string name="ssl_validator_label_subject">授权给：</string>
@@ -284,12 +339,19 @@
 
     <string name="placeholder_sentence">占位符</string>
     <string name="placeholder_filename">点位符.txt</string>
+    <string name="placeholder_filetype">PNG 图片</string>
     <string name="placeholder_filesize">389字节</string>
     <string name="placeholder_timestamp">2012/05/18 下午12:23 </string>
     <string name="placeholder_media_time">12:23:45</string>
 
+    <string name="auto_upload_on_wifi">仅在Wi-Fi下上传</string>
+    <string name="instant_upload_on_wifi">仅在Wi-Fi下上传图片</string>
+    <string name="instant_video_upload_on_wifi">仅在Wi-Fi下上传视频</string>
+    <string name="instant_video_upload_on_charging">仅在充电时上传</string>
+    <string name="instant_upload_on_charging">仅在充电时上传</string>
     <string name="instant_upload_path">/实时上传</string>
     <string name="conflict_title">文件冲突</string>
+    <string name="conflict_message">你想保留哪些文件？ 如果您选择这两个版本，本地文件将附加一个号码。</string>
     <string name="conflict_keep_both">保留两者</string>
     <string name="conflict_use_local_version">本地版本</string>
     <string name="conflict_use_server_version">服务器版本</string>
@@ -305,6 +367,7 @@
     <string name="prefs_instant_upload_path_use_subfolders_title">使用子文件夹</string>
     <string name="prefs_instant_upload_path_use_subfolders_summary">基于年和月存于子文件夹</string>
 
+	<string name="share_link_no_support_share_api">您的服务器上未启用共享。 请联系您的管理员。</string>
 	<string name="share_link_file_no_exist">无法共享。请检查文件是否存在</string>
 	<string name="share_link_file_error">共享文件或目录出错</string>
 	<string name="unshare_link_file_no_exist">无法取消共享。请检查文件是否存在</string>
@@ -318,9 +381,18 @@
 
     <string name="copy_link">复制链接</string>
     <string name="clipboard_text_copied">复制到剪贴板</string>
+    <string name="clipboard_no_text_to_copy">收到没有文字复制到剪贴板</string>
     <string name="clipboard_uxexpected_error">发生未预见的错误当复制到剪贴板</string>
     <string name="clipboard_label">从%1$s复制文本</string>
 
+    <string name="error_cant_bind_to_operations_service">严重错误：无法执行操作</string>
+
+    <string name="network_error_socket_exception">连接到服务器时发生错误。</string>
+    <string name="network_error_socket_timeout_exception">等待服务器时发生错误。 无法完成操作。</string>
+    <string name="network_error_connect_timeout_exception">等待服务器时发生错误。 无法完成操作。</string>
+    <string name="network_host_not_available">无法完成操作。 服务器无法使用</string>
+
+    <string name="forbidden_permissions">您不允许%s</string>
     <string name="forbidden_permissions_rename">重命名该文件</string>
     <string name="forbidden_permissions_delete">删除该文件</string>
     <string name="share_link_forbidden_permissions">共享该文件</string>
@@ -332,10 +404,14 @@
 
     <string name="file_migration_dialog_title">更新存储路径</string>
     <string name="file_migration_finish_button">完成</string>
+    <string name="file_migration_preparing">准备迁移1&#8230;</string>
     <string name="file_migration_checking_destination">检查目的地&#8230;</string>
+    <string name="file_migration_saving_accounts_configuration">保存帐户配置1&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">等待所有同步完成1&#8230;</string>
     <string name="file_migration_migrating">正在转移数据&#8230;</string>
     <string name="file_migration_updating_index">更新目录&#8230;</string>
     <string name="file_migration_cleaning">清除&#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">恢复帐户配置1&#8230;</string>
     <string name="file_migration_ok_finished">完成</string>
     <string name="file_migration_failed_not_enough_space">错误：空间不足</string>
     <string name="file_migration_failed_not_writable">错误：目标文件不可写</string>
@@ -349,10 +425,14 @@
     <string name="file_migration_use_data_folder">使用</string>
 
     <string name="file_migration_source_not_readable_title">源目录不可读！</string>
+    <string name="file_migration_source_not_readable">您还想将存储路径更改为%1$s？\ n \ note：所有数据都必须重新下载。</string>
+
     <string name="prefs_category_accounts">账号</string>
     <string name="prefs_add_account">添加账号</string>
     <string name="drawer_manage_accounts">管理账号</string>
-    <string name="actionbar_logger">日志</string>
+    <string name="auth_redirect_non_secure_connection_title">安全连接通过不安全的路由重定向。</string>
+
+	<string name="actionbar_logger">日志</string>
 	<string name="log_send_history_button">发送历史日志</string>
 	<string name="log_send_no_mail_app">没有应用程序发送发送日志。 请安装电子邮件客户端。</string>
 	<string name="log_send_mail_subject">%1$s Android 程序日志</string>
@@ -457,6 +537,7 @@
     <string name="action_switch_list_view">列表视图</string>
 
     <string name="manage_space_title">管理空间</string>
+    <string name="manage_space_description">来自%1$s数据的设置，数据库和服务器证书将被永久删除。 \ n \ n下载的文件将保持不变。\ n \ n此过程可能需要一段时间。</string>
     <string name="manage_space_clear_data">清除数据</string>
     <string name="manage_space_error">某些文件无法删除。</string>
 
@@ -477,11 +558,10 @@
     <string name="participate_testing_report_text">在GIthub在报告问题</string>
     <string name="participate_testing_version_text">在帮助里有兴趣通过测试下一个版本？</string>
     <string name="participate_beta_headline">检查这个设备的版本</string>
+    <string name="participate_beta_text">这包括所有即将到来的功能，它处于非常流行的边缘。 可能会发生错误/错误，如果及时，请报告您的发现。</string>
     <string name="participate_release_candidate_headline">发行候选版本</string>
+    <string name="participate_release_candidate_text">发布候选人（RC）是即将发布的快照，预计将稳定。 测试您的个人设置可以帮助确保这一点。 注册在Play商店进行测试，或手动查看F-Droid上的“版本”部分。</string>
     <string name="participate_contribute_headline">活跃的候选版</string>
-    <string name="participate_contribute_irc_text">在IRC上加入这个会话： &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">帮助他人在 &lt;a href="%1$s">论坛&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">翻译&lt;/a> 应用程序</string>
     <string name="move_to">转移到&#8230;</string>
     <string name="copy_to">复制到</string>
     <string name="choose_remote_folder">选择文件夹&#8230;</string>
@@ -489,6 +569,7 @@
     <string name="folder_sync_no_results">没有发现媒体文件夹</string>
     <string name="folder_sync_preferences">自动上传的首选项</string>
     <string name="folder_sync_settings">设置</string>
+    <string name="folder_sync_new_info">即时上传已完全重新整理。 从主菜单重新配置您的自动上传。\ n \ n请使用新的的和扩展的自动上传。</string>
     <string name="folder_sync_preferences_folder_path">为%1$s</string>
     <plurals name="items_selected_count">
         <item quantity="other">%d被选择</item>
@@ -542,6 +623,7 @@
 
     <!-- Activities -->
     <string name="activities_no_results_headline">暂无动态</string>
+    <string name="activities_no_results_message">此流将显示\ n添加，更改和共享等事件</string>
     <string name="webview_error">发生错误</string>
     <string name="prefs_category_about">关于</string>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c4933ce94a..72c30deb3d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -561,10 +561,10 @@
     <string name="participate_release_candidate_headline">Release candidate</string>
     <string name="participate_release_candidate_text">The release candidate (RC) is a snapshot of the upcoming release and is expected to be stable. Testing your individual setup could help ensure this. Sign up for testing on the Play store or manually look in the \"versions\" section on F-Droid.</string>
     <string name="participate_contribute_headline">Actively Contribute</string>
-    <string name="participate_contribute_irc_text">Join the chat on IRC: &lt;a href="%1$s">#nextcloud-mobile&lt;/a></string>
-    <string name="participate_contribute_forum_text">Help others on the &lt;a href="%1$s">forum&lt;/a></string>
-    <string name="participate_contribute_translate_text">&lt;a href="%1$s">Translate&lt;/a> the app</string>
-    <string name="participate_contribute_github_text">Review, amend and write code, see &lt;a href="https://github.com/nextcloud/android/blob/master/CONTRIBUTING.md">CONTRIBUTING.md&lt;/a> for details</string>
+    <string name="participate_contribute_irc_text">Join the chat on IRC: &lt;a href=\"%1$s\">#nextcloud-mobile&lt;/a></string>
+    <string name="participate_contribute_forum_text">Help others on the &lt;a href=\"%1$s\">forum&lt;/a></string>
+    <string name="participate_contribute_translate_text">&lt;a href=\"%1$s\">Translate&lt;/a> the app</string>
+    <string name="participate_contribute_github_text">Review, amend and write code, see &lt;a href=\"%1$s\">CONTRIBUTING.md&lt;a> for details</string>
     <string name="move_to">Move to&#8230;</string>
     <string name="copy_to">Copy to&#8230;</string>
     <string name="choose_remote_folder">Choose folder&#8230;</string>