Merge branch 'master' into implement_712

128 files changed, 1230 insertions, 258 deletions

diff --git a/apps/comments/l10n/de.js b/apps/comments/l10n/de.js
index 34a839ab484..c6c98114bde 100644
--- a/apps/comments/l10n/de.js
+++ b/apps/comments/l10n/de.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "You commented" : "Von Dir kommentiert",
     "%1$s commented" : "%1$s kommentiert",
     "You commented on %2$s" : "Du hast %2$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s"
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/comments/l10n/de.json b/apps/comments/l10n/de.json
index d9c5309196c..8a37f001b19 100644
--- a/apps/comments/l10n/de.json
+++ b/apps/comments/l10n/de.json
@@ -19,6 +19,7 @@
     "You commented" : "Von Dir kommentiert",
     "%1$s commented" : "%1$s kommentiert",
     "You commented on %2$s" : "Du hast %2$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s"
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/comments/l10n/de_DE.js b/apps/comments/l10n/de_DE.js
index bbddac44a10..93ed87318b6 100644
--- a/apps/comments/l10n/de_DE.js
+++ b/apps/comments/l10n/de_DE.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "You commented" : "Sie haben kommentiert",
     "%1$s commented" : "%1$s kommentierte",
     "You commented on %2$s" : "Sie haben %2$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s"
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/comments/l10n/de_DE.json b/apps/comments/l10n/de_DE.json
index a8ff860a17f..b75e849a34b 100644
--- a/apps/comments/l10n/de_DE.json
+++ b/apps/comments/l10n/de_DE.json
@@ -19,6 +19,7 @@
     "You commented" : "Sie haben kommentiert",
     "%1$s commented" : "%1$s kommentierte",
     "You commented on %2$s" : "Sie haben %2$s kommentiert",
-    "%1$s commented on %2$s" : "%1$s kommentierte %2$s"
+    "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
+    "<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/comments/l10n/is.js b/apps/comments/l10n/is.js
index f32e49d37c5..3036d572db6 100644
--- a/apps/comments/l10n/is.js
+++ b/apps/comments/l10n/is.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "You commented" : "Þú settir inn athugasemd",
     "%1$s commented" : "%1$s setti inn athugasemd",
     "You commented on %2$s" : "Þú settir inn athugasemd við %2$s",
-    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s"
+    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/comments/l10n/is.json b/apps/comments/l10n/is.json
index c70a192f529..3e91e4ecc48 100644
--- a/apps/comments/l10n/is.json
+++ b/apps/comments/l10n/is.json
@@ -19,6 +19,7 @@
     "You commented" : "Þú settir inn athugasemd",
     "%1$s commented" : "%1$s setti inn athugasemd",
     "You commented on %2$s" : "Þú settir inn athugasemd við %2$s",
-    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s"
+    "%1$s commented on %2$s" : "%1$s setti inn athugasemd um %2$s",
+    "<strong>Comments</strong> for files" : "<strong>Athugasemdir</strong> við skrár"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index 156a6dcd4e9..2c014860ab6 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -57,6 +57,8 @@ OC.L10N.register(
     "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
     "Enabled" : "Aktiviert",
-    "Disabled" : "Deaktiviert"
+    "Disabled" : "Deaktiviert",
+    "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du musst Deine Verschlüsselungs-Schlüssel von der Alten Vershlüsselung (ownCloud <= 8.0) zur neuen migrieren.  Bitte führe 'occ encryption:migrate' aus oder kontaktiere den Administrator",
+    "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index ba3577290a9..de1cc7aa667 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -55,6 +55,8 @@
     "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
     "Enabled" : "Aktiviert",
-    "Disabled" : "Deaktiviert"
+    "Disabled" : "Deaktiviert",
+    "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du musst Deine Verschlüsselungs-Schlüssel von der Alten Vershlüsselung (ownCloud <= 8.0) zur neuen migrieren.  Bitte führe 'occ encryption:migrate' aus oder kontaktiere den Administrator",
+    "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index 966d36453af..a5a7f6381b1 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -57,6 +57,10 @@ OC.L10N.register(
     "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
     "Enabled" : "Aktiviert",
-    "Disabled" : "Deaktiviert"
+    "Disabled" : "Deaktiviert",
+    "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator. ",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
+    "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
+    "Nextcloud basic encryption module" : "Nextcloud Basisverschlüsselungsmodul"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index 5232ec9fab5..f72e0f79e67 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -55,6 +55,10 @@
     "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
     "Enabled" : "Aktiviert",
-    "Disabled" : "Deaktiviert"
+    "Disabled" : "Deaktiviert",
+    "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator. ",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
+    "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
+    "Nextcloud basic encryption module" : "Nextcloud Basisverschlüsselungsmodul"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
index da4bd12078f..3a8a7369397 100644
--- a/apps/encryption/l10n/id.js
+++ b/apps/encryption/l10n/id.js
@@ -22,6 +22,9 @@ OC.L10N.register(
     "The current log-in password was not correct, please try again." : "Sandi masuk saat ini salah, mohon coba lagi.",
     "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Anda perlu mengganti kunci enkripsi Anda dari enkripsi lama (ownCloud <= 8.0) ke yang baru. Mohon jalankan 'occ encryption:migrate' atau hubungi administrator Anda",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk aplikasi enkripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienkripsi.",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi enkripsi telah diaktifkan tetapi kunci tidak terinisialisasi, silakan log-out dan log-in lagi",
+    "Encryption app is enabled and ready" : "Apl enkripsi aktif dan siap",
     "Bad Signature" : "Tanda salah",
     "Missing Signature" : "Tanda hilang",
     "one-time password for server-side-encryption" : "Sandi sekali pakai untuk server-side-encryption",
@@ -43,6 +46,7 @@ OC.L10N.register(
     "New recovery key password" : "Sandi kunci pemulihan baru",
     "Repeat new recovery key password" : "Ulangi sandi kunci pemulihan baru",
     "Change Password" : "Ubah Sandi",
+    "Basic encryption module" : "Modul enkripsi dasar",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
     "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
     "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
@@ -53,6 +57,12 @@ OC.L10N.register(
     "Enable password recovery:" : "Aktifkan sandi pemulihan:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi",
     "Enabled" : "Diaktifkan",
-    "Disabled" : "Dinonaktifkan"
+    "Disabled" : "Dinonaktifkan",
+    "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Anda perlu mengganti kunci enkripsi Anda dari enkripsi lama (Nextcloud <= 8.0) ke yang baru. Mohon jalankan 'occ encryption:migrate' atau hubungi administrator Anda",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk aplikasi enkripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienkripsi.",
+    "Encryption App is enabled and ready" : "Apl enkripsi aktif dan siap",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'Nextcloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hai,\n\nadmin telah mengaktifkan enkripsi server-side. Berkas Anda dienkripsi dengan menggunakan sandi '%s'.\n\nMogon log masuk ke tampilan web, masuk ke bagian 'modul enkripsi dasar Nextcloud' dalam pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini ke 'sandi masuk yang lama' dan sandi masuk yang sekarang.\n\n",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"Nextcloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hai,<br><br>admin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi <strong>%s</strong>.<br><br>Silakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar Nextcloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi masuk yang baru.<br><br>",
+    "Nextcloud basic encryption module" : "Modul enkripsi dasar Nextcloud"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
index c1a2f35670f..be04544f582 100644
--- a/apps/encryption/l10n/id.json
+++ b/apps/encryption/l10n/id.json
@@ -20,6 +20,9 @@
     "The current log-in password was not correct, please try again." : "Sandi masuk saat ini salah, mohon coba lagi.",
     "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Anda perlu mengganti kunci enkripsi Anda dari enkripsi lama (ownCloud <= 8.0) ke yang baru. Mohon jalankan 'occ encryption:migrate' atau hubungi administrator Anda",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk aplikasi enkripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienkripsi.",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi enkripsi telah diaktifkan tetapi kunci tidak terinisialisasi, silakan log-out dan log-in lagi",
+    "Encryption app is enabled and ready" : "Apl enkripsi aktif dan siap",
     "Bad Signature" : "Tanda salah",
     "Missing Signature" : "Tanda hilang",
     "one-time password for server-side-encryption" : "Sandi sekali pakai untuk server-side-encryption",
@@ -41,6 +44,7 @@
     "New recovery key password" : "Sandi kunci pemulihan baru",
     "Repeat new recovery key password" : "Ulangi sandi kunci pemulihan baru",
     "Change Password" : "Ubah Sandi",
+    "Basic encryption module" : "Modul enkripsi dasar",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
     "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
     "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
@@ -51,6 +55,12 @@
     "Enable password recovery:" : "Aktifkan sandi pemulihan:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi",
     "Enabled" : "Diaktifkan",
-    "Disabled" : "Dinonaktifkan"
+    "Disabled" : "Dinonaktifkan",
+    "You need to migrate your encryption keys from the old encryption (Nextcloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Anda perlu mengganti kunci enkripsi Anda dari enkripsi lama (Nextcloud <= 8.0) ke yang baru. Mohon jalankan 'occ encryption:migrate' atau hubungi administrator Anda",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk aplikasi enkripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienkripsi.",
+    "Encryption App is enabled and ready" : "Apl enkripsi aktif dan siap",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'Nextcloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hai,\n\nadmin telah mengaktifkan enkripsi server-side. Berkas Anda dienkripsi dengan menggunakan sandi '%s'.\n\nMogon log masuk ke tampilan web, masuk ke bagian 'modul enkripsi dasar Nextcloud' dalam pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini ke 'sandi masuk yang lama' dan sandi masuk yang sekarang.\n\n",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"Nextcloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hai,<br><br>admin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi <strong>%s</strong>.<br><br>Silakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar Nextcloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi masuk yang baru.<br><br>",
+    "Nextcloud basic encryption module" : "Modul enkripsi dasar Nextcloud"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/federatedfilesharing/l10n/cs_CZ.js b/apps/federatedfilesharing/l10n/cs_CZ.js
index 0a6ba02eeac..c51add4747e 100644
--- a/apps/federatedfilesharing/l10n/cs_CZ.js
+++ b/apps/federatedfilesharing/l10n/cs_CZ.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Heslo vzdáleného sdílení",
     "Cancel" : "Zrušit",
     "Add remote share" : "Přidat propojené sdílení",
+    "Copied!" : "Zkopírováno!",
+    "Not supported!" : "Nepodporováno!",
+    "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.",
+    "Press Ctrl-C to copy." : "Zmáčknout Ctrl-C pro kopírování.",
     "Invalid Federated Cloud ID" : "Neplatné sdružené cloud ID",
     "Server to server sharing is not enabled on this server" : "Sdílení ze serveru na server není na tomto serveru povoleno",
     "Couldn't establish a federated share." : "Nepodařilo se ustavit spojené sdílení.",
diff --git a/apps/federatedfilesharing/l10n/cs_CZ.json b/apps/federatedfilesharing/l10n/cs_CZ.json
index 26c8dd38be7..1c079650d46 100644
--- a/apps/federatedfilesharing/l10n/cs_CZ.json
+++ b/apps/federatedfilesharing/l10n/cs_CZ.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Heslo vzdáleného sdílení",
     "Cancel" : "Zrušit",
     "Add remote share" : "Přidat propojené sdílení",
+    "Copied!" : "Zkopírováno!",
+    "Not supported!" : "Nepodporováno!",
+    "Press ⌘-C to copy." : "Zmáčknout ⌘-C pro kopírování.",
+    "Press Ctrl-C to copy." : "Zmáčknout Ctrl-C pro kopírování.",
     "Invalid Federated Cloud ID" : "Neplatné sdružené cloud ID",
     "Server to server sharing is not enabled on this server" : "Sdílení ze serveru na server není na tomto serveru povoleno",
     "Couldn't establish a federated share." : "Nepodařilo se ustavit spojené sdílení.",
diff --git a/apps/federatedfilesharing/l10n/de_DE.js b/apps/federatedfilesharing/l10n/de_DE.js
index 019f23253e6..24244aa931e 100644
--- a/apps/federatedfilesharing/l10n/de_DE.js
+++ b/apps/federatedfilesharing/l10n/de_DE.js
@@ -15,7 +15,7 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
     "Couldn't establish a federated share." : "Federated-Share konnte nicht aufgebaut werden",
     "Couldn't establish a federated share, maybe the password was wrong." : "Federated-Share konnte nicht aufgebaut werden, da eventuell das Passwort falsch ist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sier erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sie erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
diff --git a/apps/federatedfilesharing/l10n/de_DE.json b/apps/federatedfilesharing/l10n/de_DE.json
index 263bc6865e3..66cb25b49fe 100644
--- a/apps/federatedfilesharing/l10n/de_DE.json
+++ b/apps/federatedfilesharing/l10n/de_DE.json
@@ -13,7 +13,7 @@
     "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
     "Couldn't establish a federated share." : "Federated-Share konnte nicht aufgebaut werden",
     "Couldn't establish a federated share, maybe the password was wrong." : "Federated-Share konnte nicht aufgebaut werden, da eventuell das Passwort falsch ist.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sier erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Anfrage zum Federated-Share war erfolgreich. Sie erhalten eine Einladung. Bitte prüfen Sie Ihre Benachrichtigungen.",
     "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
     "Not allowed to create a federated share with the owner." : "Das Erstellen einer Federated Cloud Freigabe mit dem Benutzer ist nicht erlaubt.",
     "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
diff --git a/apps/federatedfilesharing/l10n/is.js b/apps/federatedfilesharing/l10n/is.js
index c2140787537..7015934fd1c 100644
--- a/apps/federatedfilesharing/l10n/is.js
+++ b/apps/federatedfilesharing/l10n/is.js
@@ -7,6 +7,10 @@ OC.L10N.register(
     "Remote share password" : "Lykilorð fjartengdrar sameignar",
     "Cancel" : "Hætta við",
     "Add remote share" : "Bæta við fjartengdri sameign",
+    "Copied!" : "Afritað!",
+    "Not supported!" : "Ekki stutt!",
+    "Press ⌘-C to copy." : "Ýttu á ⌘-C til að afrita.",
+    "Press Ctrl-C to copy." : "Ýttu á Ctrl-C til að afrita.",
     "Invalid Federated Cloud ID" : "Ógilt skýjasambandsauðkenni (Federated Cloud ID)",
     "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni",
     "Couldn't establish a federated share." : "Gat ekki bætt við skýjasambandssameign.",
diff --git a/apps/federatedfilesharing/l10n/is.json b/apps/federatedfilesharing/l10n/is.json
index bd5af8d4622..1d62a8fd345 100644
--- a/apps/federatedfilesharing/l10n/is.json
+++ b/apps/federatedfilesharing/l10n/is.json
@@ -5,6 +5,10 @@
     "Remote share password" : "Lykilorð fjartengdrar sameignar",
     "Cancel" : "Hætta við",
     "Add remote share" : "Bæta við fjartengdri sameign",
+    "Copied!" : "Afritað!",
+    "Not supported!" : "Ekki stutt!",
+    "Press ⌘-C to copy." : "Ýttu á ⌘-C til að afrita.",
+    "Press Ctrl-C to copy." : "Ýttu á Ctrl-C til að afrita.",
     "Invalid Federated Cloud ID" : "Ógilt skýjasambandsauðkenni (Federated Cloud ID)",
     "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni",
     "Couldn't establish a federated share." : "Gat ekki bætt við skýjasambandssameign.",
diff --git a/apps/federation/l10n/de.js b/apps/federation/l10n/de.js
index c24fe42d6a4..13496d63987 100644
--- a/apps/federation/l10n/de.js
+++ b/apps/federation/l10n/de.js
@@ -10,6 +10,10 @@ OC.L10N.register(
     "Add server automatically once a federated share was created successfully" : "Einen mit ownCloud Federation verbundenen Server automatisch hinzufügen, sobald die Verbindung einmal erfolgreich erstellt wurde",
     "Trusted Servers" : "Vertrauenswürdige Server",
     "+ Add Nextcloud server" : "+ Nextcloud Server hinzufügen",
-    "Nextcloud Server" : "Nextcloud Server"
+    "Nextcloud Server" : "Nextcloud Server",
+    "Server added to the list of trusted Nextclouds" : "Server zur Liste der vertrauenswürdigen Nextclouds hinzugefügt",
+    "No Nextcloud server found" : "Kein Nextcloud Server gefunden",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Nextcloud Federation erlaubt es Dir, mit anderem vertrautem Nextcloud Server in Verbindung zu stehen, um Benutzerverzeichnise auszutauschen. Zum Beispiel wird das verwendet, um eine automatische Vervollständigung der externen Benutzer zu ermöglichen.",
+    "Trusted Nextcloud Servers" : "Vertrauenswürdige Nextcloud Server"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/federation/l10n/de.json b/apps/federation/l10n/de.json
index 837e69628f3..db2f303de01 100644
--- a/apps/federation/l10n/de.json
+++ b/apps/federation/l10n/de.json
@@ -8,6 +8,10 @@
     "Add server automatically once a federated share was created successfully" : "Einen mit ownCloud Federation verbundenen Server automatisch hinzufügen, sobald die Verbindung einmal erfolgreich erstellt wurde",
     "Trusted Servers" : "Vertrauenswürdige Server",
     "+ Add Nextcloud server" : "+ Nextcloud Server hinzufügen",
-    "Nextcloud Server" : "Nextcloud Server"
+    "Nextcloud Server" : "Nextcloud Server",
+    "Server added to the list of trusted Nextclouds" : "Server zur Liste der vertrauenswürdigen Nextclouds hinzugefügt",
+    "No Nextcloud server found" : "Kein Nextcloud Server gefunden",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Nextcloud Federation erlaubt es Dir, mit anderem vertrautem Nextcloud Server in Verbindung zu stehen, um Benutzerverzeichnise auszutauschen. Zum Beispiel wird das verwendet, um eine automatische Vervollständigung der externen Benutzer zu ermöglichen.",
+    "Trusted Nextcloud Servers" : "Vertrauenswürdige Nextcloud Server"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/de_DE.js b/apps/federation/l10n/de_DE.js
index 42abfa0f1a6..c83bdad5868 100644
--- a/apps/federation/l10n/de_DE.js
+++ b/apps/federation/l10n/de_DE.js
@@ -10,6 +10,10 @@ OC.L10N.register(
     "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobale eine federated Freigabe erstellt wurde",
     "Trusted Servers" : "Vertrauenswürdige Server",
     "+ Add Nextcloud server" : "+ Nextcloud Server hinzufügen",
-    "Nextcloud Server" : "Nextcloud Server"
+    "Nextcloud Server" : "Nextcloud Server",
+    "Server added to the list of trusted Nextclouds" : "Server zur Liste der vertrauenswürdigen Nextclouds hinzugefügt",
+    "No Nextcloud server found" : "Kein Nextcloud Server gefunden",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Nextcloud Federation erlaubt es Dir, mit anderem vertrautem Nextcloud Server in Verbindung zu stehen, um Benutzerverzeichnise auszutauschen. Zum Beispiel wird das verwendet, um eine automatische Vervollständigung der externen Benutzer zu ermöglichen.",
+    "Trusted Nextcloud Servers" : "Vertrauenswürdige Nextcloud Server"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/federation/l10n/de_DE.json b/apps/federation/l10n/de_DE.json
index 816c75b491d..6ca52a00452 100644
--- a/apps/federation/l10n/de_DE.json
+++ b/apps/federation/l10n/de_DE.json
@@ -8,6 +8,10 @@
     "Add server automatically once a federated share was created successfully" : "Server automatisch hinzufügen sobale eine federated Freigabe erstellt wurde",
     "Trusted Servers" : "Vertrauenswürdige Server",
     "+ Add Nextcloud server" : "+ Nextcloud Server hinzufügen",
-    "Nextcloud Server" : "Nextcloud Server"
+    "Nextcloud Server" : "Nextcloud Server",
+    "Server added to the list of trusted Nextclouds" : "Server zur Liste der vertrauenswürdigen Nextclouds hinzugefügt",
+    "No Nextcloud server found" : "Kein Nextcloud Server gefunden",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Nextcloud Federation erlaubt es Dir, mit anderem vertrautem Nextcloud Server in Verbindung zu stehen, um Benutzerverzeichnise auszutauschen. Zum Beispiel wird das verwendet, um eine automatische Vervollständigung der externen Benutzer zu ermöglichen.",
+    "Trusted Nextcloud Servers" : "Vertrauenswürdige Nextcloud Server"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/fi_FI.js b/apps/federation/l10n/fi_FI.js
index 3a2d85a51b6..53052a96406 100644
--- a/apps/federation/l10n/fi_FI.js
+++ b/apps/federation/l10n/fi_FI.js
@@ -1,15 +1,17 @@
 OC.L10N.register(
     "federation",
     {
-    "Server added to the list of trusted ownClouds" : "Palvelin lisätty luotettujen ownCloudien luetteloon",
+    "Added to the list of trusted servers" : "Lisätty luotettujen palvelimien luetteloon",
     "Server is already in the list of trusted servers." : "Palvelin on jo luotettujen palvelimien luettelossa.",
-    "No ownCloud server found" : "ownCloud-palvelinta ei löydy",
+    "No server to federate with found" : "Palvelinta johon liittyä ei löytynyt",
     "Could not add server" : "Palvelimen lisääminen ei onnistunut",
     "Federation" : "Federaatio",
-    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjäluetteloihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.",
     "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti",
-    "Trusted ownCloud Servers" : "Luotetut ownCloud-palvelimet",
-    "+ Add ownCloud server" : "+ Lisää ownCloud-palvelin",
-    "ownCloud Server" : "ownCloud-palvelin"
+    "Trusted Servers" : "Luotetut palvelimet",
+    "+ Add Nextcloud server" : "+ Lisää Nextcloud-palvelin",
+    "Nextcloud Server" : "Nextcloud-palvelin",
+    "Server added to the list of trusted Nextclouds" : "Palvelin lisätty luotettujen palvelimien luetteloon",
+    "No Nextcloud server found" : "Nextcloud-palvelinta ei löytynyt"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/federation/l10n/fi_FI.json b/apps/federation/l10n/fi_FI.json
index 8060a437617..4cc9068a74e 100644
--- a/apps/federation/l10n/fi_FI.json
+++ b/apps/federation/l10n/fi_FI.json
@@ -1,13 +1,15 @@
 { "translations": {
-    "Server added to the list of trusted ownClouds" : "Palvelin lisätty luotettujen ownCloudien luetteloon",
+    "Added to the list of trusted servers" : "Lisätty luotettujen palvelimien luetteloon",
     "Server is already in the list of trusted servers." : "Palvelin on jo luotettujen palvelimien luettelossa.",
-    "No ownCloud server found" : "ownCloud-palvelinta ei löydy",
+    "No server to federate with found" : "Palvelinta johon liittyä ei löytynyt",
     "Could not add server" : "Palvelimen lisääminen ei onnistunut",
     "Federation" : "Federaatio",
-    "ownCloud Federation allows you to connect with other trusted ownClouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "ownCloudin federaatio mahdollistaa yhdistämisen muihin luotettuihin ownCloudeihin käyttäjähakemistojen vaihtamiseksi. Tätä käytetään muun muassa ulkoisten käyttäjien automaattiseen täydentämiseen federoidussa jakamisessa.",
+    "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federointi sallii sinun liittyä toisten luotettujen palvelimien käyttäjäluetteloihin. Sitä käytetään esimerkiksi ulkoisten käyttäjänimien automaattiseen täydentämiseen.",
     "Add server automatically once a federated share was created successfully" : "Lisää palvelin automaattisesti, kun federoitu jako on luotu onnistuneesti",
-    "Trusted ownCloud Servers" : "Luotetut ownCloud-palvelimet",
-    "+ Add ownCloud server" : "+ Lisää ownCloud-palvelin",
-    "ownCloud Server" : "ownCloud-palvelin"
+    "Trusted Servers" : "Luotetut palvelimet",
+    "+ Add Nextcloud server" : "+ Lisää Nextcloud-palvelin",
+    "Nextcloud Server" : "Nextcloud-palvelin",
+    "Server added to the list of trusted Nextclouds" : "Palvelin lisätty luotettujen palvelimien luetteloon",
+    "No Nextcloud server found" : "Nextcloud-palvelinta ei löytynyt"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/id.js b/apps/federation/l10n/id.js
index c4725768abe..801cd52ae12 100644
--- a/apps/federation/l10n/id.js
+++ b/apps/federation/l10n/id.js
@@ -3,12 +3,17 @@ OC.L10N.register(
     {
     "Added to the list of trusted servers" : "Server telah ditambahkan pada daftar server terpercaya",
     "Server is already in the list of trusted servers." : "Server sudah ada pada daftar server terpercaya",
+    "No server to federate with found" : "Tidak ada server yang bisa difederasikan",
     "Could not add server" : "Tidak dapat menambahkan server",
     "Federation" : "Federasi",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi memungkinkan Anda untuk terhubung dengan server lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.",
     "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat",
     "Trusted Servers" : "Server Terpercaya",
     "+ Add Nextcloud server" : "+ Tambahkan server Nextcloud",
-    "Nextcloud Server" : "Server Nextcloud"
+    "Nextcloud Server" : "Server Nextcloud",
+    "Server added to the list of trusted Nextclouds" : "Server telah ditambahkan pada daftar server Nextcloud terpercaya",
+    "No Nextcloud server found" : "Tidak ada server Nextcloud ditemukan",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi Nextcloud memungkinkan Anda untuk terhubung dengan server Nextcloud lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.",
+    "Trusted Nextcloud Servers" : "Server Nextcloud Terpercaya"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/federation/l10n/id.json b/apps/federation/l10n/id.json
index 7d8a0c37a95..2ca5efeaf2a 100644
--- a/apps/federation/l10n/id.json
+++ b/apps/federation/l10n/id.json
@@ -1,12 +1,17 @@
 { "translations": {
     "Added to the list of trusted servers" : "Server telah ditambahkan pada daftar server terpercaya",
     "Server is already in the list of trusted servers." : "Server sudah ada pada daftar server terpercaya",
+    "No server to federate with found" : "Tidak ada server yang bisa difederasikan",
     "Could not add server" : "Tidak dapat menambahkan server",
     "Federation" : "Federasi",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi memungkinkan Anda untuk terhubung dengan server lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.",
     "Add server automatically once a federated share was created successfully" : "Tambah server secara otomatis saat pembagian terfederasi dibuat",
     "Trusted Servers" : "Server Terpercaya",
     "+ Add Nextcloud server" : "+ Tambahkan server Nextcloud",
-    "Nextcloud Server" : "Server Nextcloud"
+    "Nextcloud Server" : "Server Nextcloud",
+    "Server added to the list of trusted Nextclouds" : "Server telah ditambahkan pada daftar server Nextcloud terpercaya",
+    "No Nextcloud server found" : "Tidak ada server Nextcloud ditemukan",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federasi Nextcloud memungkinkan Anda untuk terhubung dengan server Nextcloud lainnya yang terpercaya untuk menukar direktori pengguna. Contohnya, ini akan digunakan untuk pengisian-otomatis untuk pengguna eksternal untuk pembagian terfederasi.",
+    "Trusted Nextcloud Servers" : "Server Nextcloud Terpercaya"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/is.js b/apps/federation/l10n/is.js
index 88c83aad4a0..77695a4a42d 100644
--- a/apps/federation/l10n/is.js
+++ b/apps/federation/l10n/is.js
@@ -3,12 +3,17 @@ OC.L10N.register(
     {
     "Added to the list of trusted servers" : "Bætt á lista yfir treysta þjóna",
     "Server is already in the list of trusted servers." : "Þjónninn er nú þegar á listanum yfir treysta þjóna.",
+    "No server to federate with found" : "Enginn þjónn sem hæfur er til skýjasambands fannst",
     "Could not add server" : "Gat ekki bætt við þjóni",
     "Federation" : "Samband",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
     "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign",
     "Trusted Servers" : "Treystir þjónar",
     "+ Add Nextcloud server" : "+ Bæta við Nextcloud þjóni",
-    "Nextcloud Server" : "Nextcloud þjónn"
+    "Nextcloud Server" : "Nextcloud þjónn",
+    "Server added to the list of trusted Nextclouds" : "Þjóninum bætt við listann yfir treyst Nextcloud-ský",
+    "No Nextcloud server found" : "Enginn Nextcloud-þjónn fannst",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
+    "Trusted Nextcloud Servers" : "Treystir Nextcloud-þjónar"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/federation/l10n/is.json b/apps/federation/l10n/is.json
index 5277841fe04..49980207ce3 100644
--- a/apps/federation/l10n/is.json
+++ b/apps/federation/l10n/is.json
@@ -1,12 +1,17 @@
 { "translations": {
     "Added to the list of trusted servers" : "Bætt á lista yfir treysta þjóna",
     "Server is already in the list of trusted servers." : "Þjónninn er nú þegar á listanum yfir treysta þjóna.",
+    "No server to federate with found" : "Enginn þjónn sem hæfur er til skýjasambands fannst",
     "Could not add server" : "Gat ekki bætt við þjóni",
     "Federation" : "Samband",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
     "Add server automatically once a federated share was created successfully" : "Bæta þjóni við sjálfkrafa, hafi tekist að búa til sambandssameign",
     "Trusted Servers" : "Treystir þjónar",
     "+ Add Nextcloud server" : "+ Bæta við Nextcloud þjóni",
-    "Nextcloud Server" : "Nextcloud þjónn"
+    "Nextcloud Server" : "Nextcloud þjónn",
+    "Server added to the list of trusted Nextclouds" : "Þjóninum bætt við listann yfir treyst Nextcloud-ský",
+    "No Nextcloud server found" : "Enginn Nextcloud-þjónn fannst",
+    "Nextcloud Federation allows you to connect with other trusted Nextclouds to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Þjónasamband (federation) gerir þér kleift að tengjast öðrumtreystum skýjum til að skiptast á notendaskrám. Þetta er til dæmis notað til að sjálfklára nöfn ytri notenda við deilingu sambandssameigna.",
+    "Trusted Nextcloud Servers" : "Treystir Nextcloud-þjónar"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/federation/l10n/pt_BR.js b/apps/federation/l10n/pt_BR.js
index 210cf76baeb..c13e2b79d5a 100644
--- a/apps/federation/l10n/pt_BR.js
+++ b/apps/federation/l10n/pt_BR.js
@@ -10,6 +10,8 @@ OC.L10N.register(
     "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito",
     "Trusted Servers" : "Servidores confiáveis",
     "+ Add Nextcloud server" : "+ Adicionar servidor Nextcloud",
-    "Nextcloud Server" : "Servidor Nextcloud"
+    "Nextcloud Server" : "Servidor Nextcloud",
+    "No Nextcloud server found" : "Servidor Nextcloud não encontrado",
+    "Trusted Nextcloud Servers" : "Servidores Nextcloud confiáveis"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/federation/l10n/pt_BR.json b/apps/federation/l10n/pt_BR.json
index d0defc984f4..17369337cc7 100644
--- a/apps/federation/l10n/pt_BR.json
+++ b/apps/federation/l10n/pt_BR.json
@@ -8,6 +8,8 @@
     "Add server automatically once a federated share was created successfully" : "Adicionar servidor automaticamente uma vez que um compartilhamento associado foi criado com êxito",
     "Trusted Servers" : "Servidores confiáveis",
     "+ Add Nextcloud server" : "+ Adicionar servidor Nextcloud",
-    "Nextcloud Server" : "Servidor Nextcloud"
+    "Nextcloud Server" : "Servidor Nextcloud",
+    "No Nextcloud server found" : "Servidor Nextcloud não encontrado",
+    "Trusted Nextcloud Servers" : "Servidores Nextcloud confiáveis"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index 5e9c8cff6a7..cf474290623 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -132,6 +132,8 @@ OC.L10N.register(
     "No favorites" : "Keine Favoriten",
     "Files and folders you mark as favorite will show up here" : "Dateien und Ordner, die als Favoriten markiert werden, erscheinen hier",
     "Text file" : "Textdatei",
-    "New text file.txt" : "Neue Textdatei.txt"
+    "New text file.txt" : "Neue Textdatei.txt",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Diese Adresse benutzen, um <a href=\"%s\" target=\"_blank\">über WebDAV auf deine Dateien zuzugreifen</a>",
+    "Cancel upload" : "Hochladen abbrechen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index 12f845fabae..7d03943c9b5 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -130,6 +130,8 @@
     "No favorites" : "Keine Favoriten",
     "Files and folders you mark as favorite will show up here" : "Dateien und Ordner, die als Favoriten markiert werden, erscheinen hier",
     "Text file" : "Textdatei",
-    "New text file.txt" : "Neue Textdatei.txt"
+    "New text file.txt" : "Neue Textdatei.txt",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Diese Adresse benutzen, um <a href=\"%s\" target=\"_blank\">über WebDAV auf deine Dateien zuzugreifen</a>",
+    "Cancel upload" : "Hochladen abbrechen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index 90f3f9d1125..075f3156ee5 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -132,6 +132,8 @@ OC.L10N.register(
     "No favorites" : "Keine Favoriten",
     "Files and folders you mark as favorite will show up here" : "Dateien und Ordner, die Sie als Favoriten kennzeichnen, werden hier erscheinen",
     "Text file" : "Textdatei",
-    "New text file.txt" : "Neue Textdatei file.txt"
+    "New text file.txt" : "Neue Textdatei file.txt",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf deine Dateien zuzugreifen</a>",
+    "Cancel upload" : "Hochladen abbrechen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index 58652381a2a..84b3e9393a0 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -130,6 +130,8 @@
     "No favorites" : "Keine Favoriten",
     "Files and folders you mark as favorite will show up here" : "Dateien und Ordner, die Sie als Favoriten kennzeichnen, werden hier erscheinen",
     "Text file" : "Textdatei",
-    "New text file.txt" : "Neue Textdatei file.txt"
+    "New text file.txt" : "Neue Textdatei file.txt",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf deine Dateien zuzugreifen</a>",
+    "Cancel upload" : "Hochladen abbrechen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
index 368367bc51e..b840eb59cd8 100644
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@@ -132,6 +132,8 @@ OC.L10N.register(
     "No favorites" : "Tidak ada favorit",
     "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini.",
     "Text file" : "Berkas teks",
-    "New text file.txt" : "Teks baru file.txt"
+    "New text file.txt" : "Teks baru file.txt",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses berkas Anda melalui WebDAV</a>",
+    "Cancel upload" : "Batalkan pengunggahan"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
index 6639be657e7..f4bb1cb48e1 100644
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@@ -130,6 +130,8 @@
     "No favorites" : "Tidak ada favorit",
     "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini.",
     "Text file" : "Berkas teks",
-    "New text file.txt" : "Teks baru file.txt"
+    "New text file.txt" : "Teks baru file.txt",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses berkas Anda melalui WebDAV</a>",
+    "Cancel upload" : "Batalkan pengunggahan"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js
index 989dc468f0c..cce6da5945e 100644
--- a/apps/files/l10n/is.js
+++ b/apps/files/l10n/is.js
@@ -132,6 +132,8 @@ OC.L10N.register(
     "No favorites" : "Engin eftirlæti",
     "Files and folders you mark as favorite will show up here" : "Skrár og möppur sem þú merkir sem uppáhald birtast hér",
     "Text file" : "Textaskrá",
-    "New text file.txt" : "Ný textaskrá.txt"
+    "New text file.txt" : "Ný textaskrá.txt",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Notaðu þetta vistfang til að <a href=\"%s\" target=\"_blank\">nálgast skrárnar þínar með WebDAV</a>",
+    "Cancel upload" : "Hætta við innsendingu"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json
index 65da27622f8..7f7dba8bd46 100644
--- a/apps/files/l10n/is.json
+++ b/apps/files/l10n/is.json
@@ -130,6 +130,8 @@
     "No favorites" : "Engin eftirlæti",
     "Files and folders you mark as favorite will show up here" : "Skrár og möppur sem þú merkir sem uppáhald birtast hér",
     "Text file" : "Textaskrá",
-    "New text file.txt" : "Ný textaskrá.txt"
+    "New text file.txt" : "Ný textaskrá.txt",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Notaðu þetta vistfang til að <a href=\"%s\" target=\"_blank\">nálgast skrárnar þínar með WebDAV</a>",
+    "Cancel upload" : "Hætta við innsendingu"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index 13cee46110b..c35ae30e7d2 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -132,6 +132,7 @@ OC.L10N.register(
     "No favorites" : "Sem favoritos",
     "Files and folders you mark as favorite will show up here" : "Arquivos e pastas que você marcou como favoritos são mostrados aqui",
     "Text file" : "Arquivo texto",
-    "New text file.txt" : "Novo texto file.txt"
+    "New text file.txt" : "Novo texto file.txt",
+    "Cancel upload" : "Cancelar envio"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index 6d50bc793a1..746f2a3e895 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -130,6 +130,7 @@
     "No favorites" : "Sem favoritos",
     "Files and folders you mark as favorite will show up here" : "Arquivos e pastas que você marcou como favoritos são mostrados aqui",
     "Text file" : "Arquivo texto",
-    "New text file.txt" : "Novo texto file.txt"
+    "New text file.txt" : "Novo texto file.txt",
+    "Cancel upload" : "Cancelar envio"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index 2d7c8702d52..aa10b21e882 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -126,6 +126,7 @@ OC.L10N.register(
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
     "Allow users to mount external storage" : "Benutzern erlauben, externen Speicher einzubinden",
-    "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:"
+    "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:",
+    "Access granted" : "Zugriff gewährt"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index e840a014ee3..df5fd8e6755 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -124,6 +124,7 @@
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
     "Allow users to mount external storage" : "Benutzern erlauben, externen Speicher einzubinden",
-    "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:"
+    "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:",
+    "Access granted" : "Zugriff gewährt"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js
index 465cf16387e..084288cd482 100644
--- a/apps/files_external/l10n/de_DE.js
+++ b/apps/files_external/l10n/de_DE.js
@@ -126,6 +126,7 @@ OC.L10N.register(
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
     "Allow users to mount external storage" : "Erlauben Sie den Benutzern externen Speicher hinzuzufügen",
-    "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:"
+    "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:",
+    "Access granted" : "Zugriff gewährt"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
index d1b1bd0b9f8..3d659f47573 100644
--- a/apps/files_external/l10n/de_DE.json
+++ b/apps/files_external/l10n/de_DE.json
@@ -124,6 +124,7 @@
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
     "Allow users to mount external storage" : "Erlauben Sie den Benutzern externen Speicher hinzuzufügen",
-    "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:"
+    "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:",
+    "Access granted" : "Zugriff gewährt"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index 19e37c94cfd..9951942ddcc 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Pyyntötunnisteen nouto epäonnistui. Tarkista että sovellusavaimesi ja -salaisuutesi ovat oikein.",
     "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
     "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
     "External storage" : "Ulkoinen tallennustila",
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index cc39a8213e4..986258fe0c3 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Pyyntötunnisteen nouto epäonnistui. Tarkista että sovellusavaimesi ja -salaisuutesi ovat oikein.",
     "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
     "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
     "External storage" : "Ulkoinen tallennustila",
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
index 053d4dfe6a0..699ffcdf94b 100644
--- a/apps/files_external/l10n/id.js
+++ b/apps/files_external/l10n/id.js
@@ -126,6 +126,7 @@ OC.L10N.register(
     "Advanced settings" : "Pengaturan Lanjutan",
     "Delete" : "Hapus",
     "Allow users to mount external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal",
-    "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
+    "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut",
+    "Access granted" : "Akses diberikan"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
index 4cbb4187cc1..a89425b7cea 100644
--- a/apps/files_external/l10n/id.json
+++ b/apps/files_external/l10n/id.json
@@ -124,6 +124,7 @@
     "Advanced settings" : "Pengaturan Lanjutan",
     "Delete" : "Hapus",
     "Allow users to mount external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal",
-    "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
+    "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut",
+    "Access granted" : "Akses diberikan"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js
index ab73dbece96..2c8f5897d34 100644
--- a/apps/files_external/l10n/is.js
+++ b/apps/files_external/l10n/is.js
@@ -126,6 +126,7 @@ OC.L10N.register(
     "Advanced settings" : "Ítarlegri valkostir",
     "Delete" : "Eyða",
     "Allow users to mount external storage" : "Leyfa notendum að tengja ytri gagnageymslur í skráakerfi",
-    "Allow users to mount the following external storage" : "Leyfa notendum að tengja eftirfarandi ytri gagnageymslu í skráakerfi"
+    "Allow users to mount the following external storage" : "Leyfa notendum að tengja eftirfarandi ytri gagnageymslu í skráakerfi",
+    "Access granted" : "Aðgangur heimilaður"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json
index 5738ff738fb..260988d04d9 100644
--- a/apps/files_external/l10n/is.json
+++ b/apps/files_external/l10n/is.json
@@ -124,6 +124,7 @@
     "Advanced settings" : "Ítarlegri valkostir",
     "Delete" : "Eyða",
     "Allow users to mount external storage" : "Leyfa notendum að tengja ytri gagnageymslur í skráakerfi",
-    "Allow users to mount the following external storage" : "Leyfa notendum að tengja eftirfarandi ytri gagnageymslu í skráakerfi"
+    "Allow users to mount the following external storage" : "Leyfa notendum að tengja eftirfarandi ytri gagnageymslu í skráakerfi",
+    "Access granted" : "Aðgangur heimilaður"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 1858c91b8ab..ce6f9c8b31d 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -102,6 +102,36 @@ OC.L10N.register(
     "Upload files to %s" : "Dateien auf %s hochladen",
     "Select or drop files" : "Dateien auswählen oder hierher ziehen",
     "Uploading files…" : "Dateien werden hochgeladen...",
-    "Uploaded files:" : "Hochgeladene Dateien: "
+    "Uploaded files:" : "Hochgeladene Dateien: ",
+    "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
+    "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
+    "Not allowed to create a federated share with the same user server" : "Teilen mit Nutzern auf dem selben Server via Federated-Cloud ist nicht erlaubt",
+    "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+    "Storage not valid" : "Speicher ungültig",
+    "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden",
+    "Federated sharing" : "Federated-Sharing",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soll die entfernte Freigabe {name} von {owner}@{remote} hinzugefügt werden?",
+    "Remote share" : "Entfernte Freigabe",
+    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Cancel" : "Abbrechen",
+    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden",
+    "Invalid ownCloud url" : "Ungültige OwnCloud-URL",
+    "You received \"/%2$s\" as a remote share from %1$s" : "Du hast \"/%2$s\" als entfernte Freigabe von %1$s erhalten",
+    "Accept" : "Akzeptieren",
+    "Decline" : "Ablehnen",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID",
+    "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "Open documentation" : "Dokumentation öffnen",
+    "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+    "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben",
+    "Federated Cloud" : "Federated-Cloud",
+    "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
+    "Share it:" : "Teilen:",
+    "Add to your website" : "Zu deiner Webseite hinzufügen",
+    "Share with me via Nextcloud" : "Teile mit mir über Nextcloud",
+    "HTML Code:" : "HTML-Code:"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 1967ec91ada..9e905b1a614 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -100,6 +100,36 @@
     "Upload files to %s" : "Dateien auf %s hochladen",
     "Select or drop files" : "Dateien auswählen oder hierher ziehen",
     "Uploading files…" : "Dateien werden hochgeladen...",
-    "Uploaded files:" : "Hochgeladene Dateien: "
+    "Uploaded files:" : "Hochgeladene Dateien: ",
+    "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
+    "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
+    "Not allowed to create a federated share with the same user server" : "Teilen mit Nutzern auf dem selben Server via Federated-Cloud ist nicht erlaubt",
+    "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+    "Storage not valid" : "Speicher ungültig",
+    "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden",
+    "Federated sharing" : "Federated-Sharing",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soll die entfernte Freigabe {name} von {owner}@{remote} hinzugefügt werden?",
+    "Remote share" : "Entfernte Freigabe",
+    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Cancel" : "Abbrechen",
+    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden",
+    "Invalid ownCloud url" : "Ungültige OwnCloud-URL",
+    "You received \"/%2$s\" as a remote share from %1$s" : "Du hast \"/%2$s\" als entfernte Freigabe von %1$s erhalten",
+    "Accept" : "Akzeptieren",
+    "Decline" : "Ablehnen",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID",
+    "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "Open documentation" : "Dokumentation öffnen",
+    "Allow users on this server to send shares to other servers" : "Benutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+    "Allow users on this server to receive shares from other servers" : "Benutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben",
+    "Federated Cloud" : "Federated-Cloud",
+    "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
+    "Share it:" : "Teilen:",
+    "Add to your website" : "Zu deiner Webseite hinzufügen",
+    "Share with me via Nextcloud" : "Teile mit mir über Nextcloud",
+    "HTML Code:" : "HTML-Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 510336b2d32..3957208073f 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -102,6 +102,36 @@ OC.L10N.register(
     "Upload files to %s" : "Dateien auf %s hochladen",
     "Select or drop files" : "Dateien auswählen oder hierher ziehen",
     "Uploading files…" : "Dateien werden hochgeladen...",
-    "Uploaded files:" : "Hochgeladene Dateien: "
+    "Uploaded files:" : "Hochgeladene Dateien: ",
+    "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
+    "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
+    "Not allowed to create a federated share with the same user server" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer-Server ist nicht erlaubt",
+    "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+    "Storage not valid" : "Speicher ungültig",
+    "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden",
+    "Federated sharing" : "Federated-Sharing",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchten Sie die entfernte Freigabe {name} von {owner}@{remote} hinzufügen? ",
+    "Remote share" : "Entfernte Freigabe",
+    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Cancel" : "Abbrechen",
+    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden",
+    "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse",
+    "You received \"/%2$s\" as a remote share from %1$s" : "Sie haben \"/%2$s\" als Remotefreigabe von %1$s erhalten",
+    "Accept" : "Akzeptieren",
+    "Decline" : "Ablehnen",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID",
+    "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "Open documentation" : "Dokumentation öffnen",
+    "Allow users on this server to send shares to other servers" : "Gestatten Sie Nutzern dieses Servers Freigaben von anderen Servern zu erhalten",
+    "Allow users on this server to receive shares from other servers" : "Erlauben Sie Nutzern dieses Servers Freigaben von anderen Servern zu erhalten",
+    "Federated Cloud" : "Federated-Cloud",
+    "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
+    "Share it:" : "Teilen:",
+    "Add to your website" : "Zu Ihrer Web-Seite hinzufügen",
+    "Share with me via Nextcloud" : "Teilen Sie mit mir über Nextcloud ",
+    "HTML Code:" : "HTML-Code:"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 9803e17f76f..7bb422577a2 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -100,6 +100,36 @@
     "Upload files to %s" : "Dateien auf %s hochladen",
     "Select or drop files" : "Dateien auswählen oder hierher ziehen",
     "Uploading files…" : "Dateien werden hochgeladen...",
-    "Uploaded files:" : "Hochgeladene Dateien: "
+    "Uploaded files:" : "Hochgeladene Dateien: ",
+    "Server to server sharing is not enabled on this server" : "Das Server-zu-Server-Teilen ist auf diesem Server nicht aktiviert",
+    "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält ungültige Zeichen.",
+    "Not allowed to create a federated share with the same user server" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer-Server ist nicht erlaubt",
+    "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+    "Could not authenticate to remote share, password might be wrong" : "Die Authentifizierung an der entfernten Freigabe konnte nicht erfolgen, das Passwort könnte falsch sein",
+    "Storage not valid" : "Speicher ungültig",
+    "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden",
+    "Federated sharing" : "Federated-Sharing",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchten Sie die entfernte Freigabe {name} von {owner}@{remote} hinzufügen? ",
+    "Remote share" : "Entfernte Freigabe",
+    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Cancel" : "Abbrechen",
+    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden",
+    "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse",
+    "You received \"/%2$s\" as a remote share from %1$s" : "Sie haben \"/%2$s\" als Remotefreigabe von %1$s erhalten",
+    "Accept" : "Akzeptieren",
+    "Decline" : "Ablehnen",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID",
+    "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "Open documentation" : "Dokumentation öffnen",
+    "Allow users on this server to send shares to other servers" : "Gestatten Sie Nutzern dieses Servers Freigaben von anderen Servern zu erhalten",
+    "Allow users on this server to receive shares from other servers" : "Erlauben Sie Nutzern dieses Servers Freigaben von anderen Servern zu erhalten",
+    "Federated Cloud" : "Federated-Cloud",
+    "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
+    "Share it:" : "Teilen:",
+    "Add to your website" : "Zu Ihrer Web-Seite hinzufügen",
+    "Share with me via Nextcloud" : "Teilen Sie mit mir über Nextcloud ",
+    "HTML Code:" : "HTML-Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index 99f58652505..27cdcd910ab 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -18,9 +18,12 @@ OC.L10N.register(
     "Shared by" : "Dibagikan oleh",
     "Sharing" : "Berbagi",
     "Wrong share ID, share doesn't exist" : "ID pembagian salah, tidak ada yang bisa dibagi",
+    "could not delete share" : "tidak dapat menghapus pembagian",
     "Could not delete share" : "Tidak dapat menghapus pembagian",
     "Please specify a file or folder path" : "Tentukan berkas atau folder",
     "Wrong path, file/folder doesn't exist" : "Salah path, berkas/folder tidak ada",
+    "Could not create share" : "Tidak dapat membuat pembagian",
+    "invalid permissions" : "izin tidak sah",
     "Please specify a valid user" : "Tentukan pengguna yang valid",
     "Group sharing is disabled by the administrator" : "Berbagi grup dinonaktifkan oleh administrator",
     "Please specify a valid group" : "Tentukan grup yang valid",
@@ -99,6 +102,36 @@ OC.L10N.register(
     "Upload files to %s" : "Unggah berkas ke %s",
     "Select or drop files" : "Pilih atau drop berkas",
     "Uploading files…" : "Mengunggah berkas...",
-    "Uploaded files:" : "Berkas terunggah:"
+    "Uploaded files:" : "Berkas terunggah:",
+    "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
+    "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.",
+    "Not allowed to create a federated share with the same user server" : "Tidak diizinkan membuat pembagian terfederasi dengan server pengguna yang sama",
+    "Invalid or untrusted SSL certificate" : "Sertifikat SSL tidak sah atau tidak terpercaya",
+    "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah",
+    "Storage not valid" : "Penyimpanan tidak sah",
+    "Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
+    "Federated sharing" : "Pembagian terfederasi",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
+    "Remote share" : "Berbagi remote",
+    "Remote share password" : "Sandi berbagi remote",
+    "Cancel" : "Batalkan",
+    "Add remote share" : "Tambah berbagi remote",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}",
+    "Invalid ownCloud url" : "URL ownCloud tidak sah",
+    "You received \"/%2$s\" as a remote share from %1$s" : "Anda menerima \"/%2$s\" sebagai berbagi remote dari %1$s",
+    "Accept" : "Terima",
+    "Decline" : "Tolak",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Bagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Bagikan pada saya melalui #ownCloud Federated Cloud ID saya",
+    "Federated Cloud Sharing" : "Pembagian Awan Terfederasi",
+    "Open documentation" : "Buka dokumentasi",
+    "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.",
+    "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya.",
+    "Federated Cloud" : "Awan Terfederasi",
+    "Your Federated Cloud ID:" : "ID Awan Terfederasi Anda:",
+    "Share it:" : "Bagikan:",
+    "Add to your website" : "Tambahkan pada situs web Anda",
+    "Share with me via Nextcloud" : "Bagikan pada saya via Nextcloud",
+    "HTML Code:" : "Kode HTML:"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index d51c0eb73bb..71b6500c136 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -16,9 +16,12 @@
     "Shared by" : "Dibagikan oleh",
     "Sharing" : "Berbagi",
     "Wrong share ID, share doesn't exist" : "ID pembagian salah, tidak ada yang bisa dibagi",
+    "could not delete share" : "tidak dapat menghapus pembagian",
     "Could not delete share" : "Tidak dapat menghapus pembagian",
     "Please specify a file or folder path" : "Tentukan berkas atau folder",
     "Wrong path, file/folder doesn't exist" : "Salah path, berkas/folder tidak ada",
+    "Could not create share" : "Tidak dapat membuat pembagian",
+    "invalid permissions" : "izin tidak sah",
     "Please specify a valid user" : "Tentukan pengguna yang valid",
     "Group sharing is disabled by the administrator" : "Berbagi grup dinonaktifkan oleh administrator",
     "Please specify a valid group" : "Tentukan grup yang valid",
@@ -97,6 +100,36 @@
     "Upload files to %s" : "Unggah berkas ke %s",
     "Select or drop files" : "Pilih atau drop berkas",
     "Uploading files…" : "Mengunggah berkas...",
-    "Uploaded files:" : "Berkas terunggah:"
+    "Uploaded files:" : "Berkas terunggah:",
+    "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
+    "The mountpoint name contains invalid characters." : "Nama mount point berisi karakter yang tidak sah.",
+    "Not allowed to create a federated share with the same user server" : "Tidak diizinkan membuat pembagian terfederasi dengan server pengguna yang sama",
+    "Invalid or untrusted SSL certificate" : "Sertifikat SSL tidak sah atau tidak terpercaya",
+    "Could not authenticate to remote share, password might be wrong" : "Tidak dapat mengautentikasi berbagi remote, kata sandi mungkin salah",
+    "Storage not valid" : "Penyimpanan tidak sah",
+    "Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
+    "Federated sharing" : "Pembagian terfederasi",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
+    "Remote share" : "Berbagi remote",
+    "Remote share password" : "Sandi berbagi remote",
+    "Cancel" : "Batalkan",
+    "Add remote share" : "Tambah berbagi remote",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}",
+    "Invalid ownCloud url" : "URL ownCloud tidak sah",
+    "You received \"/%2$s\" as a remote share from %1$s" : "Anda menerima \"/%2$s\" sebagai berbagi remote dari %1$s",
+    "Accept" : "Terima",
+    "Decline" : "Tolak",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Bagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Bagikan pada saya melalui #ownCloud Federated Cloud ID saya",
+    "Federated Cloud Sharing" : "Pembagian Awan Terfederasi",
+    "Open documentation" : "Buka dokumentasi",
+    "Allow users on this server to send shares to other servers" : "Izinkan para pengguna di server ini untuk mengirimkan berbagi ke server lainnya.",
+    "Allow users on this server to receive shares from other servers" : "Izinkan para pengguna di server ini untuk menerima berbagi ke server lainnya.",
+    "Federated Cloud" : "Awan Terfederasi",
+    "Your Federated Cloud ID:" : "ID Awan Terfederasi Anda:",
+    "Share it:" : "Bagikan:",
+    "Add to your website" : "Tambahkan pada situs web Anda",
+    "Share with me via Nextcloud" : "Bagikan pada saya via Nextcloud",
+    "HTML Code:" : "Kode HTML:"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js
index 5ec2391e2f7..27afc0d4c07 100644
--- a/apps/files_sharing/l10n/is.js
+++ b/apps/files_sharing/l10n/is.js
@@ -102,6 +102,36 @@ OC.L10N.register(
     "Upload files to %s" : "Senda inn skrár á %s",
     "Select or drop files" : "Veldu eða slepptu skrám",
     "Uploading files…" : "Sendi inn skrár…",
-    "Uploaded files:" : "Innsendar skrár:"
+    "Uploaded files:" : "Innsendar skrár:",
+    "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni",
+    "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.",
+    "Not allowed to create a federated share with the same user server" : "Ekki er heimilt að búa til skýjasambandssameign með sama notendaþjóni",
+    "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki",
+    "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt",
+    "Storage not valid" : "Geymslan er ekki gild",
+    "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign",
+    "Federated sharing" : "Deiling milli þjóna (skýjasambandssameign)",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Viltu bæta við fjartengdri sameign {name} frá {owner}@{remote}?",
+    "Remote share" : "Fjartengd sameign",
+    "Remote share password" : "Lykilorð fjartengdrar sameignar",
+    "Cancel" : "Hætta við",
+    "Add remote share" : "Bæta við fjartengdri sameign",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Engin ownCloud uppsetning (útgáfa 7 eða nýrri) fannst á {remote}",
+    "Invalid ownCloud url" : "Ógild ownCloud-slóð",
+    "You received \"/%2$s\" as a remote share from %1$s" : "Þú tókst við \"/%2$s\" sem fjartengdri sameign frá %1$s",
+    "Accept" : "Samþykkja",
+    "Decline" : "Hafna",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID, sjá %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID",
+    "Federated Cloud Sharing" : "Deiling með skýjasambandi",
+    "Open documentation" : "Opna hjálparskjöl",
+    "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna",
+    "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum",
+    "Federated Cloud" : "Skýjasamband (federated)",
+    "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):",
+    "Share it:" : "Deila því:",
+    "Add to your website" : "Bæta við vefsvæðið þitt",
+    "Share with me via Nextcloud" : "Deila með mér í gegnum Nextcloud",
+    "HTML Code:" : "HTML-kóði:"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json
index e6d72bab0e9..a35988cccb5 100644
--- a/apps/files_sharing/l10n/is.json
+++ b/apps/files_sharing/l10n/is.json
@@ -100,6 +100,36 @@
     "Upload files to %s" : "Senda inn skrár á %s",
     "Select or drop files" : "Veldu eða slepptu skrám",
     "Uploading files…" : "Sendi inn skrár…",
-    "Uploaded files:" : "Innsendar skrár:"
+    "Uploaded files:" : "Innsendar skrár:",
+    "Server to server sharing is not enabled on this server" : "Deiling frá þjóni til þjóns er ekki virk á þessum þjóni",
+    "The mountpoint name contains invalid characters." : "Heiti tengipunktsins inniheldur ógilda stafi.",
+    "Not allowed to create a federated share with the same user server" : "Ekki er heimilt að búa til skýjasambandssameign með sama notendaþjóni",
+    "Invalid or untrusted SSL certificate" : "Ógilt eða vantreyst SSL-skilríki",
+    "Could not authenticate to remote share, password might be wrong" : "Gat ekki auðkennt á fjartengdri sameign, lykilorð gæti verið rangt",
+    "Storage not valid" : "Geymslan er ekki gild",
+    "Couldn't add remote share" : "Gat ekki bætt við fjartengdri sameign",
+    "Federated sharing" : "Deiling milli þjóna (skýjasambandssameign)",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Viltu bæta við fjartengdri sameign {name} frá {owner}@{remote}?",
+    "Remote share" : "Fjartengd sameign",
+    "Remote share password" : "Lykilorð fjartengdrar sameignar",
+    "Cancel" : "Hætta við",
+    "Add remote share" : "Bæta við fjartengdri sameign",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Engin ownCloud uppsetning (útgáfa 7 eða nýrri) fannst á {remote}",
+    "Invalid ownCloud url" : "Ógild ownCloud-slóð",
+    "You received \"/%2$s\" as a remote share from %1$s" : "Þú tókst við \"/%2$s\" sem fjartengdri sameign frá %1$s",
+    "Accept" : "Samþykkja",
+    "Decline" : "Hafna",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID, sjá %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Deila með mér í gegnum víðværa skýjasambandsauðkennið mitt #ownCloud Federated Cloud ID",
+    "Federated Cloud Sharing" : "Deiling með skýjasambandi",
+    "Open documentation" : "Opna hjálparskjöl",
+    "Allow users on this server to send shares to other servers" : "Leyfa notendum á þessum þjóni að senda sameignir til annarra þjóna",
+    "Allow users on this server to receive shares from other servers" : "Leyfa notendum á þessum þjóni að taka á móti sameignum frá öðrum þjónum",
+    "Federated Cloud" : "Skýjasamband (federated)",
+    "Your Federated Cloud ID:" : "Skýjasambandsauðkennið þitt (Federated Cloud ID):",
+    "Share it:" : "Deila því:",
+    "Add to your website" : "Bæta við vefsvæðið þitt",
+    "Share with me via Nextcloud" : "Deila með mér í gegnum Nextcloud",
+    "HTML Code:" : "HTML-kóði:"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 6fa16d7f227..ec55afbe87d 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -102,6 +102,11 @@ OC.L10N.register(
     "Upload files to %s" : "Carregar arquivos para %s",
     "Select or drop files" : "Selecione e solte arquivos",
     "Uploading files…" : "Carregando arquivos...",
-    "Uploaded files:" : "Arquivos carregados:"
+    "Uploaded files:" : "Arquivos carregados:",
+    "Storage not valid" : "Armazenamento inválido",
+    "Remote share" : "Compartilhamento remoto",
+    "Cancel" : "Cancelar",
+    "Accept" : "Aceitar",
+    "Decline" : "Rejeitar"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 8071156c514..921096003d5 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -100,6 +100,11 @@
     "Upload files to %s" : "Carregar arquivos para %s",
     "Select or drop files" : "Selecione e solte arquivos",
     "Uploading files…" : "Carregando arquivos...",
-    "Uploaded files:" : "Arquivos carregados:"
+    "Uploaded files:" : "Arquivos carregados:",
+    "Storage not valid" : "Armazenamento inválido",
+    "Remote share" : "Compartilhamento remoto",
+    "Cancel" : "Cancelar",
+    "Accept" : "Aceitar",
+    "Decline" : "Rejeitar"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php
index 8dde2dafb0d..9da6dbbc995 100644
--- a/apps/files_sharing/lib/Capabilities.php
+++ b/apps/files_sharing/lib/Capabilities.php
@@ -69,6 +69,7 @@ class Capabilities implements ICapability {
 
 				$public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
 				$public['upload'] = $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
+				$public['upload_files_drop'] = $public['upload'];
 			}
 			$res["public"] = $public;
 
diff --git a/apps/files_sharing/tests/CapabilitiesTest.php b/apps/files_sharing/tests/CapabilitiesTest.php
index 0c4a68b997c..254f7cdaa7c 100644
--- a/apps/files_sharing/tests/CapabilitiesTest.php
+++ b/apps/files_sharing/tests/CapabilitiesTest.php
@@ -232,6 +232,7 @@ class CapabilitiesTest extends \Test\TestCase {
 		];
 		$result = $this->getResults($map);
 		$this->assertTrue($result['public']['upload']);
+		$this->assertTrue($result['public']['upload_files_drop']);
 	}
 
 	public function testLinkNoPublicUpload() {
@@ -242,6 +243,7 @@ class CapabilitiesTest extends \Test\TestCase {
 		];
 		$result = $this->getResults($map);
 		$this->assertFalse($result['public']['upload']);
+		$this->assertFalse($result['public']['upload_files_drop']);
 	}
 
 	public function testNoGroupSharing() {
diff --git a/apps/systemtags/l10n/de.js b/apps/systemtags/l10n/de.js
index 3271146d62b..3507015ed5f 100644
--- a/apps/systemtags/l10n/de.js
+++ b/apps/systemtags/l10n/de.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "No files in here" : "Keine Dateien vorhanden",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden",
     "Size" : "Größe",
-    "Modified" : "Geändert"
+    "Modified" : "Geändert",
+    "%s (not-assignable)" : "%s (nicht zuweisbar)"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/systemtags/l10n/de.json b/apps/systemtags/l10n/de.json
index 67a13fd0999..1f74b6075ea 100644
--- a/apps/systemtags/l10n/de.json
+++ b/apps/systemtags/l10n/de.json
@@ -34,6 +34,7 @@
     "No files in here" : "Keine Dateien vorhanden",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden",
     "Size" : "Größe",
-    "Modified" : "Geändert"
+    "Modified" : "Geändert",
+    "%s (not-assignable)" : "%s (nicht zuweisbar)"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/systemtags/l10n/de_DE.js b/apps/systemtags/l10n/de_DE.js
index 8c7e0c1d466..588f030d1db 100644
--- a/apps/systemtags/l10n/de_DE.js
+++ b/apps/systemtags/l10n/de_DE.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "No files in here" : "Keine Dateien vorhanden",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden",
     "Size" : "Größe",
-    "Modified" : "Geändert"
+    "Modified" : "Geändert",
+    "%s (not-assignable)" : "%s (nicht zuweisbar)"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/systemtags/l10n/de_DE.json b/apps/systemtags/l10n/de_DE.json
index 443868af44a..017d396db9d 100644
--- a/apps/systemtags/l10n/de_DE.json
+++ b/apps/systemtags/l10n/de_DE.json
@@ -34,6 +34,7 @@
     "No files in here" : "Keine Dateien vorhanden",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden",
     "Size" : "Größe",
-    "Modified" : "Geändert"
+    "Modified" : "Geändert",
+    "%s (not-assignable)" : "%s (nicht zuweisbar)"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/systemtags/l10n/id.js b/apps/systemtags/l10n/id.js
index bb6424c9556..f56866594d4 100644
--- a/apps/systemtags/l10n/id.js
+++ b/apps/systemtags/l10n/id.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "No files in here" : "Tidak ada berkas disini",
     "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
     "Size" : "Ukuran",
-    "Modified" : "Dimodifikasi"
+    "Modified" : "Dimodifikasi",
+    "%s (not-assignable)" : "%s (tidak dapat disematkan)"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/systemtags/l10n/id.json b/apps/systemtags/l10n/id.json
index fcbdb6ca1e2..59aeef7cf53 100644
--- a/apps/systemtags/l10n/id.json
+++ b/apps/systemtags/l10n/id.json
@@ -34,6 +34,7 @@
     "No files in here" : "Tidak ada berkas disini",
     "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
     "Size" : "Ukuran",
-    "Modified" : "Dimodifikasi"
+    "Modified" : "Dimodifikasi",
+    "%s (not-assignable)" : "%s (tidak dapat disematkan)"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/systemtags/l10n/is.js b/apps/systemtags/l10n/is.js
index c9a89c81f97..c0ce0d958bb 100644
--- a/apps/systemtags/l10n/is.js
+++ b/apps/systemtags/l10n/is.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "No files in here" : "Engar skrár hér",
     "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
     "Size" : "Stærð",
-    "Modified" : "Breytt"
+    "Modified" : "Breytt",
+    "%s (not-assignable)" : "%s (ekki-úthlutanlegt)"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/systemtags/l10n/is.json b/apps/systemtags/l10n/is.json
index 2b7c626f056..fe52360ce77 100644
--- a/apps/systemtags/l10n/is.json
+++ b/apps/systemtags/l10n/is.json
@@ -34,6 +34,7 @@
     "No files in here" : "Engar skrár hér",
     "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
     "Size" : "Stærð",
-    "Modified" : "Breytt"
+    "Modified" : "Breytt",
+    "%s (not-assignable)" : "%s (ekki-úthlutanlegt)"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/updatenotification/l10n/de.js b/apps/updatenotification/l10n/de.js
index 331993c2cb4..f8cc30818c1 100644
--- a/apps/updatenotification/l10n/de.js
+++ b/apps/updatenotification/l10n/de.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Notify members of the following groups about available updates:" : "Informiere die Mitglieder der folgenden Gruppen über verfügbare Updates:",
     "Only notification for app updates are available." : "Benachrichtigungen sind nur für Aktualisierungen von Apps verfügbar.",
     "The selected update channel makes dedicated notifications for the server obsolete." : "Der gewählte Aktualisierungskanal macht dedizierte Benachrichtigungen für Server Aktualisierungen obsolet.",
-    "The selected update channel does not support updates of the server." : "Der gewählte Aktualisierungskanal unterstützt keine Aktualisierungen für Server."
+    "The selected update channel does not support updates of the server." : "Der gewählte Aktualisierungskanal unterstützt keine Aktualisierungen für Server.",
+    "At the moment only manual updates are supported on your environment. This is very likely the case because functions such as shell_exec are not available." : "Aktuell werden lediglich manuelle Aktualisierungen in deiner Umgebung unterstützt. Dies ist wahrscheinlich der Fall, da Funktionen wie zum Beispiel shell_exec nicht verfügbar sind."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/updatenotification/l10n/de.json b/apps/updatenotification/l10n/de.json
index 18924aa14d6..009dea72662 100644
--- a/apps/updatenotification/l10n/de.json
+++ b/apps/updatenotification/l10n/de.json
@@ -14,6 +14,7 @@
     "Notify members of the following groups about available updates:" : "Informiere die Mitglieder der folgenden Gruppen über verfügbare Updates:",
     "Only notification for app updates are available." : "Benachrichtigungen sind nur für Aktualisierungen von Apps verfügbar.",
     "The selected update channel makes dedicated notifications for the server obsolete." : "Der gewählte Aktualisierungskanal macht dedizierte Benachrichtigungen für Server Aktualisierungen obsolet.",
-    "The selected update channel does not support updates of the server." : "Der gewählte Aktualisierungskanal unterstützt keine Aktualisierungen für Server."
+    "The selected update channel does not support updates of the server." : "Der gewählte Aktualisierungskanal unterstützt keine Aktualisierungen für Server.",
+    "At the moment only manual updates are supported on your environment. This is very likely the case because functions such as shell_exec are not available." : "Aktuell werden lediglich manuelle Aktualisierungen in deiner Umgebung unterstützt. Dies ist wahrscheinlich der Fall, da Funktionen wie zum Beispiel shell_exec nicht verfügbar sind."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/updatenotification/l10n/is.js b/apps/updatenotification/l10n/is.js
index 62560873d6a..f6801b6b11b 100644
--- a/apps/updatenotification/l10n/is.js
+++ b/apps/updatenotification/l10n/is.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Notify members of the following groups about available updates:" : "Tilkynna meðlimum eftirfarandi hópa um tiltækar uppfærslur:",
     "Only notification for app updates are available." : "Eingöngu eru eru tiltækar tilkynningar fyrir uppfærslur forrita.",
     "The selected update channel makes dedicated notifications for the server obsolete." : "Valda uppfærslurásin gerir úreltar sértækar tilkynningar fyrir vefþjóninn.",
-    "The selected update channel does not support updates of the server." : "Valda uppfærslurásin styður ekki uppfærslur fyrir vefþjóninn."
+    "The selected update channel does not support updates of the server." : "Valda uppfærslurásin styður ekki uppfærslur fyrir vefþjóninn.",
+    "At the moment only manual updates are supported on your environment. This is very likely the case because functions such as shell_exec are not available." : "Í augnablikinu er einungis stuðningur við handvirkar uppfærslur á kerfinu þínu. Það gerist mjög líklega vegna þess að aðgerðir á borð við shell_exec eru ekki tiltækar."
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/updatenotification/l10n/is.json b/apps/updatenotification/l10n/is.json
index c99e6837053..ec05e4f0a7f 100644
--- a/apps/updatenotification/l10n/is.json
+++ b/apps/updatenotification/l10n/is.json
@@ -14,6 +14,7 @@
     "Notify members of the following groups about available updates:" : "Tilkynna meðlimum eftirfarandi hópa um tiltækar uppfærslur:",
     "Only notification for app updates are available." : "Eingöngu eru eru tiltækar tilkynningar fyrir uppfærslur forrita.",
     "The selected update channel makes dedicated notifications for the server obsolete." : "Valda uppfærslurásin gerir úreltar sértækar tilkynningar fyrir vefþjóninn.",
-    "The selected update channel does not support updates of the server." : "Valda uppfærslurásin styður ekki uppfærslur fyrir vefþjóninn."
+    "The selected update channel does not support updates of the server." : "Valda uppfærslurásin styður ekki uppfærslur fyrir vefþjóninn.",
+    "At the moment only manual updates are supported on your environment. This is very likely the case because functions such as shell_exec are not available." : "Í augnablikinu er einungis stuðningur við handvirkar uppfærslur á kerfinu þínu. Það gerist mjög líklega vegna þess að aðgerðir á borð við shell_exec eru ekki tiltækar."
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index 16ec8660076..60131e2fa23 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -158,6 +158,7 @@ OC.L10N.register(
     "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta-)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
     "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen",
-    "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen"
+    "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen",
+    "Limit %s access to users meeting these criteria:" : "Zugriff auf %s auf Benutzer beschränken die folgende Kriterien erfüllen:"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index f573323ad44..d484a11d4aa 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -156,6 +156,7 @@
     "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta-)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
     "Clear Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung löschen",
-    "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen"
+    "Clear Groupname-LDAP Group Mapping" : "LDAP-Gruppennamenzuordnung löschen",
+    "Limit %s access to users meeting these criteria:" : "Zugriff auf %s auf Benutzer beschränken die folgende Kriterien erfüllen:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index 51092dd4849..b6362f70d84 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -158,6 +158,7 @@ OC.L10N.register(
     "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Benutzernamen dienen zum Speichern und Zuweisen von (Meta-)Daten. Um Benutzer eindeutig zu identifizieren und zu erkennen, besitzt jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung des jeweiligen Benutzernamens zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzers zugeordnet. Darüber hinaus wird der DN auch zwischengespeichert, um die Interaktion über LDAP zu reduzieren, was aber nicht zur Identifikation dient. Ändert sich der DN, werden die Änderungen gefunden. Der interne Benutzername wird durchgängig verwendet. Ein Löschen der Zuordnungen führt zum systemweiten Verbleib von Restdaten. Es bleibt nicht auf eine einzelne Konfiguration beschränkt, sondern wirkt sich auf alle LDAP-Konfigurationen aus! Löschen Sie die Zuordnungen nie innerhalb einer Produktivumgebung, sondern nur in einer Test- oder Experimentierumgebung.",
     "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
-    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
+    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung",
+    "Limit %s access to users meeting these criteria:" : "Zugriff auf %s auf Benutzer beschränken die folgende Kriterien erfüllen:"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index 2c540b2060f..a98f6aebed9 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -156,6 +156,7 @@
     "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
     "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Benutzernamen dienen zum Speichern und Zuweisen von (Meta-)Daten. Um Benutzer eindeutig zu identifizieren und zu erkennen, besitzt jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung des jeweiligen Benutzernamens zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzers zugeordnet. Darüber hinaus wird der DN auch zwischengespeichert, um die Interaktion über LDAP zu reduzieren, was aber nicht zur Identifikation dient. Ändert sich der DN, werden die Änderungen gefunden. Der interne Benutzername wird durchgängig verwendet. Ein Löschen der Zuordnungen führt zum systemweiten Verbleib von Restdaten. Es bleibt nicht auf eine einzelne Konfiguration beschränkt, sondern wirkt sich auf alle LDAP-Konfigurationen aus! Löschen Sie die Zuordnungen nie innerhalb einer Produktivumgebung, sondern nur in einer Test- oder Experimentierumgebung.",
     "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
-    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
+    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung",
+    "Limit %s access to users meeting these criteria:" : "Zugriff auf %s auf Benutzer beschränken die folgende Kriterien erfüllen:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/build/license.php b/build/license.php
index 11675f21a07..5ada91a0f33 100644
--- a/build/license.php
+++ b/build/license.php
@@ -99,7 +99,7 @@ EOD;
 
 		$excludes = array_map(function($item) use ($folder) {
 			return $folder . '/' . $item;
-		}, ['vendor', '3rdparty', '.git', 'l10n', 'templates']);
+		}, ['vendor', '3rdparty', '.git', 'l10n', 'templates', 'composer']);
 
 		$iterator = new RecursiveDirectoryIterator($folder, RecursiveDirectoryIterator::SKIP_DOTS);
 		$iterator = new RecursiveCallbackFilterIterator($iterator, function($item) use ($folder, $excludes){
@@ -154,7 +154,12 @@ With help from many libraries and frameworks including:
 		} else {
 			$license = str_replace('@AUTHORS@', $authors, $this->licenseText);
 		}
-		$license = str_replace('@COPYRIGHT@', $copyrightNotices, $license);
+
+		if ($copyrightNotices === '') {
+			$license = str_replace('@COPYRIGHT@', ' *', $license);
+		} else {
+			$license = str_replace('@COPYRIGHT@', $copyrightNotices, $license);
+		}
 
 		$source = $this->eatOldLicense($source);
 		$source = "<?php" . PHP_EOL . $license . PHP_EOL . $source;
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index ffbcea0fedd..dbc1f3157fd 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -172,8 +172,25 @@ class LoginController extends Controller {
 	}
 
 	/**
+	 * @param string $redirectUrl
+	 * @return RedirectResponse
+	 */
+	private function generateRedirect($redirectUrl) {
+		if (!is_null($redirectUrl) && $this->userSession->isLoggedIn()) {
+			$location = $this->urlGenerator->getAbsoluteURL(urldecode($redirectUrl));
+			// Deny the redirect if the URL contains a @
+			// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
+			if (strpos($location, '@') === false) {
+				return new RedirectResponse($location);
+			}
+		}
+		return new RedirectResponse(OC_Util::getDefaultPageUrl());
+	}
+
+	/**
 	 * @PublicPage
 	 * @UseSession
+	 * @NoCSRFRequired
 	 *
 	 * @param string $user
 	 * @param string $password
@@ -184,6 +201,13 @@ class LoginController extends Controller {
 		$currentDelay = $this->throttler->getDelay($this->request->getRemoteAddress());
 		$this->throttler->sleepDelay($this->request->getRemoteAddress());
 
+		// If the user is already logged in and the CSRF check does not pass then
+		// simply redirect the user to the correct page as required. This is the
+		// case when an user has already logged-in, in another tab.
+		if(!$this->request->passesCSRFCheck()) {
+			return $this->generateRedirect($redirect_url);
+		}
+
 		$originalUser = $user;
 		// TODO: Add all the insane error handling
 		/* @var $loginResult IUser */
@@ -223,15 +247,7 @@ class LoginController extends Controller {
 			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
 		}
 
-		if (!is_null($redirect_url) && $this->userSession->isLoggedIn()) {
-			$location = $this->urlGenerator->getAbsoluteURL(urldecode($redirect_url));
-			// Deny the redirect if the URL contains a @
-			// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
-			if (strpos($location, '@') === false) {
-				return new RedirectResponse($location);
-			}
-		}
-		return new RedirectResponse(OC_Util::getDefaultPageUrl());
+		return $this->generateRedirect($redirect_url);
 	}
 
 }
diff --git a/core/Middleware/TwoFactorMiddleware.php b/core/Middleware/TwoFactorMiddleware.php
index c87058d11fa..9b930edd57d 100644
--- a/core/Middleware/TwoFactorMiddleware.php
+++ b/core/Middleware/TwoFactorMiddleware.php
@@ -129,6 +129,8 @@ class TwoFactorMiddleware extends Middleware {
 		if ($exception instanceof UserAlreadyLoggedInException) {
 			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index'));
 		}
+
+		throw $exception;
 	}
 
 }
diff --git a/core/img/facebook.svg b/core/img/facebook.svg
new file mode 100644
index 00000000000..4de4ccf3002
--- /dev/null
+++ b/core/img/facebook.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="512px" viewBox="0 0 512 512" width="512px" version="1.1" enable-background="new 0 0 512 512"><g clip-rule="evenodd" fill-rule="evenodd"><path d="m256.23 512c140.58 0 255.77-115.19 255.77-255.77 0-141.05-115.19-256.23-255.77-256.23-141.05 0-256.23 115.18-256.23 256.23 0 140.58 115.18 255.77 256.23 255.77z" fill="#3A5BA2"/><path d="m224.02 160.08c0-35.372 28.575-63.946 63.938-63.946h48.072v63.946h-32.199c-8.608 0-15.873 7.257-15.873 15.873v32.192h48.072v63.938h-48.072v144.22h-63.938v-144.22h-48.065v-63.93h48.065v-48.07z" fill="#fff"/></g></svg>
diff --git a/core/img/googleplus.svg b/core/img/googleplus.svg
new file mode 100644
index 00000000000..8a443e4b6da
--- /dev/null
+++ b/core/img/googleplus.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="128px" viewBox="0 0 128 128" width="128px" version="1.1" enable-background="new 0 0 128 128"><circle cy="64" cx="64" r="64" fill="#D95032"/><path d="m49.424 97.875c-19.018 0-34.491-15.193-34.491-33.874 0-18.68 15.473-33.875 34.491-33.875 8.318 0 16.354 2.952 22.624 8.309l-8.771 9.899c-3.838-3.279-8.758-5.086-13.853-5.086-11.652 0-21.13 9.31-21.13 20.752 0 11.441 9.479 20.75 21.13 20.75 9.858 0 16.311-4.723 18.407-13.197h-18.244v-13.121h32.347v6.562c0 19.665-13.065 32.881-32.51 32.881z" fill="#fff"/><polygon points="117.93 58.438 107.93 58.438 107.93 48.438 99.934 48.438 99.934 58.438 89.934 58.438 89.934 66.438 99.934 66.438 99.934 76.438 107.93 76.438 107.93 66.438 117.93 66.438" fill="#fff"/></svg>
diff --git a/core/img/mail.svg b/core/img/mail.svg
new file mode 100644
index 00000000000..21991dbf3ab
--- /dev/null
+++ b/core/img/mail.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="150.24mm" width="150.24mm" version="1.1" viewBox="0 0 532.35042 532.35042">
+ <g transform="translate(-101.02 -213.94)">
+  <rect fill-rule="evenodd" ry="266.18" height="532.35" width="532.35" y="213.94" x="101.02" fill="#5cb85c"/>
+  <g fill="#fff">
+   <path style="" d="m530.17 434.64c-5.4569 6.0026-11.641 11.278-18.19 15.825-30.377 20.554-60.936 41.291-90.585 62.755-15.279 11.278-34.197 25.102-54.023 25.102h-0.1819-0.1819c-19.827 0-38.744-13.824-54.023-25.102-29.649-21.646-60.208-42.2-90.403-62.755-6.7302-4.5474-12.915-9.8224-18.372-15.825v144.43c0 16.007 13.097 29.104 29.104 29.104h267.75c16.007 0 29.104-13.097 29.104-29.104v-144.43zm0-53.478c0-16.007-13.278-29.104-29.104-29.104h-267.75c-19.463 0-29.104 15.279-29.104 33.105 0 16.553 18.372 37.107 31.286 45.838 28.194 19.645 56.752 39.29 84.946 59.117 11.823 8.1854 31.832 24.92 46.566 24.92h0.1819 0.1819c14.734 0 34.742-16.735 46.566-24.92 28.194-19.827 56.752-39.472 85.128-59.117 16.007-11.096 31.104-29.467 31.104-49.84z"/>
+  </g>
+ </g>
+</svg>
diff --git a/core/img/rss.svg b/core/img/rss.svg
new file mode 100644
index 00000000000..8126a97acd2
--- /dev/null
+++ b/core/img/rss.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" enable-background="new 0 0 32 32" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32"><path d="m16 0c-8.837 0-16 7.163-16 16 0 8.836 7.163 16 16 16s16-7.164 16-16c0-8.837-7.163-16-16-16z" fill="#F8991D"/><path d="m21.705 22.647h2.942c0-8.434-6.861-15.3-15.294-15.3v2.934c6.81 0 12.352 5.548 12.352 12.366zm-10.315 0.005c1.128 0 2.039-0.906 2.039-2.029 0-1.117-0.911-2.033-2.039-2.033-1.123 0-2.036 0.916-2.036 2.033-0.001 1.123 0.912 2.029 2.036 2.029zm5.116-0.004h2.945c0-5.57-4.531-10.101-10.099-10.101v2.933c1.91 0 3.705 0.746 5.057 2.1 1.352 1.349 2.097 3.152 2.097 5.068z" fill="#fff"/><defs><path id="a" d="m50.696-47.198c-8.837 0-16 7.163-16 16 0 8.836 7.163 16 16 16s16-7.164 16-16c0-8.836-7.163-16-16-16z"/></defs><clipPath><use overflow="visible" xlink:href="#a"/></clipPath></svg>
diff --git a/core/img/twitter.svg b/core/img/twitter.svg
new file mode 100644
index 00000000000..8d96565ca27
--- /dev/null
+++ b/core/img/twitter.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="512px" viewBox="0 0 512 512" width="512px" version="1.1" enable-background="new 0 0 512 512"><g clip-rule="evenodd" fill-rule="evenodd"><path d="m256.23 512c140.58 0 255.77-115.19 255.77-255.77 0-141.05-115.19-256.23-255.77-256.23-141.05 0-256.23 115.18-256.23 256.23 0 140.58 115.18 255.77 256.23 255.77z" fill="#1EBEF0"/><path d="m276.64 137.41c-9.077 6.351-15.873 15.42-20.865 25.396l-2.265 5.898c-1.359 4.077-2.273 8.163-2.726 12.241-0.453 2.265-0.453 4.085-0.906 5.898v3.625l0.453 5.898 0.906 7.71h-4.985c-22.224-0.453-43.987-5.445-63.04-14.061l-11.334-5.437c-2.265-0.914-4.078-2.273-6.351-3.632-12.694-7.257-24.028-16.78-34.012-27.208-6.343-6.804-12.241-14.061-17.232-21.771-5.438 10.437-8.616 22.677-8.616 35.379 0 4.531 0.453 9.069 1.359 13.6 0 2.265 0.453 4.085 0.914 5.898 4.078 13.6 11.334 25.849 21.31 34.918l4.992 4.539-6.351-1.367c-8.163-2.266-16.326-4.984-24.036-8.164 0.906 16.327 7.257 31.293 17.232 43.089 9.522 11.327 22.224 19.951 36.73 24.028l-16.779 0.906-14.054-0.453c10.429 25.403 34.465 43.995 63.033 46.261-26.302 19.498-58.955 30.388-93.873 30.388 25.849 15.873 55.33 25.841 87.521 27.653h20.865c99.31-5.438 177.77-87.522 177.77-188.2v-9.522c3.625-3.171 7.25-6.343 10.89-9.975 8.608-7.71 16.326-16.78 22.67-26.302-10.437 6.804-22.67 10.429-36.277 10.429h-0.906 0.453c12.232-8.163 21.763-20.404 26.747-34.465-9.515 4.992-20.404 8.616-31.294 11.796l-1.359 0.453-8.155 1.812c-11.795-12.702-28.575-20.865-47.167-20.865h-1.358c-4.984 0-9.983 0.453-14.968 1.367-7.249 1.812-14.514 4.984-20.404 8.616l-4.54 3.58z" fill="#fff"/></g></svg>
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 35aa6c7cb20..a0dc6f7002b 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -323,6 +323,18 @@ OC.L10N.register(
     "Please use the command line updater because you have a big instance." : "Da Du eine grosse Instanz nutzt, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Für weitere Hilfen, schaue bitte in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.",
-    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist."
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn du alle Funktionen nutzen möchtest.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Update läuft gerade. Das Verlassen dieser Seite könnte den Update Prozess in einigen Umgebungen unterbrechen.",
+    "Updating to {version}" : "Aktualisierung auf {version}",
+    "The update was successful. There were warnings." : "Das Update war erfolgreich. Warnungen wurden ausgegeben.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Dein Web-Server ist nicht richtig eingerichtet um die folgende URL richtig aufzulösen \"{url}\". Weitere Informationen findest du in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Einige Dateien haben die Integritätsprüfung nicht bestanden. Weiterführende Information zum Lösen des Problems findest du in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien ...</a> / <a href=\"{rescanEndpoint}\">Erneut analysieren…</a>)",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der \"Strict-Transport-Security\" HTTP-Header ist nicht auf mindestens \"{seconds}\" Sekunden eingestellt. Um die Sicherheit zu erhöhen, empfehlen wir das Aktivieren von HSTS, wie es in den <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
+    "not assignable" : "nicht zuweisbar",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}, dies kann eine Weile dauern.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren deines Servers kannst du der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
+    "An internal error occured." : "Es ist ein interner Fehler aufgetreten."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de.json b/core/l10n/de.json
index d50dac88d09..11d7e0fb9e7 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -321,6 +321,18 @@
     "Please use the command line updater because you have a big instance." : "Da Du eine grosse Instanz nutzt, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Für weitere Hilfen, schaue bitte in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.",
-    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist."
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn du alle Funktionen nutzen möchtest.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Das Update läuft gerade. Das Verlassen dieser Seite könnte den Update Prozess in einigen Umgebungen unterbrechen.",
+    "Updating to {version}" : "Aktualisierung auf {version}",
+    "The update was successful. There were warnings." : "Das Update war erfolgreich. Warnungen wurden ausgegeben.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Dein Web-Server ist nicht richtig eingerichtet um die folgende URL richtig aufzulösen \"{url}\". Weitere Informationen findest du in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Einige Dateien haben die Integritätsprüfung nicht bestanden. Weiterführende Information zum Lösen des Problems findest du in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien ...</a> / <a href=\"{rescanEndpoint}\">Erneut analysieren…</a>)",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der \"Strict-Transport-Security\" HTTP-Header ist nicht auf mindestens \"{seconds}\" Sekunden eingestellt. Um die Sicherheit zu erhöhen, empfehlen wir das Aktivieren von HSTS, wie es in den <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
+    "not assignable" : "nicht zuweisbar",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}, dies kann eine Weile dauern.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren deines Servers kannst du der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
+    "An internal error occured." : "Es ist ein interner Fehler aufgetreten."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index e69e4ea8046..c5ce24b7caf 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -323,6 +323,20 @@ OC.L10N.register(
     "Please use the command line updater because you have a big instance." : "Da Sie eine große Instanz von Nextcloud besitzen, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Für weitere Hilfen, schauen Sie bitte in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.",
-    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist."
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt, wenn Sie diese Seite verlassen, kann dies den Aktualisierungsprozess in manchen Umgebungen unterbrechen.",
+    "Updating to {version}" : "Aktualisiere auf {version}",
+    "The update was successful. There were warnings." : "Das Update war erfolgreich. Es wurden Warnungen ausgegeben.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ihr Webserver ist nicht richtig konfiguriert um \"{url}\" aufzulösen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" href=\"[docLink}\">Dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfigurieren Sie zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\"  href=\"{docLink}\">Dokumentation</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sie verwenden im Moment PHP {version}. Wir empfehlen ein Upgrade ihrer PHP Version, um die <a target=\"_blank\"  href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald ihre Distribution diese unterstützt.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für mehr Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\" >Sicherheitshinweisen</a> erläutert ist.",
+    "An error occured. Please try again" : "Fehler aufgetreten. Bitte erneut versuchen",
+    "not assignable" : "nicht zuweisbar",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}, dies kann etwas dauern.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
+    "An internal error occured." : "Es ist ein interner Fehler aufgetreten."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 793659d6e07..6ed4bb678a3 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -321,6 +321,20 @@
     "Please use the command line updater because you have a big instance." : "Da Sie eine große Instanz von Nextcloud besitzen, wird die Benutzung des Aktualisierungsprogrammes über die Kommandozeile empfohlen.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Für weitere Hilfen, schauen Sie bitte in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Diese %s-Instanz befindet sich gerade im Wartungsmodus, was eine Weile dauern kann.",
-    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist."
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisiert sich automatisch, wenn die %s-Instanz wieder verfügbar ist.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Die Aktualisierung wird durchgeführt, wenn Sie diese Seite verlassen, kann dies den Aktualisierungsprozess in manchen Umgebungen unterbrechen.",
+    "Updating to {version}" : "Aktualisiere auf {version}",
+    "The update was successful. There were warnings." : "Das Update war erfolgreich. Es wurden Warnungen ausgegeben.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ihr Webserver ist nicht richtig konfiguriert um \"{url}\" aufzulösen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" href=\"[docLink}\">Dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfigurieren Sie zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\"  href=\"{docLink}\">Dokumentation</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sie verwenden im Moment PHP {version}. Wir empfehlen ein Upgrade ihrer PHP Version, um die <a target=\"_blank\"  href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald ihre Distribution diese unterstützt.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für mehr Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\" >Sicherheitshinweisen</a> erläutert ist.",
+    "An error occured. Please try again" : "Fehler aufgetreten. Bitte erneut versuchen",
+    "not assignable" : "nicht zuweisbar",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}, dies kann etwas dauern.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
+    "An internal error occured." : "Es ist ein interner Fehler aufgetreten."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 9de205fe01f..00704902469 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -151,6 +151,7 @@ OC.L10N.register(
     "Password protect" : "Suojaa salasanalla",
     "Password" : "Salasana",
     "Allow editing" : "Salli muokkaus",
+    "Hide file listing" : "Piilota tiedostolistaus",
     "Email link to person" : "Lähetä linkki sähköpostitse",
     "Send" : "Lähetä",
     "Sending ..." : "Lähetetään...",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index c53c4973621..ff5d234d418 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -149,6 +149,7 @@
     "Password protect" : "Suojaa salasanalla",
     "Password" : "Salasana",
     "Allow editing" : "Salli muokkaus",
+    "Hide file listing" : "Piilota tiedostolistaus",
     "Email link to person" : "Lähetä linkki sähköpostitse",
     "Send" : "Lähetä",
     "Sending ..." : "Lähetetään...",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index 782a958cc7f..cdba9c43ccb 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -219,10 +219,13 @@ OC.L10N.register(
     "Hello {name}" : "Halo {name}",
     "new" : "baru",
     "_download %n file_::_download %n files_" : ["unduh %n berkas"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Pembaruan sedang dalam proses, meninggalkan halaman ini mungkin dapat mengganggu proses di beberapa lingkungan.",
+    "Update to {version}" : "Perbarui ke {version}",
     "An error occurred." : "Terjadi kesalahan.",
     "Please reload the page." : "Silakan muat ulang halaman.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Pembaruan gagal. Untuk informasi berikutnya <a href=\"{url}\">cek posting di forum</a> yang mencakup masalah kami.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Pembaruan gagal. Laporkan masalah ini ke <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">komunitas Nextcloud</a>.",
+    "Continue to Nextcloud" : "Lanjutkan ke Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Pembaruan berhasil. Mengarahkan Anda ke Nextcloud.",
     "Searching other places" : "Mencari tempat lainnya",
     "No search results in other folders" : "Tidak ada hasil penelusuran didalam folder yang lain",
@@ -320,6 +323,23 @@ OC.L10N.register(
     "Please use the command line updater because you have a big instance." : "Gunakan pembaruan command-line karena Anda mempunyai instansi yang besar.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Untuk bantuan, lihat <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentasi</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Instansi %s ini sedang dalam modus pemeliharaan, mungkin memerlukan beberapa saat.",
-    "This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
+    "This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Server ini tidak tersambung ke internet. Ini berarti beberapa fitur seperti me-mount penyimpanan eksternal, notifikasi pembaruan atau instalasi aplikasi pihak ketiga tidak akan bekerja. Mengakses berkas secara remote dan mengirim notifikasi email juga tidak bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda ingin memiliki fitur ini.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Pembaruan sedang dalam proses, meninggalkan halaman ini mungkin dapat mengganggu proses di beberapa lingkungan.",
+    "Updating to {version}" : "Memperbarui ke {version}",
+    "The update was successful. There were warnings." : "Pembaruan telah berhasil. Terdapat peringatan.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Server web Anda tidak diatur secara baik untuk menyelesaikan \"{url}\". Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Tidak ada memory cache telah dikonfigurasi. Untuk meningkatkan kinerja, mohon mengkonfigurasi memcache jika tersedia. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak bisa dibaca oleh PHP dan sangat tidak disarankan untuk alasan keamanan. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Anda sekarang menjalankan PHP {version}. Kami menyarankan Anda untuk perbarui versi PHP Anda untuk memanfaatkan <a target=\"_blank\" href=\"{phpLink}\">performa dan pembaruan keamanan yang disediakan oleh PHP Group</a> saat distribusi Anda mendukungnya.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfigurasi proxy header terbalik salah, atau Anda mengakses Nextcloud dari proxy terpercaya. Apabila Anda tidak mengakses Nextcloud dari proxy terpercaya, ini adalah masalah keamanan dan penyerang dapat memalsukan alamat IP mereka ke Nextcloud. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached terkonfigurasi sebagai cache terdistribusi, tetapi modul PHP \"memcache\" yang salah terpasang. \\OC\\Memcache\\Memcached hanya mendukung \"memcached\" dan bukan \"memcache\". Lihat <a target=\"_blank\" href=\"{wikiLink}\">wiki memcached tentang kedua modul</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Beberapa berkas tidak lulus cek integritas. Informasi lebih lanjut tentang cara mengatasi masalah ini dapat ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami. (<a href=\"{codeIntegrityDownloadEndpoint}\">Daftar berkas yang tidak valid…</a> / <a href=\"{rescanEndpoint}\">Pindai ulang…</a>)",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Header \"Strict-Transport-Security\" HTTP tidak terkonfigurasi ke setidaknya \"{seconds}\" detik. Untuk meningkatkan kemanan kami merekomendasikan mengaktifkan HSTS seperti yang dijelaskan di <a href=\"{docUrl}\">saran keamanan</a> kami.",
+    "An error occured. Please try again" : "Terjadi kesalahan. Silakan coba lagi",
+    "not assignable" : "tidak dapat disematkan",
+    "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini dapat memakan waktu.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi bagaimana menkonfigurasi server Anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
+    "An internal error occured." : "Terjadi kesalahan internal."
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 093ea64c99c..9ff11883de9 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -217,10 +217,13 @@
     "Hello {name}" : "Halo {name}",
     "new" : "baru",
     "_download %n file_::_download %n files_" : ["unduh %n berkas"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Pembaruan sedang dalam proses, meninggalkan halaman ini mungkin dapat mengganggu proses di beberapa lingkungan.",
+    "Update to {version}" : "Perbarui ke {version}",
     "An error occurred." : "Terjadi kesalahan.",
     "Please reload the page." : "Silakan muat ulang halaman.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Pembaruan gagal. Untuk informasi berikutnya <a href=\"{url}\">cek posting di forum</a> yang mencakup masalah kami.",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Pembaruan gagal. Laporkan masalah ini ke <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">komunitas Nextcloud</a>.",
+    "Continue to Nextcloud" : "Lanjutkan ke Nextcloud",
     "The update was successful. Redirecting you to Nextcloud now." : "Pembaruan berhasil. Mengarahkan Anda ke Nextcloud.",
     "Searching other places" : "Mencari tempat lainnya",
     "No search results in other folders" : "Tidak ada hasil penelusuran didalam folder yang lain",
@@ -318,6 +321,23 @@
     "Please use the command line updater because you have a big instance." : "Gunakan pembaruan command-line karena Anda mempunyai instansi yang besar.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Untuk bantuan, lihat <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentasi</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Instansi %s ini sedang dalam modus pemeliharaan, mungkin memerlukan beberapa saat.",
-    "This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
+    "This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Server ini tidak tersambung ke internet. Ini berarti beberapa fitur seperti me-mount penyimpanan eksternal, notifikasi pembaruan atau instalasi aplikasi pihak ketiga tidak akan bekerja. Mengakses berkas secara remote dan mengirim notifikasi email juga tidak bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda ingin memiliki fitur ini.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Pembaruan sedang dalam proses, meninggalkan halaman ini mungkin dapat mengganggu proses di beberapa lingkungan.",
+    "Updating to {version}" : "Memperbarui ke {version}",
+    "The update was successful. There were warnings." : "Pembaruan telah berhasil. Terdapat peringatan.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Server web Anda tidak diatur secara baik untuk menyelesaikan \"{url}\". Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Tidak ada memory cache telah dikonfigurasi. Untuk meningkatkan kinerja, mohon mengkonfigurasi memcache jika tersedia. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak bisa dibaca oleh PHP dan sangat tidak disarankan untuk alasan keamanan. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Anda sekarang menjalankan PHP {version}. Kami menyarankan Anda untuk perbarui versi PHP Anda untuk memanfaatkan <a target=\"_blank\" href=\"{phpLink}\">performa dan pembaruan keamanan yang disediakan oleh PHP Group</a> saat distribusi Anda mendukungnya.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfigurasi proxy header terbalik salah, atau Anda mengakses Nextcloud dari proxy terpercaya. Apabila Anda tidak mengakses Nextcloud dari proxy terpercaya, ini adalah masalah keamanan dan penyerang dapat memalsukan alamat IP mereka ke Nextcloud. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached terkonfigurasi sebagai cache terdistribusi, tetapi modul PHP \"memcache\" yang salah terpasang. \\OC\\Memcache\\Memcached hanya mendukung \"memcached\" dan bukan \"memcache\". Lihat <a target=\"_blank\" href=\"{wikiLink}\">wiki memcached tentang kedua modul</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Beberapa berkas tidak lulus cek integritas. Informasi lebih lanjut tentang cara mengatasi masalah ini dapat ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami. (<a href=\"{codeIntegrityDownloadEndpoint}\">Daftar berkas yang tidak valid…</a> / <a href=\"{rescanEndpoint}\">Pindai ulang…</a>)",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Header \"Strict-Transport-Security\" HTTP tidak terkonfigurasi ke setidaknya \"{seconds}\" detik. Untuk meningkatkan kemanan kami merekomendasikan mengaktifkan HSTS seperti yang dijelaskan di <a href=\"{docUrl}\">saran keamanan</a> kami.",
+    "An error occured. Please try again" : "Terjadi kesalahan. Silakan coba lagi",
+    "not assignable" : "tidak dapat disematkan",
+    "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini dapat memakan waktu.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi bagaimana menkonfigurasi server Anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
+    "An internal error occured." : "Terjadi kesalahan internal."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/is.js b/core/l10n/is.js
index d1fc61a3ce5..c503a2a3eb7 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -30,6 +30,7 @@ OC.L10N.register(
     "[%d / %d]: %s" : "[%d / %d]: %s",
     "Repair warning: " : "Viðvörun vegna viðgerðar: ",
     "Repair error: " : "Villa í viðgerð:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Endilega notaðu uppfærslutólið af skipanalínu, því sjálfvirkar uppfærslur eru gerðar óvirkar í config.php.",
     "[%d / %d]: Checking table %s" : "[%d / %d]: Athuga töflu %s",
     "Turned on maintenance mode" : "Kveikt á viðhaldsham",
     "Turned off maintenance mode" : "Slökkt á viðhaldsham",
@@ -301,7 +302,10 @@ OC.L10N.register(
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Hafðu samband við kerfisstjóra ef þessi skilaboð eru viðvarandi eða birtust óvænt.",
     "Thank you for your patience." : "Þakka þér fyrir biðlundina.",
     "Two-step verification" : "Tveggja þrepa sannvottun",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Aukið öryggi var virkjað fyrir aðganginn þinn. Auðkenndu þig með aukaþrepi.",
     "Cancel login" : "Hætta við innskráningu",
+    "Please authenticate using the selected factor." : "Auðkenndu þig með völdu þrepi.",
+    "An error occured while verifying the token" : "Villa kom upp við að sannreyna teiknið",
     "You are accessing the server from an untrusted domain." : "Þú ert að tengjast þjóninum frá ótreystu léni.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Hafðu samband við kerfisstjóra. Ef þú ert stjórnandi á þessu tilviki, stilltu \"trusted_domains\" setninguna í config/config.php. Dæmi um stillingar má sjá í config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Það fer eftir stillingum þínum, sem stjórnandi þá gætir þú einnig notað hnappinn hér fyrir neðan til að treysta þessu léni.",
@@ -316,8 +320,26 @@ OC.L10N.register(
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Til að forðast að falla á tímamörkum með stærri uppsetningar, getur þú í staðinn keyrt eftirfarandi skipun úr uppsetningarmöppunni:",
     "Detailed logs" : "Ítarlegir annálar",
     "Update needed" : "Þarfnast uppfærslu",
+    "Please use the command line updater because you have a big instance." : "Endilega notaðu uppfærslutólið af skipanalínu, því þú ert með mjög stóra uppsetningu.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Til að fá hjálp er best að skoða fyrst  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">hjálparskjölin</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Þessi %s er nú í viðhaldsham, sem getur tekið smá stund.",
-    "This page will refresh itself when the %s instance is available again." : "Þessi síða mun uppfæra sig þegar %s er í boði á ný."
+    "This page will refresh itself when the %s instance is available again." : "Þessi síða mun uppfæra sig þegar %s er í boði á ný.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Þessi þjónn er ekki með virka nettengingu. Þetta þýðir að sumir eiginleikar eins og að virkja ytri gagnageymslu, tilkynningar um uppfærslur eða uppsetningu á forritum þriðja aðila, mun ekki virka. Fjartengdur aðgangur að skrám og sending tilkynninga í tölvupósti virka líklega ekki heldur. Við leggjum til að internettenging sé virkjuð fyrir þennan vefþjón ef þú vilt hafa alla eiginleika tiltæka.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.",
+    "Updating to {version}" : "Uppfæri í {version}",
+    "The update was successful. There were warnings." : "Uppfærslan tókst. Það voru viðvaranir.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Vefþjónninn þinn er ekki uppsettur þannig að hann geti leyst \"{url}\". Frekari upplýsingar er að finna í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ekkert skyndiminni (cache) hefur verið stillt. Til að auka afköst ættirðu að setja upp skyndiminni (með memcache) ef það er tiltækt. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom er ekki lesanlegt af PHP sem er mjög óráðlegt af öryggisástæðum. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Þú ert að keyra PHP {version}. Við hvetjum þig til að uppfæra PHP útgáfuna til að njóta <a target=\"_blank\" href=\"{phpLink}\">afkastaaukningar og öryggisuppfærslna frá PHP Group</a> um leið og dreifingin þín styður það.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Uppsetning gagnstæðs milliþjónshauss (reverse proxy header) er röng, eða að þú ert að tengjast Nextcloud frá treystum milliþjóni Ef þú ert ekki að tengjast Nextcloud frá treystum milliþjóni, þá er þetta er öryggisvandamál og getur leyft árásaraðilum að dulbúa IP-vistfang þeirra sem sýnilegt Nextcloud. Nánari upplýsingar má finna í <a target=\"_blank\"  href=\"{docLink}\">hjálparskjölum</a> okkar.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er sett upp sem dreift skyndiminni, en hinsvegar er ranga PHP-einingin \"memcache\" uppsett. \\OC\\Memcache\\Memcached styður einungis \"memcached\" en ekki \"memcache\". Skoðaðu <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki-síðurnar um báðar einingarnar</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sumar skrár hafa ekki staðist áreiðanleikaprófun. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listi yfir ógildar skrár…</a> / <a href=\"{rescanEndpoint}\">Endurskanna…</a>)",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP-hausinn er ekki stilltur á að minnsa kosti \"{seconds}\" sekúndur. Fyrir aukið öryggi mælum við með því að virkja HSTS eins og lýst er í <a href=\"{docUrl}\">öryggisleiðbeiningum</a>.",
+    "An error occured. Please try again" : "Villa kom upp. Endilega reyndu aftur",
+    "not assignable" : "ekki úthlutanlegt",
+    "Updating {productName} to version {version}, this may take a while." : "Uppfæri {productName} í útgáfu {version}, þetta getur tekið smá stund.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Til að fá upplýsingar hvernig á að stilla miðlara almennilega, skaltu skoða <a href=\"%s\" target=\"_blank\">hjálparskjölin</a>.",
+    "An internal error occured." : "Innri villa kom upp."
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/core/l10n/is.json b/core/l10n/is.json
index 5236bb0faa5..287bc14d17b 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -28,6 +28,7 @@
     "[%d / %d]: %s" : "[%d / %d]: %s",
     "Repair warning: " : "Viðvörun vegna viðgerðar: ",
     "Repair error: " : "Villa í viðgerð:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Endilega notaðu uppfærslutólið af skipanalínu, því sjálfvirkar uppfærslur eru gerðar óvirkar í config.php.",
     "[%d / %d]: Checking table %s" : "[%d / %d]: Athuga töflu %s",
     "Turned on maintenance mode" : "Kveikt á viðhaldsham",
     "Turned off maintenance mode" : "Slökkt á viðhaldsham",
@@ -299,7 +300,10 @@
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Hafðu samband við kerfisstjóra ef þessi skilaboð eru viðvarandi eða birtust óvænt.",
     "Thank you for your patience." : "Þakka þér fyrir biðlundina.",
     "Two-step verification" : "Tveggja þrepa sannvottun",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Aukið öryggi var virkjað fyrir aðganginn þinn. Auðkenndu þig með aukaþrepi.",
     "Cancel login" : "Hætta við innskráningu",
+    "Please authenticate using the selected factor." : "Auðkenndu þig með völdu þrepi.",
+    "An error occured while verifying the token" : "Villa kom upp við að sannreyna teiknið",
     "You are accessing the server from an untrusted domain." : "Þú ert að tengjast þjóninum frá ótreystu léni.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Hafðu samband við kerfisstjóra. Ef þú ert stjórnandi á þessu tilviki, stilltu \"trusted_domains\" setninguna í config/config.php. Dæmi um stillingar má sjá í config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Það fer eftir stillingum þínum, sem stjórnandi þá gætir þú einnig notað hnappinn hér fyrir neðan til að treysta þessu léni.",
@@ -314,8 +318,26 @@
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Til að forðast að falla á tímamörkum með stærri uppsetningar, getur þú í staðinn keyrt eftirfarandi skipun úr uppsetningarmöppunni:",
     "Detailed logs" : "Ítarlegir annálar",
     "Update needed" : "Þarfnast uppfærslu",
+    "Please use the command line updater because you have a big instance." : "Endilega notaðu uppfærslutólið af skipanalínu, því þú ert með mjög stóra uppsetningu.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Til að fá hjálp er best að skoða fyrst  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">hjálparskjölin</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Þessi %s er nú í viðhaldsham, sem getur tekið smá stund.",
-    "This page will refresh itself when the %s instance is available again." : "Þessi síða mun uppfæra sig þegar %s er í boði á ný."
+    "This page will refresh itself when the %s instance is available again." : "Þessi síða mun uppfæra sig þegar %s er í boði á ný.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Þessi þjónn er ekki með virka nettengingu. Þetta þýðir að sumir eiginleikar eins og að virkja ytri gagnageymslu, tilkynningar um uppfærslur eða uppsetningu á forritum þriðja aðila, mun ekki virka. Fjartengdur aðgangur að skrám og sending tilkynninga í tölvupósti virka líklega ekki heldur. Við leggjum til að internettenging sé virkjuð fyrir þennan vefþjón ef þú vilt hafa alla eiginleika tiltæka.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Uppfærslan er í gangi, ef farið er af þessari síðu gæti það truflað ferlið á sumum kerfum.",
+    "Updating to {version}" : "Uppfæri í {version}",
+    "The update was successful. There were warnings." : "Uppfærslan tókst. Það voru viðvaranir.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Vefþjónninn þinn er ekki uppsettur þannig að hann geti leyst \"{url}\". Frekari upplýsingar er að finna í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ekkert skyndiminni (cache) hefur verið stillt. Til að auka afköst ættirðu að setja upp skyndiminni (með memcache) ef það er tiltækt. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom er ekki lesanlegt af PHP sem er mjög óráðlegt af öryggisástæðum. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Þú ert að keyra PHP {version}. Við hvetjum þig til að uppfæra PHP útgáfuna til að njóta <a target=\"_blank\" href=\"{phpLink}\">afkastaaukningar og öryggisuppfærslna frá PHP Group</a> um leið og dreifingin þín styður það.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Uppsetning gagnstæðs milliþjónshauss (reverse proxy header) er röng, eða að þú ert að tengjast Nextcloud frá treystum milliþjóni Ef þú ert ekki að tengjast Nextcloud frá treystum milliþjóni, þá er þetta er öryggisvandamál og getur leyft árásaraðilum að dulbúa IP-vistfang þeirra sem sýnilegt Nextcloud. Nánari upplýsingar má finna í <a target=\"_blank\"  href=\"{docLink}\">hjálparskjölum</a> okkar.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er sett upp sem dreift skyndiminni, en hinsvegar er ranga PHP-einingin \"memcache\" uppsett. \\OC\\Memcache\\Memcached styður einungis \"memcached\" en ekki \"memcache\". Skoðaðu <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki-síðurnar um báðar einingarnar</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sumar skrár hafa ekki staðist áreiðanleikaprófun. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listi yfir ógildar skrár…</a> / <a href=\"{rescanEndpoint}\">Endurskanna…</a>)",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP-hausinn er ekki stilltur á að minnsa kosti \"{seconds}\" sekúndur. Fyrir aukið öryggi mælum við með því að virkja HSTS eins og lýst er í <a href=\"{docUrl}\">öryggisleiðbeiningum</a>.",
+    "An error occured. Please try again" : "Villa kom upp. Endilega reyndu aftur",
+    "not assignable" : "ekki úthlutanlegt",
+    "Updating {productName} to version {version}, this may take a while." : "Uppfæri {productName} í útgáfu {version}, þetta getur tekið smá stund.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Til að fá upplýsingar hvernig á að stilla miðlara almennilega, skaltu skoða <a href=\"%s\" target=\"_blank\">hjálparskjölin</a>.",
+    "An internal error occured." : "Innri villa kom upp."
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 2fc8c4c266f..813e6f80672 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -323,6 +323,7 @@ OC.L10N.register(
     "Please use the command line updater because you have a big instance." : "Por favor, use a atualização de linha de comando, porque você tem um grande exemplo.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Para obter ajuda, consulte a  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Esta instância %s está em modo de manutenção, o que pode demorar um pouco.",
-    "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente."
+    "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente.",
+    "An internal error occured." : "Ocorreu um erro interno."
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index dc8dd37a8f4..2ec2ba5d978 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -321,6 +321,7 @@
     "Please use the command line updater because you have a big instance." : "Por favor, use a atualização de linha de comando, porque você tem um grande exemplo.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Para obter ajuda, consulte a  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Esta instância %s está em modo de manutenção, o que pode demorar um pouco.",
-    "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente."
+    "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente.",
+    "An internal error occured." : "Ocorreu um erro interno."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index 0f0973d8e31..5e5107264e9 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -168,6 +168,12 @@ OC.L10N.register(
     "Storage incomplete configuration. %s" : "Unvollständige Konfiguration des Storage. %s",
     "Storage connection error. %s" : "Verbindungsfehler zum Speicherplatz. %s",
     "Storage not available" : "Speicher nicht verfügbar",
-    "Storage connection timeout. %s" : "Zeitüberschreitung der Verbindung zum Speicherplatz. %s"
+    "Storage connection timeout. %s" : "Zeitüberschreitung der Verbindung zum Speicherplatz. %s",
+    "ownCloud %s or higher is required." : "ownCloud %s oder höher ist erforderlich.",
+    "ownCloud %s or lower is required." : "ownCloud %s oder niedriger ist erforderlich.",
+    "App \"%s\" cannot be installed because it is not compatible with this version of Nextcloud." : "Die App \"%s\" kann nicht installiert werden, da sie mit dieser Version von Nextcloud nicht kompatibel ist.",
+    "App can't be installed because it is not compatible with this version of Nextcloud" : "Die App kann nicht installiert werden, da sie mit dieser Version von Nextcloud nicht kompatibel ist",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kann nicht installiert werden, da die in info.xml/version angegebene Version von der vom App-Store berichteten abweicht",
+    "Hint: You can speed up the upgrade by executing this SQL command manually: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;" : "Tipp: Du kannst die Aktualisierung beschleunigen indem Du folgenden SQL-Befehl manuell ausführst: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index 72e05f676e4..9349f1cad2b 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -166,6 +166,12 @@
     "Storage incomplete configuration. %s" : "Unvollständige Konfiguration des Storage. %s",
     "Storage connection error. %s" : "Verbindungsfehler zum Speicherplatz. %s",
     "Storage not available" : "Speicher nicht verfügbar",
-    "Storage connection timeout. %s" : "Zeitüberschreitung der Verbindung zum Speicherplatz. %s"
+    "Storage connection timeout. %s" : "Zeitüberschreitung der Verbindung zum Speicherplatz. %s",
+    "ownCloud %s or higher is required." : "ownCloud %s oder höher ist erforderlich.",
+    "ownCloud %s or lower is required." : "ownCloud %s oder niedriger ist erforderlich.",
+    "App \"%s\" cannot be installed because it is not compatible with this version of Nextcloud." : "Die App \"%s\" kann nicht installiert werden, da sie mit dieser Version von Nextcloud nicht kompatibel ist.",
+    "App can't be installed because it is not compatible with this version of Nextcloud" : "Die App kann nicht installiert werden, da sie mit dieser Version von Nextcloud nicht kompatibel ist",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kann nicht installiert werden, da die in info.xml/version angegebene Version von der vom App-Store berichteten abweicht",
+    "Hint: You can speed up the upgrade by executing this SQL command manually: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;" : "Tipp: Du kannst die Aktualisierung beschleunigen indem Du folgenden SQL-Befehl manuell ausführst: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index 333f3a8981a..b5243478545 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -168,6 +168,13 @@ OC.L10N.register(
     "Storage incomplete configuration. %s" : "Speicher-Konfiguration unvollständig. %s",
     "Storage connection error. %s" : "Speicher-Verbindungsfehler. %s",
     "Storage not available" : "Speicher nicht verfügbar",
-    "Storage connection timeout. %s" : "Speicher-Verbindungszeitüberschreitung. %s"
+    "Storage connection timeout. %s" : "Speicher-Verbindungszeitüberschreitung. %s",
+    "ownCloud %s or higher is required." : "ownCloud %s oder neuer erforderlich",
+    "ownCloud %s or lower is required." : "ownCloud %s oder älter erforderlich",
+    "App \"%s\" cannot be installed because it is not compatible with this version of Nextcloud." : "Die App \"%s\" kann nicht installiert werden, da sie mit dieser Version von Nextcloud nicht kompatibel ist.",
+    "App can't be installed because it is not compatible with this version of Nextcloud" : "Die App kann nicht installiert werden, da sie mit dieser Version von Nextcloud nicht kompatibel ist",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kann nicht installiert werden, da die in info.xml/version angegebene Version von der vom App-Store berichteten abweicht",
+    "Hint: You can speed up the upgrade by executing this SQL command manually: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;" : "Tipp: Sie können die Aktualisierung beschleunigen indem Sie folgenden SQL-Befehl manuell ausführen: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" > Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index 2fe0f17e051..ba00d6fc6bf 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -166,6 +166,13 @@
     "Storage incomplete configuration. %s" : "Speicher-Konfiguration unvollständig. %s",
     "Storage connection error. %s" : "Speicher-Verbindungsfehler. %s",
     "Storage not available" : "Speicher nicht verfügbar",
-    "Storage connection timeout. %s" : "Speicher-Verbindungszeitüberschreitung. %s"
+    "Storage connection timeout. %s" : "Speicher-Verbindungszeitüberschreitung. %s",
+    "ownCloud %s or higher is required." : "ownCloud %s oder neuer erforderlich",
+    "ownCloud %s or lower is required." : "ownCloud %s oder älter erforderlich",
+    "App \"%s\" cannot be installed because it is not compatible with this version of Nextcloud." : "Die App \"%s\" kann nicht installiert werden, da sie mit dieser Version von Nextcloud nicht kompatibel ist.",
+    "App can't be installed because it is not compatible with this version of Nextcloud" : "Die App kann nicht installiert werden, da sie mit dieser Version von Nextcloud nicht kompatibel ist",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kann nicht installiert werden, da die in info.xml/version angegebene Version von der vom App-Store berichteten abweicht",
+    "Hint: You can speed up the upgrade by executing this SQL command manually: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;" : "Tipp: Sie können die Aktualisierung beschleunigen indem Sie folgenden SQL-Befehl manuell ausführen: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" > Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index c45e3d90a87..dcb829c77c2 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -168,6 +168,14 @@ OC.L10N.register(
     "Storage incomplete configuration. %s" : "Konfigurasi penyimpanan tidak terselesaikan. %s",
     "Storage connection error. %s" : "Koneksi penyimpanan bermasalah. %s",
     "Storage not available" : "Penyimpanan tidak tersedia",
-    "Storage connection timeout. %s" : "Koneksi penyimpanan waktu-habis. %s"
+    "Storage connection timeout. %s" : "Koneksi penyimpanan waktu-habis. %s",
+    "ownCloud %s or higher is required." : "Diperlukan ownCloud %s atau yang lebih tinggi.",
+    "ownCloud %s or lower is required." : "Diperlukan ownCloud %s atau yang lebih rendah.",
+    "App \"%s\" cannot be installed because it is not compatible with this version of Nextcloud." : "Aplikasi \"%s\" tidak dapat dipasang karena tidak kompatibel dengan versi Nextcloud ini.",
+    "App can't be installed because it is not compatible with this version of Nextcloud" : "Aplikasi tidak dapat dipasang karena tidak kompatibel dengan versi Nextcloud ini.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikasi tidak dapat dipasang karena versi dalam info.xml/version tidak sama dengan versi yang ada dari toko aplikasi",
+    "Hint: You can speed up the upgrade by executing this SQL command manually: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;" : "Petunjuk: Anda dapat mempercepat pembaruan dengan mengeksekusi perintah SQL secara manual: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;",
+    "Running Nextcloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Menjalankan Nextcloud Server pada platform Microsoft Windows tidak didukung. Kami menyarankan Anda menggunakan server Linux di mesin virtual jika Anda tidak memiliki pilihan untuk migrasi server itu sendiri. Mencari paket Linux semudah men-deploy ke mesin virtual di <a href=\"%s\">%s</a>. Untuk memigrasi pemasangan ke Linux Anda dapat mencari tips dan skrip migrasi di <a href=\"%s\">dokumentasi kami</a>.",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Biasanya ini dapat diperbaiki dengan <a href=\"%s\" target=\"_blank\">memberi server web akses tulis ke direktori root</a>"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index da6d1f848e6..783426a6e03 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -166,6 +166,14 @@
     "Storage incomplete configuration. %s" : "Konfigurasi penyimpanan tidak terselesaikan. %s",
     "Storage connection error. %s" : "Koneksi penyimpanan bermasalah. %s",
     "Storage not available" : "Penyimpanan tidak tersedia",
-    "Storage connection timeout. %s" : "Koneksi penyimpanan waktu-habis. %s"
+    "Storage connection timeout. %s" : "Koneksi penyimpanan waktu-habis. %s",
+    "ownCloud %s or higher is required." : "Diperlukan ownCloud %s atau yang lebih tinggi.",
+    "ownCloud %s or lower is required." : "Diperlukan ownCloud %s atau yang lebih rendah.",
+    "App \"%s\" cannot be installed because it is not compatible with this version of Nextcloud." : "Aplikasi \"%s\" tidak dapat dipasang karena tidak kompatibel dengan versi Nextcloud ini.",
+    "App can't be installed because it is not compatible with this version of Nextcloud" : "Aplikasi tidak dapat dipasang karena tidak kompatibel dengan versi Nextcloud ini.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikasi tidak dapat dipasang karena versi dalam info.xml/version tidak sama dengan versi yang ada dari toko aplikasi",
+    "Hint: You can speed up the upgrade by executing this SQL command manually: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;" : "Petunjuk: Anda dapat mempercepat pembaruan dengan mengeksekusi perintah SQL secara manual: ALTER TABLE %s ADD COLUMN checksum varchar(255) DEFAULT NULL AFTER permissions;",
+    "Running Nextcloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Menjalankan Nextcloud Server pada platform Microsoft Windows tidak didukung. Kami menyarankan Anda menggunakan server Linux di mesin virtual jika Anda tidak memiliki pilihan untuk migrasi server itu sendiri. Mencari paket Linux semudah men-deploy ke mesin virtual di <a href=\"%s\">%s</a>. Untuk memigrasi pemasangan ke Linux Anda dapat mencari tips dan skrip migrasi di <a href=\"%s\">dokumentasi kami</a>.",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Biasanya ini dapat diperbaiki dengan <a href=\"%s\" target=\"_blank\">memberi server web akses tulis ke direktori root</a>"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/private/User/Backend.php b/lib/private/User/Backend.php
index da86a4b0534..374ec5876e1 100644
--- a/lib/private/User/Backend.php
+++ b/lib/private/User/Backend.php
@@ -22,11 +22,13 @@
 
 namespace OC\User;
 
+use \OCP\UserInterface;
+
 /**
  * Abstract base class for user management. Provides methods for querying backend
  * capabilities.
  */
-abstract class Backend implements \OCP\UserInterface {
+abstract class Backend implements UserInterface {
 	/**
 	 * error code for functions not provided by the user backend
 	 */
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php
index e2cbebab2e4..eba7beffeae 100644
--- a/lib/private/User/Database.php
+++ b/lib/private/User/Database.php
@@ -53,19 +53,25 @@
 namespace OC\User;
 
 use OC\Cache\CappedMemoryCache;
+use OCP\IUserBackend;
+use OCP\Util;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 /**
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
  */
-class Database extends \OC\User\Backend implements \OCP\IUserBackend {
+class Database extends Backend implements IUserBackend {
 	/** @var CappedMemoryCache */
 	private $cache;
+
 	/** @var EventDispatcher */
 	private $eventDispatcher;
+
 	/**
-	 * OC_User_Database constructor.
+	 * \OC\User\Database constructor.
+	 *
+	 * @param EventDispatcher $eventDispatcher
 	 */
 	public function __construct($eventDispatcher = null) {
 		$this->cache = new CappedMemoryCache();
@@ -233,7 +239,7 @@ class Database extends \OC\User\Backend implements \OCP\IUserBackend {
 			$result = $query->execute(array($uid));
 
 			if ($result === false) {
-				\OCP\Util::writeLog('core', \OC_DB::getErrorMessage(), \OCP\Util::ERROR);
+				Util::writeLog('core', \OC_DB::getErrorMessage(), Util::ERROR);
 				return false;
 			}
 
@@ -310,7 +316,7 @@ class Database extends \OC\User\Backend implements \OCP\IUserBackend {
 		$query = \OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`');
 		$result = $query->execute();
 		if ($result === false) {
-			\OCP\Util::writeLog('core', \OC_DB::getErrorMessage(), \OCP\Util::ERROR);
+			Util::writeLog('core', \OC_DB::getErrorMessage(), Util::ERROR);
 			return false;
 		}
 		return $result->fetchOne();
@@ -345,7 +351,7 @@ class Database extends \OC\User\Backend implements \OCP\IUserBackend {
 
 		$backends = \OC::$server->getUserManager()->getBackends();
 		foreach ($backends as $backend) {
-			if ($backend instanceof \OC\User\Database) {
+			if ($backend instanceof Database) {
 				/** @var \OC\User\Database $backend */
 				$uid = $backend->loginName2UserName($param['uid']);
 				if ($uid !== false) {
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index eb2f1ce1da3..f41468d4926 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -187,7 +187,7 @@ class Manager extends PublicEmitter implements IUserManager {
 		$password = str_replace("\0", '', $password);
 		
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\User\Backend::CHECK_PASSWORD)) {
+			if ($backend->implementsActions(Backend::CHECK_PASSWORD)) {
 				$uid = $backend->checkPassword($loginName, $password);
 				if ($uid !== false) {
 					return $this->getUserObject($uid, $backend);
@@ -291,7 +291,7 @@ class Manager extends PublicEmitter implements IUserManager {
 
 		$this->emit('\OC\User', 'preCreateUser', array($uid, $password));
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\User\Backend::CREATE_USER)) {
+			if ($backend->implementsActions(Backend::CREATE_USER)) {
 				$backend->createUser($uid, $password);
 				$user = $this->getUserObject($uid, $backend);
 				$this->emit('\OC\User', 'postCreateUser', array($user, $password));
@@ -309,7 +309,7 @@ class Manager extends PublicEmitter implements IUserManager {
 	public function countUsers() {
 		$userCountStatistics = array();
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC\User\Backend::COUNT_USERS)) {
+			if ($backend->implementsActions(Backend::COUNT_USERS)) {
 				$backendUsers = $backend->countUsers();
 				if($backendUsers !== false) {
 					if($backend instanceof IUserBackend) {
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 3db6cd1a11a..3b357b69bcf 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -167,7 +167,7 @@ class Session implements IUserSession, Emitter {
 	/**
 	 * set the currently active user
 	 *
-	 * @param User|null $user
+	 * @param IUser|null $user
 	 */
 	public function setUser($user) {
 		if (is_null($user)) {
@@ -287,10 +287,8 @@ class Session implements IUserSession, Emitter {
 		$this->session->regenerateId();
 		if ($this->validateToken($password, $uid)) {
 			return $this->loginWithToken($password);
-		} else {
-			return $this->loginWithPassword($uid, $password);
 		}
-		return false;
+		return $this->loginWithPassword($uid, $password);
 	}
 
 	/**
@@ -464,7 +462,6 @@ class Session implements IUserSession, Emitter {
 			$message = \OC::$server->getL10N('lib')->t('User disabled');
 			throw new LoginException($message);
 		}
-		return false;
 	}
 
 	/**
@@ -652,6 +649,7 @@ class Session implements IUserSession, Emitter {
 	/**
 	 * Tries to login the user with auth token header
 	 *
+	 * @param IRequest $request
 	 * @todo check remember me cookie
 	 * @return boolean
 	 */
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index 4d403535bf3..94ac8c13621 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -30,6 +30,7 @@
 
 namespace OC\User;
 
+use OC\Files\Cache\Storage;
 use OC\Hooks\Emitter;
 use OC_Helper;
 use OCP\IAvatarManager;
@@ -38,6 +39,7 @@ use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IConfig;
 use OCP\UserInterface;
+use \OCP\IUserBackend;
 
 class User implements IUser {
 	/** @var string $uid */
@@ -111,7 +113,7 @@ class User implements IUser {
 	public function getDisplayName() {
 		if (!isset($this->displayName)) {
 			$displayName = '';
-			if ($this->backend and $this->backend->implementsActions(\OC\User\Backend::GET_DISPLAYNAME)) {
+			if ($this->backend and $this->backend->implementsActions(Backend::GET_DISPLAYNAME)) {
 				// get display name and strip whitespace from the beginning and end of it
 				$backendDisplayName = $this->backend->getDisplayName($this->uid);
 				if (is_string($backendDisplayName)) {
@@ -136,7 +138,7 @@ class User implements IUser {
 	 */
 	public function setDisplayName($displayName) {
 		$displayName = trim($displayName);
-		if ($this->backend->implementsActions(\OC\User\Backend::SET_DISPLAYNAME) && !empty($displayName)) {
+		if ($this->backend->implementsActions(Backend::SET_DISPLAYNAME) && !empty($displayName)) {
 			$result = $this->backend->setDisplayName($this->uid, $displayName);
 			if ($result) {
 				$this->displayName = $displayName;
@@ -198,17 +200,17 @@ class User implements IUser {
 			// FIXME: Feels like an hack - suggestions?
 
 			// We have to delete the user from all groups
-			foreach (\OC_Group::getUserGroups($this->uid) as $i) {
-				\OC_Group::removeFromGroup($this->uid, $i);
+			foreach (\OC::$server->getGroupManager()->getUserGroupIds($this) as $groupId) {
+				\OC_Group::removeFromGroup($this->uid, $groupId);
 			}
 			// Delete the user's keys in preferences
 			\OC::$server->getConfig()->deleteAllUserValues($this->uid);
 
 			// Delete user files in /data/
-			\OC_Helper::rmdirr(\OC_User::getHome($this->uid));
+			\OC_Helper::rmdirr($this->getHome());
 
 			// Delete the users entry in the storage table
-			\OC\Files\Cache\Storage::remove('home::' . $this->uid);
+			Storage::remove('home::' . $this->uid);
 
 			\OC::$server->getCommentsManager()->deleteReferencesOfActor('users', $this->uid);
 			\OC::$server->getCommentsManager()->deleteReadMarksFromUser($this);
@@ -231,7 +233,7 @@ class User implements IUser {
 		if ($this->emitter) {
 			$this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
 		}
-		if ($this->backend->implementsActions(\OC\User\Backend::SET_PASSWORD)) {
+		if ($this->backend->implementsActions(Backend::SET_PASSWORD)) {
 			$result = $this->backend->setPassword($this->uid, $password);
 			if ($this->emitter) {
 				$this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword));
@@ -249,7 +251,7 @@ class User implements IUser {
 	 */
 	public function getHome() {
 		if (!$this->home) {
-			if ($this->backend->implementsActions(\OC\User\Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) {
+			if ($this->backend->implementsActions(Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) {
 				$this->home = $home;
 			} elseif ($this->config) {
 				$this->home = $this->config->getSystemValue('datadirectory') . '/' . $this->uid;
@@ -266,7 +268,7 @@ class User implements IUser {
 	 * @return string
 	 */
 	public function getBackendClassName() {
-		if($this->backend instanceof \OCP\IUserBackend) {
+		if($this->backend instanceof IUserBackend) {
 			return $this->backend->getBackendName();
 		}
 		return get_class($this->backend);
@@ -278,7 +280,7 @@ class User implements IUser {
 	 * @return bool
 	 */
 	public function canChangeAvatar() {
-		if ($this->backend->implementsActions(\OC\User\Backend::PROVIDE_AVATAR)) {
+		if ($this->backend->implementsActions(Backend::PROVIDE_AVATAR)) {
 			return $this->backend->canChangeAvatar($this->uid);
 		}
 		return true;
@@ -290,7 +292,7 @@ class User implements IUser {
 	 * @return bool
 	 */
 	public function canChangePassword() {
-		return $this->backend->implementsActions(\OC\User\Backend::SET_PASSWORD);
+		return $this->backend->implementsActions(Backend::SET_PASSWORD);
 	}
 
 	/**
@@ -302,7 +304,7 @@ class User implements IUser {
 		if ($this->config->getSystemValue('allow_user_to_change_display_name') === false) {
 			return false;
 		}
-		return $this->backend->implementsActions(\OC\User\Backend::SET_DISPLAYNAME);
+		return $this->backend->implementsActions(Backend::SET_DISPLAYNAME);
 	}
 
 	/**
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 0441c507f34..3881952872f 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -234,20 +234,26 @@ class CheckSetupController extends Controller {
 	}
 
 	/**
+	 * Whether the version is outdated
+	 *
+	 * @return bool
+	 */
+	protected function isPhpOutdated() {
+		if (version_compare(PHP_VERSION, '5.5.0') === -1) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
 	 * Whether the php version is still supported (at time of release)
 	 * according to: https://secure.php.net/supported-versions.php
 	 *
 	 * @return array
 	 */
 	private function isPhpSupported() {
-		$eol = false;
-
-		//PHP 5.4 is EOL on 14 Sep 2015
-		if (version_compare(PHP_VERSION, '5.5.0') === -1) {
-			$eol = true;
-		}
-
-		return ['eol' => $eol, 'version' => PHP_VERSION];
+		return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
 	}
 
 	/**
diff --git a/settings/css/settings.css b/settings/css/settings.css
index b40b7a17904..921b1006c21 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -160,6 +160,15 @@ table.nostyle td { padding: 0.2em 0; }
 	padding-right: 1em;
 }
 
+.social-button {
+	padding-left: 0;
+	margin-left: -10px
+}
+.social-button img {
+	padding: 10px;
+}
+
+
 /* USERS */
 #newgroup-init a span { margin-left: 20px; }
 #newgroup-init a span:before {
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 73f49eba372..ff97f12b610 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -215,7 +215,7 @@ OC.L10N.register(
     "Store credentials" : "Anmeldeinformationen speichern",
     "Test email settings" : "E-Mail-Einstellungen testen",
     "Send email" : "E-Mail senden",
-    "What to log" : "Was für ein Protokoll",
+    "What to log" : "Was geloggt wird",
     "Download logfile" : "Logdatei herunterladen",
     "More" : "Mehr",
     "Less" : "Weniger",
@@ -326,6 +326,28 @@ OC.L10N.register(
     "change full name" : "Vollständigen Namen ändern",
     "set new password" : "Neues Passwort setzen",
     "change email address" : "E-Mail-Adresse ändern",
-    "Default" : "Standard"
+    "Default" : "Standard",
+    "no group" : "Keine Gruppe",
+    "add group" : "Gruppe hinzufügen",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Deine Datenbank läuft nicht mit der \"READ COMMITED\" Transaktionsisolationsstufe. Dies kann Probleme hervorrufen, wenn mehrere Aktionen parallel ausgeführt werden.",
+    "Add Group" : "Gruppe hinzufügen",
+    "Default Quota" : "Standard-Quota",
+    "Full Name" : "Vollständiger Name",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Storage Location" : "Speicherort",
+    "User Backend" : "Benutzer-Backend",
+    "Last Login" : "Letzte Anmeldung",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
+    "No apps found for \"{query}\"" : "Keine Applikationen für \"{query}\" gefunden",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration durchlesen, sowie die PHP-Konfiguration des Servers überprüfen, insbesondere dann, wenn PHP-FPM eingesetzt wird.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. 'filelocking.enabled' in der config.php aktivieren, um diese Probleme zu vermeiden. Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a>.",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfe noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrolliere das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
+    "Encryption alone does not guarantee security of the system. Please see Nextcloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Für diese App wurde keine untere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Für diese App wurde keine obere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://help.nextcloud.com/\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">help other users</a>!" : "Wenn du das Projekt unterstützen möchtest\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">hilf uns bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehle es weiter</a>!",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} verfügbar."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 7cb2dc361dd..5dab537090a 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -213,7 +213,7 @@
     "Store credentials" : "Anmeldeinformationen speichern",
     "Test email settings" : "E-Mail-Einstellungen testen",
     "Send email" : "E-Mail senden",
-    "What to log" : "Was für ein Protokoll",
+    "What to log" : "Was geloggt wird",
     "Download logfile" : "Logdatei herunterladen",
     "More" : "Mehr",
     "Less" : "Weniger",
@@ -324,6 +324,28 @@
     "change full name" : "Vollständigen Namen ändern",
     "set new password" : "Neues Passwort setzen",
     "change email address" : "E-Mail-Adresse ändern",
-    "Default" : "Standard"
+    "Default" : "Standard",
+    "no group" : "Keine Gruppe",
+    "add group" : "Gruppe hinzufügen",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Deine Datenbank läuft nicht mit der \"READ COMMITED\" Transaktionsisolationsstufe. Dies kann Probleme hervorrufen, wenn mehrere Aktionen parallel ausgeführt werden.",
+    "Add Group" : "Gruppe hinzufügen",
+    "Default Quota" : "Standard-Quota",
+    "Full Name" : "Vollständiger Name",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Storage Location" : "Speicherort",
+    "User Backend" : "Benutzer-Backend",
+    "Last Login" : "Letzte Anmeldung",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
+    "No apps found for \"{query}\"" : "Keine Applikationen für \"{query}\" gefunden",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration durchlesen, sowie die PHP-Konfiguration des Servers überprüfen, insbesondere dann, wenn PHP-FPM eingesetzt wird.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Dein Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. 'filelocking.enabled' in der config.php aktivieren, um diese Probleme zu vermeiden. Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a>.",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfe noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrolliere das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
+    "Encryption alone does not guarantee security of the system. Please see Nextcloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Für diese App wurde keine untere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Für diese App wurde keine obere Versionsgrenze für Nextcloud gesetzt. Dies wird zukünftig als Fehler behandelt.",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://help.nextcloud.com/\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">help other users</a>!" : "Wenn du das Projekt unterstützen möchtest\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">hilf uns bei der Weiterentwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://nextcloud.com/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">empfehle es weiter</a>!",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} verfügbar."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 0620d2eea3a..8e43b5ae395 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -326,6 +326,27 @@ OC.L10N.register(
     "change full name" : "Vollständigen Namen ändern",
     "set new password" : "Neues Passwort setzen",
     "change email address" : "E-Mail-Adresse ändern",
-    "Default" : "Standard"
+    "Default" : "Standard",
+    "no group" : "Keine Gruppe",
+    "add group" : "Gruppe hinzufügen",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "ihre Datenbank läuft nicht mit der \"READ COMMITED\" Transaktionsisolationsstufe. Dies kann Probleme hervorrufen, wenn mehrere Aktionen parallel ausgeführt werden.",
+    "Add Group" : "Gruppe hinzufügen",
+    "Default Quota" : "Standard-Quota",
+    "Full Name" : "Vollständiger Name",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Storage Location" : "Speicherort",
+    "User Backend" : "Benutzer-Backend",
+    "Last Login" : "Letzte Anmeldung",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
+    "No apps found for \"{query}\"" : "Keine Applikationen für \"{query}\" gefunden",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schauen Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzen.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. Aktivieren Sie 'filelocking.enabled' in der config.php  diese Probleme zu vermeiden. Weitere Informationen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a>.",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfen Sie noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrollieren Sie das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
+    "Encryption alone does not guarantee security of the system. Please see Nextcloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Für diese App wurde keine untere Versionsgrenze für Nextcloud gesetzt. Dies wird ab Nextcloud 11 als Fehler behandelt.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Für diese App wurde keine obere Versionsgrenze für Nextcloud gesetzt. Dies wird ab Nextcloud 11 als Fehler behandelt.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} verfügbar."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 4059f60778f..f47d64ba9d5 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -324,6 +324,27 @@
     "change full name" : "Vollständigen Namen ändern",
     "set new password" : "Neues Passwort setzen",
     "change email address" : "E-Mail-Adresse ändern",
-    "Default" : "Standard"
+    "Default" : "Standard",
+    "no group" : "Keine Gruppe",
+    "add group" : "Gruppe hinzufügen",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "ihre Datenbank läuft nicht mit der \"READ COMMITED\" Transaktionsisolationsstufe. Dies kann Probleme hervorrufen, wenn mehrere Aktionen parallel ausgeführt werden.",
+    "Add Group" : "Gruppe hinzufügen",
+    "Default Quota" : "Standard-Quota",
+    "Full Name" : "Vollständiger Name",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Storage Location" : "Speicherort",
+    "User Backend" : "Benutzer-Backend",
+    "Last Login" : "Letzte Anmeldung",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Offizielle Apps werden von und innerhalb der Community entwickelt. Sie stellen die zentralen Funktionen bereit und sind für den produktiven Einsatz geeignet.",
+    "No apps found for \"{query}\"" : "Keine Applikationen für \"{query}\" gefunden",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schauen Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzen.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ihr Server wird mit Microsoft Windows betrieben. Für ein optimales Nutzungserlebnis empfehlen wir dringend Linux.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktionales Sperren ist deaktiviert, was zu Problemen mit Laufzeitbedingungen führen kann. Aktivieren Sie 'filelocking.enabled' in der config.php  diese Probleme zu vermeiden. Weitere Informationen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a>.",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Bitte überprüfen Sie noch einmal die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Installationsanleitungen ↗</a> und kontrollieren Sie das <a href=\"#log-section\">Log</a> auf mögliche Fehler oder Warnungen.",
+    "Encryption alone does not guarantee security of the system. Please see Nextcloud documentation for more information about how the encryption app works, and the supported use cases." : "Verschlüsselung alleine garantiert nicht die Systemsicherheit. Bitte lesen Sie in der Dokumentation nach, wie die Verschlüsselungs-App funktioniert und welche Anwendungsfälle unterstützt werden.",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">Dokumentation ↗</a> schauen.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Für diese App wurde keine untere Versionsgrenze für Nextcloud gesetzt. Dies wird ab Nextcloud 11 als Fehler behandelt.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Für diese App wurde keine obere Versionsgrenze für Nextcloud gesetzt. Dies wird ab Nextcloud 11 als Fehler behandelt.",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Entwickelt von der {communityopen}Nextcloud Community{linkclose}. Der {githubopen}Quellcode{linkclose} ist unter {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} verfügbar."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index c509f9ffd11..c3d69e660b6 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -98,6 +98,10 @@ OC.L10N.register(
     "Android Client" : "Klien Android",
     "Sync client - {os}" : "Klien sync - {os}",
     "This session" : "Sesi ini",
+    "Copied!" : "Tersalin!",
+    "Not supported!" : "Tidak didukung!",
+    "Press ⌘-C to copy." : "Tekan ⌘-C untuk menyalin.",
+    "Press Ctrl-C to copy." : "Tekan Ctrl-C untuk menyalin.",
     "Error while loading browser sessions and device tokens" : "Terjadi kesalahan saat memuat sesi browser dan token perangkat",
     "Error while creating device token" : "Terjadi kesalahan saat membuat token perangkat",
     "Error while deleting the token" : "Terjadi kesalahan saat menghapus token",
@@ -289,6 +293,7 @@ OC.L10N.register(
     "App name" : "Nama aplikasi",
     "Create new app password" : "Buat sandi aplikasi baru",
     "Use the credentials below to configure your app or device." : "Gunakan kredensial berikut untuk mengkonfigurasi aplikasi atau perangkat.",
+    "For security reasons this password will only be shown once." : "Untuk alasan keamanan sandi ini akan ditunjukkan hanya sekali.",
     "Username" : "Nama pengguna",
     "Done" : "Selesai",
     "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
@@ -297,6 +302,7 @@ OC.L10N.register(
     "iOS app" : "Aplikasi iOS",
     "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Apabila Anda ingin mendukung proyek ini\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ikuti pengembangannya</a>\n\t\tatau\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">sebarkan</a>!",
     "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Dikembangkan oleh {commmunityopen}komunitas Nextcloud{linkclose}, {githubopen}sumber kode{linkclose} dilisensikan dibawah {licenseopen}AGPL{linkclose}.",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
     "Show user backend" : "Tampilkan pengguna backend",
@@ -320,6 +326,28 @@ OC.L10N.register(
     "change full name" : "ubah nama lengkap",
     "set new password" : "setel sandi baru",
     "change email address" : "ubah alamat email",
-    "Default" : "Default"
+    "Default" : "Default",
+    "no group" : "tanpa grup",
+    "add group" : "tambah grup",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Database Anda tidak dijalankan dengan isolasi transaksi level \"READ COMMITED\". Ini dapat menyebabkan masalah saat banyak tindakan dilakukan secara paralel.",
+    "Add Group" : "Tambah Grup",
+    "Default Quota" : "Kuota Standar",
+    "Full Name" : "Nama Lengkap",
+    "Group Admin for" : "Grup Admin untuk",
+    "Storage Location" : "Lokasi Penyimpanan",
+    "User Backend" : "Backend Pengguna",
+    "Last Login" : "Log Masuk Terakhir",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh dan didalam komunitas Nextcloud. Mereka menawarkan fungsi sentral untuk Nextcloud dan siap untuk penggunaan produksi.",
+    "No apps found for \"{query}\"" : "Tidak ditemukan aplikasi untuk \"{query}\"",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon cek <a target=\"_blank\" href=\"%s\">dokumentasi instalasi↗</a> untuk catatan konfigurasi php dan konfigurasi PHP server Anda, khususnya saat menggunakan php-fpm.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Penguncian berkas transaksional nonaktif, ini dapat menyebabkan masalah dengan kondisi tertentu. Aktifkan 'filelocking.enabled' dalam config.php untuk menghindari masalah ini. Lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon cek <a target=\"_blank\" href=\"%s\">petunjuk instalasi ↗</a>, dan cek masalah atau peringatan di <a href=\"#log-section\">log</a>.",
+    "Encryption alone does not guarantee security of the system. Please see Nextcloud documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak dapat menjamin keamanan sistem. Silakan lihat dokumentasi Nextcloud untuk informasi lebih lanjut dalam bagaimana aplikasi enkripsi bekerja, dan kasus pendukung.",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke database lain, gunakan alat command line: 'occ db:convert-type', atau lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a>.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Aplikasi ini tidak mempunyai versi minimum Nextcloud yang ditetapkan. Ini akan menjadi kesalahan dalam Nextcloud 11 atau versi yang lebih tinggi.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Aplikasi ini tidak mempunyai versi maksimum Nextcloud yang ditetapkan. Ini akan menjadi kesalahan dalam Nextcloud 11 atau versi yang lebih tinggi.",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://help.nextcloud.com/\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">help other users</a>!" : "Apabila Anda ingin mendukung proyek ini\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ikuti pengembangannya</a>\n\t\tatau\n\t\t<a href=\"https://help.nextcloud.com/\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bantu pengguna lainnya</a>!",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Dikembangkan oleh {commmunityopen}komunitas Nextcloud{linkclose}, {githubopen}sumber kode{linkclose} dilisensikan dibawah {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}."
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 9f18f3c50ad..4680ffdfbd8 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -96,6 +96,10 @@
     "Android Client" : "Klien Android",
     "Sync client - {os}" : "Klien sync - {os}",
     "This session" : "Sesi ini",
+    "Copied!" : "Tersalin!",
+    "Not supported!" : "Tidak didukung!",
+    "Press ⌘-C to copy." : "Tekan ⌘-C untuk menyalin.",
+    "Press Ctrl-C to copy." : "Tekan Ctrl-C untuk menyalin.",
     "Error while loading browser sessions and device tokens" : "Terjadi kesalahan saat memuat sesi browser dan token perangkat",
     "Error while creating device token" : "Terjadi kesalahan saat membuat token perangkat",
     "Error while deleting the token" : "Terjadi kesalahan saat menghapus token",
@@ -287,6 +291,7 @@
     "App name" : "Nama aplikasi",
     "Create new app password" : "Buat sandi aplikasi baru",
     "Use the credentials below to configure your app or device." : "Gunakan kredensial berikut untuk mengkonfigurasi aplikasi atau perangkat.",
+    "For security reasons this password will only be shown once." : "Untuk alasan keamanan sandi ini akan ditunjukkan hanya sekali.",
     "Username" : "Nama pengguna",
     "Done" : "Selesai",
     "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
@@ -295,6 +300,7 @@
     "iOS app" : "Aplikasi iOS",
     "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Apabila Anda ingin mendukung proyek ini\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ikuti pengembangannya</a>\n\t\tatau\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">sebarkan</a>!",
     "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Dikembangkan oleh {commmunityopen}komunitas Nextcloud{linkclose}, {githubopen}sumber kode{linkclose} dilisensikan dibawah {licenseopen}AGPL{linkclose}.",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
     "Show user backend" : "Tampilkan pengguna backend",
@@ -318,6 +324,28 @@
     "change full name" : "ubah nama lengkap",
     "set new password" : "setel sandi baru",
     "change email address" : "ubah alamat email",
-    "Default" : "Default"
+    "Default" : "Default",
+    "no group" : "tanpa grup",
+    "add group" : "tambah grup",
+    "Your database does not run with \"READ COMMITED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Database Anda tidak dijalankan dengan isolasi transaksi level \"READ COMMITED\". Ini dapat menyebabkan masalah saat banyak tindakan dilakukan secara paralel.",
+    "Add Group" : "Tambah Grup",
+    "Default Quota" : "Kuota Standar",
+    "Full Name" : "Nama Lengkap",
+    "Group Admin for" : "Grup Admin untuk",
+    "Storage Location" : "Lokasi Penyimpanan",
+    "User Backend" : "Backend Pengguna",
+    "Last Login" : "Log Masuk Terakhir",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Aplikasi resmi dikembangkan oleh dan didalam komunitas Nextcloud. Mereka menawarkan fungsi sentral untuk Nextcloud dan siap untuk penggunaan produksi.",
+    "No apps found for \"{query}\"" : "Tidak ditemukan aplikasi untuk \"{query}\"",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon cek <a target=\"_blank\" href=\"%s\">dokumentasi instalasi↗</a> untuk catatan konfigurasi php dan konfigurasi PHP server Anda, khususnya saat menggunakan php-fpm.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Penguncian berkas transaksional nonaktif, ini dapat menyebabkan masalah dengan kondisi tertentu. Aktifkan 'filelocking.enabled' dalam config.php untuk menghindari masalah ini. Lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon cek <a target=\"_blank\" href=\"%s\">petunjuk instalasi ↗</a>, dan cek masalah atau peringatan di <a href=\"#log-section\">log</a>.",
+    "Encryption alone does not guarantee security of the system. Please see Nextcloud documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak dapat menjamin keamanan sistem. Silakan lihat dokumentasi Nextcloud untuk informasi lebih lanjut dalam bagaimana aplikasi enkripsi bekerja, dan kasus pendukung.",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke database lain, gunakan alat command line: 'occ db:convert-type', atau lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a>.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Aplikasi ini tidak mempunyai versi minimum Nextcloud yang ditetapkan. Ini akan menjadi kesalahan dalam Nextcloud 11 atau versi yang lebih tinggi.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Aplikasi ini tidak mempunyai versi maksimum Nextcloud yang ditetapkan. Ini akan menjadi kesalahan dalam Nextcloud 11 atau versi yang lebih tinggi.",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://help.nextcloud.com/\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">help other users</a>!" : "Apabila Anda ingin mendukung proyek ini\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">ikuti pengembangannya</a>\n\t\tatau\n\t\t<a href=\"https://help.nextcloud.com/\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">bantu pengguna lainnya</a>!",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Dikembangkan oleh {commmunityopen}komunitas Nextcloud{linkclose}, {githubopen}sumber kode{linkclose} dilisensikan dibawah {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
index 2356a21c1e1..bb112dcc7f0 100644
--- a/settings/l10n/is.js
+++ b/settings/l10n/is.js
@@ -98,6 +98,10 @@ OC.L10N.register(
     "Android Client" : "Android-biðlari",
     "Sync client - {os}" : "Samstilla bilara - {os}",
     "This session" : "Þessa setu",
+    "Copied!" : "Afritað!",
+    "Not supported!" : "Óstutt!",
+    "Press ⌘-C to copy." : "Ýttu á ⌘-C til að afrita.",
+    "Press Ctrl-C to copy." : "Ýttu á Ctrl-C til að afrita.",
     "Error while deleting the token" : "Villa kom upp við að eyða teikninu",
     "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Villa kom upp. Sendu inn ASCII-kóðað PEM-skilríki.",
     "Valid until {date}" : "Gildir til {date}",
@@ -270,6 +274,7 @@ OC.L10N.register(
     "Name" : "Heiti",
     "App name" : "Heiti forrits",
     "Create new app password" : "Búa til nýtt lykilorð forrits",
+    "For security reasons this password will only be shown once." : "Af öryggisástæðum er þetta lykilorð einungis birt einu sinni.",
     "Username" : "Notandanafn",
     "Done" : "Lokið",
     "Get the apps to sync your files" : "Náðu í forrit til að samstilla skrárnar þínar",
@@ -278,6 +283,7 @@ OC.L10N.register(
     "iOS app" : "iOS-forrit",
     "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">láttu orð út ganga</a>!",
     "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Þróað af {communityopen}Nextcloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}AGPL{linkclose} notkunarleyfinu.",
     "Show storage location" : "Birta staðsetningu gagnageymslu",
     "Show last log in" : "Birta síðustu innskráningu",
     "Show user backend" : "Birta bakenda notanda",
@@ -301,6 +307,24 @@ OC.L10N.register(
     "change full name" : "breyta fullu nafni",
     "set new password" : "setja nýtt lykilorð",
     "change email address" : "breyta tölvupóstfangi",
-    "Default" : "Sjálfgefið"
+    "Default" : "Sjálfgefið",
+    "no group" : "enginn hópur",
+    "add group" : "bæta við hópi",
+    "Add Group" : "Bæta við hópi",
+    "Default Quota" : "Sjálfgefinn kvóti",
+    "Full Name" : "Fullt nafn",
+    "Group Admin for" : "Hópstjóri fyrir",
+    "Storage Location" : "Staðsetning gagnageymslu",
+    "User Backend" : "Bakendi notanda",
+    "Last Login" : "Síðasta innskráning",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Opinber forrit eru þróuð af og innan Nextcloud samfélagsins. Þau virka með kjarnaeiginleikum Nextcloud og eru tilbúin til notkunar í raunvinnslu.",
+    "No apps found for \"{query}\"" : "Engin forrit fundust fyrir \"{query}\"",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Þjónninn þinn er keyrandi á Microsoft Windows. Við mælum sterklega með Linux til að njóta sem best allra eiginleika fyrir notendurna.",
+    "Encryption alone does not guarantee security of the system. Please see Nextcloud documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölin um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Til að yfirfæra í annan gagnagrunn skaltu nota skipanalínutólið: 'occ db:convert-type', eða lesa <a target=\"_blank\" href=\"%s\">hjálparskjölin ↗</a>.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Þetta vorrit er ekki með tiltekna neina lágmarksútgáfu Nextcloud. Þetta mun gefa villu í Nextcloud 11 og nýrri.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Þetta vorrit er ekki með tiltekna neina hámarksútgáfu Nextcloud. Þetta mun gefa villu í Nextcloud 11 og nýrri.",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://help.nextcloud.com/\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">help other users</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://help.nextcloud.com\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hjálpaðu öðrum notendum</a>!",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Þróað af {communityopen}Nextcloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} notkunarleyfinu."
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
index 0ab0bf40f04..bdf61080f12 100644
--- a/settings/l10n/is.json
+++ b/settings/l10n/is.json
@@ -96,6 +96,10 @@
     "Android Client" : "Android-biðlari",
     "Sync client - {os}" : "Samstilla bilara - {os}",
     "This session" : "Þessa setu",
+    "Copied!" : "Afritað!",
+    "Not supported!" : "Óstutt!",
+    "Press ⌘-C to copy." : "Ýttu á ⌘-C til að afrita.",
+    "Press Ctrl-C to copy." : "Ýttu á Ctrl-C til að afrita.",
     "Error while deleting the token" : "Villa kom upp við að eyða teikninu",
     "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Villa kom upp. Sendu inn ASCII-kóðað PEM-skilríki.",
     "Valid until {date}" : "Gildir til {date}",
@@ -268,6 +272,7 @@
     "Name" : "Heiti",
     "App name" : "Heiti forrits",
     "Create new app password" : "Búa til nýtt lykilorð forrits",
+    "For security reasons this password will only be shown once." : "Af öryggisástæðum er þetta lykilorð einungis birt einu sinni.",
     "Username" : "Notandanafn",
     "Done" : "Lokið",
     "Get the apps to sync your files" : "Náðu í forrit til að samstilla skrárnar þínar",
@@ -276,6 +281,7 @@
     "iOS app" : "iOS-forrit",
     "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">láttu orð út ganga</a>!",
     "Show First Run Wizard again" : "Birta Fyrsta-skiptis-leiðarvísinn aftur",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Þróað af {communityopen}Nextcloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}AGPL{linkclose} notkunarleyfinu.",
     "Show storage location" : "Birta staðsetningu gagnageymslu",
     "Show last log in" : "Birta síðustu innskráningu",
     "Show user backend" : "Birta bakenda notanda",
@@ -299,6 +305,24 @@
     "change full name" : "breyta fullu nafni",
     "set new password" : "setja nýtt lykilorð",
     "change email address" : "breyta tölvupóstfangi",
-    "Default" : "Sjálfgefið"
+    "Default" : "Sjálfgefið",
+    "no group" : "enginn hópur",
+    "add group" : "bæta við hópi",
+    "Add Group" : "Bæta við hópi",
+    "Default Quota" : "Sjálfgefinn kvóti",
+    "Full Name" : "Fullt nafn",
+    "Group Admin for" : "Hópstjóri fyrir",
+    "Storage Location" : "Staðsetning gagnageymslu",
+    "User Backend" : "Bakendi notanda",
+    "Last Login" : "Síðasta innskráning",
+    "Official apps are developed by and within the Nextcloud community. They offer functionality central to Nextcloud and are ready for production use." : "Opinber forrit eru þróuð af og innan Nextcloud samfélagsins. Þau virka með kjarnaeiginleikum Nextcloud og eru tilbúin til notkunar í raunvinnslu.",
+    "No apps found for \"{query}\"" : "Engin forrit fundust fyrir \"{query}\"",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Þjónninn þinn er keyrandi á Microsoft Windows. Við mælum sterklega með Linux til að njóta sem best allra eiginleika fyrir notendurna.",
+    "Encryption alone does not guarantee security of the system. Please see Nextcloud documentation for more information about how the encryption app works, and the supported use cases." : "Dulritun ein og sér tryggir ekki öryggi kerfisins. Endilega skoðaðu hjálparskjölin um hvernig dulritunarforritið virkar, og dæmi um hvaða uppsetningar eru studdar.",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Til að yfirfæra í annan gagnagrunn skaltu nota skipanalínutólið: 'occ db:convert-type', eða lesa <a target=\"_blank\" href=\"%s\">hjálparskjölin ↗</a>.",
+    "This app has no minimum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Þetta vorrit er ekki með tiltekna neina lágmarksútgáfu Nextcloud. Þetta mun gefa villu í Nextcloud 11 og nýrri.",
+    "This app has no maximum Nextcloud version assigned. This will be an error in Nextcloud 11 and later." : "Þetta vorrit er ekki með tiltekna neina hámarksútgáfu Nextcloud. Þetta mun gefa villu í Nextcloud 11 og nýrri.",
+    "If you want to support the project\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://help.nextcloud.com/\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">help other users</a>!" : "Ef þú vilt styðja við verkefnið\n\t\t<a href=\"https://nextcloud.com/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">taktu þátt í þróuninni</a>\n\t\teða\n\t\t<a href=\"https://help.nextcloud.com\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hjálpaðu öðrum notendum</a>!",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Þróað af {communityopen}Nextcloud samfélaginu{linkclose}, {githubopen}grunnkóðinn{linkclose} er gefinn út með {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} notkunarleyfinu."
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index c8074efdbd6..3ab6ec1d5bb 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -98,6 +98,10 @@ OC.L10N.register(
     "Android Client" : "Cliente Android",
     "Sync client - {os}" : "Sincronizar cliente - {os}",
     "This session" : "Esta sessão",
+    "Copied!" : "Copiado!",
+    "Not supported!" : "Não Suportado!",
+    "Press ⌘-C to copy." : "Pressione ⌘-C para copiar",
+    "Press Ctrl-C to copy." : "Pressione Ctrl+C para copiar",
     "Error while loading browser sessions and device tokens" : "Erro durante carregamento de sessões do navegador e tokens de dispositivos",
     "Error while creating device token" : "Erro ao criar token de dispositivo",
     "Error while deleting the token" : "Erro ao excluir o token",
@@ -321,6 +325,15 @@ OC.L10N.register(
     "change full name" : "alterar nome completo",
     "set new password" : "definir nova senha",
     "change email address" : "Trocar o endereço de email",
-    "Default" : "Padrão"
+    "Default" : "Padrão",
+    "no group" : "nenhum grupo",
+    "add group" : "adicionar grupo",
+    "Add Group" : "Adicionar grupo",
+    "Default Quota" : "Quota Padrão",
+    "Full Name" : "Nome Completo",
+    "Group Admin for" : "Grupo Admin para",
+    "Storage Location" : "Local de Armazenamento",
+    "User Backend" : "Administrador do Usuário",
+    "Last Login" : "Último Login"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index c0e3fe7be15..29cfaf218bb 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -96,6 +96,10 @@
     "Android Client" : "Cliente Android",
     "Sync client - {os}" : "Sincronizar cliente - {os}",
     "This session" : "Esta sessão",
+    "Copied!" : "Copiado!",
+    "Not supported!" : "Não Suportado!",
+    "Press ⌘-C to copy." : "Pressione ⌘-C para copiar",
+    "Press Ctrl-C to copy." : "Pressione Ctrl+C para copiar",
     "Error while loading browser sessions and device tokens" : "Erro durante carregamento de sessões do navegador e tokens de dispositivos",
     "Error while creating device token" : "Erro ao criar token de dispositivo",
     "Error while deleting the token" : "Erro ao excluir o token",
@@ -319,6 +323,15 @@
     "change full name" : "alterar nome completo",
     "set new password" : "definir nova senha",
     "change email address" : "Trocar o endereço de email",
-    "Default" : "Padrão"
+    "Default" : "Padrão",
+    "no group" : "nenhum grupo",
+    "add group" : "adicionar grupo",
+    "Add Group" : "Adicionar grupo",
+    "Default Quota" : "Quota Padrão",
+    "Full Name" : "Nome Completo",
+    "Group Admin for" : "Grupo Admin para",
+    "Storage Location" : "Local de Armazenamento",
+    "User Backend" : "Administrador do Usuário",
+    "Last Login" : "Último Login"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php
index a96661e5de1..ccbd0b7df80 100644
--- a/settings/templates/settings.development.notice.php
+++ b/settings/templates/settings.development.notice.php
@@ -1,6 +1,4 @@
-<?php
-/** @var \OCP\IL10N $l */
-if (OC_Util::getEditionString() === ''): ?>
+<?php if (OC_Util::getEditionString() === ''): ?>
 	<p>
 		<?php print_unescaped(str_replace(
 			[
@@ -18,4 +16,52 @@ if (OC_Util::getEditionString() === ''): ?>
 			$l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.')
 		)); ?>
 	</p>
+
+	<p class="social-button">
+		<?php print_unescaped(str_replace(
+			[
+				'{googleimage}',
+				'{facebookimage}',
+				'{twitterimage}',
+				'{rssimage}',
+				'{mailimage}',
+				'{googleopen}',
+				'{facebookopen}',
+				'{twitteropen}',
+				'{rssopen}',
+				'{newsletteropen}',	
+				'{linkclose}',
+				'{googletext}',
+				'{facebooktext}',
+				'{twittertext}',
+				'{rsstext}',
+				'{mailtext}',
+			],
+			[
+				image_path('core', 'googleplus.svg'),
+				image_path('core', 'facebook.svg'),
+				image_path('core', 'twitter.svg'),
+				image_path('core', 'rss.svg'),
+				image_path('core', 'mail.svg'),
+				'<a target="_blank" rel="noreferrer noopener" href="https://plus.google.com/b/104036748063781940910/104036748063781940910/about">',
+				'<a target="_blank" rel="noreferrer noopener" href="https://www.facebook.com/Nextcloud-1032807203462807/">',
+				'<a target="_blank" rel="noreferrer noopener" href="https://twitter.com/nextclouders">',
+				'<a target="_blank" rel="noreferrer noopener" href="https://nextcloud.com/blogfeed">',
+				'<a target="_blank" rel="noreferrer noopener" href="https://newsletter.nextcloud.com/?p=subscribe&amp;id=1">',
+				'</a>',
+				$l->t('Follow us on Google Plus!'),
+				$l->t('Like our facebook page!'),
+				$l->t('Subscribe to our twitter channel!'),
+				$l->t('Subscribe to our news feed!'),
+				$l->t('Subscribe to our newsletter!'),
+
+			],
+'{googleopen}<img width="50" src="{googleimage}" title="{googletext}" alt="{googletext}">{linkclose}
+{facebookopen}<img width="50" src="{facebookimage}" title="{facebooktext}" alt="{facebooktext}">{linkclose}
+{twitteropen}<img width="50" src="{twitterimage}" title="{twittertext}" alt="{twittertext}">{linkclose}
+{rssopen}<img class="img-circle" width="50" src="{rssimage}" title="{rsstext}" alt="{rsstext}">{linkclose}
+{newsletteropen}<img width="50" src="{mailimage}" title="{mailtext}" alt="{mailtext}">{linkclose}'
+		)); ?>
+	</p>
+
 <?php endif; ?>
diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php
index 937d8aaf17b..d45d0618230 100644
--- a/tests/Core/Controller/AvatarControllerTest.php
+++ b/tests/Core/Controller/AvatarControllerTest.php
@@ -19,6 +19,16 @@
  *
  */
 
+namespace OC\Core\Controller;
+
+/**
+ * Overwrite is_uploaded_file in the OC\Core\Controller namespace to allow
+ * proper unit testing of the postAvatar call.
+ */
+function is_uploaded_file($filename) {
+	return file_exists($filename);
+}
+
 namespace Tests\Core\Controller;
 
 use OC\Core\Application;
@@ -32,14 +42,6 @@ use Punic\Exception;
 use Test\Traits\UserTrait;
 
 /**
- * Overwrite is_uploaded_file in this namespace to allow proper unit testing of 
- * the postAvatar call.
- */
-function is_uploaded_file($filename) {
-	return file_exists($filename);
-}
-
-/**
  * Class AvatarControllerTest
  *
  * @group DB
@@ -68,19 +70,19 @@ class AvatarControllerTest extends \Test\TestCase {
 		$app = new Application;
 		$this->container = $app->getContainer();
 		$this->container['AppName'] = 'core';
-		$this->container['AvatarManager'] = $this->getMock('OCP\IAvatarManager');
+		$this->container['AvatarManager'] = $this->getMockBuilder('OCP\IAvatarManager')->getMock();
 		$this->container['Cache'] = $this->getMockBuilder('OC\Cache\File')
 			->disableOriginalConstructor()->getMock();
-		$this->container['L10N'] = $this->getMock('OCP\IL10N');
+		$this->container['L10N'] = $this->getMockBuilder('OCP\IL10N')->getMock();
 		$this->container['L10N']->method('t')->will($this->returnArgument(0));
-		$this->container['UserManager'] = $this->getMock('OCP\IUserManager');
-		$this->container['UserSession'] = $this->getMock('OCP\IUserSession');
-		$this->container['Request'] = $this->getMock('OCP\IRequest');
-		$this->container['UserFolder'] = $this->getMock('OCP\Files\Folder');
-		$this->container['Logger'] = $this->getMock('OCP\ILogger');
+		$this->container['UserManager'] = $this->getMockBuilder('OCP\IUserManager')->getMock();
+		$this->container['UserSession'] = $this->getMockBuilder('OCP\IUserSession')->getMock();
+		$this->container['Request'] = $this->getMockBuilder('OCP\IRequest')->getMock();
+		$this->container['UserFolder'] = $this->getMockBuilder('OCP\Files\Folder')->getMock();
+		$this->container['Logger'] = $this->getMockBuilder('OCP\ILogger')->getMock();
 
-		$this->avatarMock = $this->getMock('OCP\IAvatar');
-		$this->userMock = $this->getMock('OCP\IUser');
+		$this->avatarMock = $this->getMockBuilder('OCP\IAvatar')->getMock();
+		$this->userMock = $this->getMockBuilder('OCP\IUser')->getMock();
 
 		$this->avatarController = $this->container['AvatarController'];
 
@@ -91,7 +93,7 @@ class AvatarControllerTest extends \Test\TestCase {
 			->willReturnMap([['userId', $this->userMock]]);
 		$this->container['UserSession']->method('getUser')->willReturn($this->userMock);
 
-		$this->avatarFile = $this->getMock('OCP\Files\File');
+		$this->avatarFile = $this->getMockBuilder('OCP\Files\File')->getMock();
 		$this->avatarFile->method('getContent')->willReturn('image data');
 		$this->avatarFile->method('getMimeType')->willReturn('image type');
 		$this->avatarFile->method('getEtag')->willReturn('my etag');
@@ -326,7 +328,7 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Test posting avatar from existing folder
 	 */
 	public function testPostAvatarFromNoFile() {
-		$file = $this->getMock('OCP\Files\Node');
+		$file = $this->getMockBuilder('OCP\Files\Node')->getMock();
 		$this->container['UserFolder']
 			->method('get')
 			->with('folder')
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index f09f3c98118..8eaa7c9843b 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -57,14 +57,14 @@ class LoginControllerTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->request = $this->getMock('\\OCP\\IRequest');
-		$this->userManager = $this->getMock('\\OCP\\IUserManager');
-		$this->config = $this->getMock('\\OCP\\IConfig');
-		$this->session = $this->getMock('\\OCP\\ISession');
+		$this->request = $this->getMockBuilder('\\OCP\\IRequest')->getMock();
+		$this->userManager = $this->getMockBuilder('\\OCP\\IUserManager')->getMock();
+		$this->config = $this->getMockBuilder('\\OCP\\IConfig')->getMock();
+		$this->session = $this->getMockBuilder('\\OCP\\ISession')->getMock();
 		$this->userSession = $this->getMockBuilder('\\OC\\User\\Session')
 			->disableOriginalConstructor()
 			->getMock();
-		$this->urlGenerator = $this->getMock('\\OCP\\IURLGenerator');
+		$this->urlGenerator = $this->getMockBuilder('\\OCP\\IURLGenerator')->getMock();
 		$this->twoFactorManager = $this->getMockBuilder('\OC\Authentication\TwoFactorAuth\Manager')
 			->disableOriginalConstructor()
 			->getMock();
@@ -110,7 +110,7 @@ class LoginControllerTest extends TestCase {
 			->method('getCookie')
 			->with('oc_token')
 			->willReturn('MyLoginToken');
-		$user = $this->getMock('\\OCP\\IUser');
+		$user = $this->getMockBuilder('\\OCP\\IUser')->getMock();
 		$user
 			->expects($this->once())
 			->method('getUID')
@@ -181,6 +181,7 @@ class LoginControllerTest extends TestCase {
 				'alt_login' => [],
 				'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
 				'rememberLoginState' => 0,
+				'resetPasswordLink' => null,
 			],
 			'guest'
 		);
@@ -217,7 +218,7 @@ class LoginControllerTest extends TestCase {
 			->method('getSystemValue')
 			->with('lost_password_link')
 			->willReturn(false);
-		$user = $this->getMock('\\OCP\\IUser');
+		$user = $this->getMockBuilder('\\OCP\\IUser')->getMock();
 		$user
 			->expects($this->once())
 			->method('canChangePassword')
@@ -239,6 +240,7 @@ class LoginControllerTest extends TestCase {
 				'alt_login' => [],
 				'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
 				'rememberLoginState' => 0,
+				'resetPasswordLink' => false,
 			],
 			'guest'
 		);
@@ -255,7 +257,7 @@ class LoginControllerTest extends TestCase {
 			->method('getSystemValue')
 			->with('lost_password_link')
 			->willReturn(false);
-		$user = $this->getMock('\\OCP\\IUser');
+		$user = $this->getMockBuilder('\\OCP\\IUser')->getMock();
 		$user
 			->expects($this->once())
 			->method('canChangePassword')
@@ -277,6 +279,7 @@ class LoginControllerTest extends TestCase {
 				'alt_login' => [],
 				'rememberLoginAllowed' => \OC_Util::rememberLoginAllowed(),
 				'rememberLoginState' => 0,
+				'resetPasswordLink' => false,
 			],
 			'guest'
 		);
@@ -292,6 +295,10 @@ class LoginControllerTest extends TestCase {
 			->expects($this->exactly(4))
 			->method('getRemoteAddress')
 			->willReturn('192.168.0.1');
+		$this->request
+			->expects($this->once())
+			->method('passesCSRFCheck')
+			->willReturn(true);
 		$this->throttler
 			->expects($this->exactly(2))
 			->method('sleepDelay')
@@ -322,14 +329,18 @@ class LoginControllerTest extends TestCase {
 
 	public function testLoginWithValidCredentials() {
 		/** @var IUser | \PHPUnit_Framework_MockObject_MockObject $user */
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->getMockBuilder('\OCP\IUser')->getMock();
 		$password = 'secret';
-		$indexPageUrl = 'some url';
+		$indexPageUrl = \OC_Util::getDefaultPageUrl();
 
 		$this->request
 			->expects($this->exactly(2))
 			->method('getRemoteAddress')
 			->willReturn('192.168.0.1');
+		$this->request
+			->expects($this->once())
+			->method('passesCSRFCheck')
+			->willReturn(true);
 		$this->throttler
 			->expects($this->once())
 			->method('sleepDelay')
@@ -352,18 +363,89 @@ class LoginControllerTest extends TestCase {
 			->method('isTwoFactorAuthenticated')
 			->with($user)
 			->will($this->returnValue(false));
-		$this->urlGenerator->expects($this->once())
-			->method('linkToRoute')
-			->with('files.view.index')
-			->will($this->returnValue($indexPageUrl));
 
 		$expected = new \OCP\AppFramework\Http\RedirectResponse($indexPageUrl);
 		$this->assertEquals($expected, $this->loginController->tryLogin($user, $password, null));
 	}
 
+	public function testLoginWithoutPassedCsrfCheckAndNotLoggedIn() {
+		/** @var IUser | \PHPUnit_Framework_MockObject_MockObject $user */
+		$user = $this->getMockBuilder('\OCP\IUser')->getMock();
+		$user->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('jane'));
+		$password = 'secret';
+		$originalUrl = 'another%20url';
+
+		$this->request
+			->expects($this->exactly(2))
+			->method('getRemoteAddress')
+			->willReturn('192.168.0.1');
+		$this->request
+			->expects($this->once())
+			->method('passesCSRFCheck')
+			->willReturn(false);
+		$this->throttler
+			->expects($this->once())
+			->method('sleepDelay')
+			->with('192.168.0.1');
+		$this->throttler
+			->expects($this->once())
+			->method('getDelay')
+			->with('192.168.0.1')
+			->willReturn(200);
+		$this->userSession->expects($this->once())
+			->method('isLoggedIn')
+			->with()
+			->will($this->returnValue(false));
+
+		$expected = new \OCP\AppFramework\Http\RedirectResponse(\OC_Util::getDefaultPageUrl());
+		$this->assertEquals($expected, $this->loginController->tryLogin('Jane', $password, $originalUrl));
+	}
+
+	public function testLoginWithoutPassedCsrfCheckAndLoggedIn() {
+		/** @var IUser | \PHPUnit_Framework_MockObject_MockObject $user */
+		$user = $this->getMockBuilder('\OCP\IUser')->getMock();
+		$user->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('jane'));
+		$password = 'secret';
+		$originalUrl = 'another%20url';
+		$redirectUrl = 'http://localhost/another url';
+
+		$this->request
+			->expects($this->exactly(2))
+			->method('getRemoteAddress')
+			->willReturn('192.168.0.1');
+		$this->request
+			->expects($this->once())
+			->method('passesCSRFCheck')
+			->willReturn(false);
+		$this->throttler
+			->expects($this->once())
+			->method('sleepDelay')
+			->with('192.168.0.1');
+		$this->throttler
+			->expects($this->once())
+			->method('getDelay')
+			->with('192.168.0.1')
+			->willReturn(200);
+		$this->userSession->expects($this->once())
+			->method('isLoggedIn')
+			->with()
+			->will($this->returnValue(true));
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with(urldecode($originalUrl))
+			->will($this->returnValue($redirectUrl));
+
+		$expected = new \OCP\AppFramework\Http\RedirectResponse($redirectUrl);
+		$this->assertEquals($expected, $this->loginController->tryLogin('Jane', $password, $originalUrl));
+	}
+
 	public function testLoginWithValidCredentialsAndRedirectUrl() {
 		/** @var IUser | \PHPUnit_Framework_MockObject_MockObject $user */
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->getMockBuilder('\OCP\IUser')->getMock();
 		$user->expects($this->any())
 			->method('getUID')
 			->will($this->returnValue('jane'));
@@ -375,6 +457,10 @@ class LoginControllerTest extends TestCase {
 			->expects($this->exactly(2))
 			->method('getRemoteAddress')
 			->willReturn('192.168.0.1');
+		$this->request
+			->expects($this->once())
+			->method('passesCSRFCheck')
+			->willReturn(true);
 		$this->throttler
 			->expects($this->once())
 			->method('sleepDelay')
@@ -406,7 +492,7 @@ class LoginControllerTest extends TestCase {
 	
 	public function testLoginWithTwoFactorEnforced() {
 		/** @var IUser | \PHPUnit_Framework_MockObject_MockObject $user */
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->getMockBuilder('\OCP\IUser')->getMock();
 		$user->expects($this->any())
 			->method('getUID')
 			->will($this->returnValue('john'));
@@ -417,6 +503,10 @@ class LoginControllerTest extends TestCase {
 			->expects($this->exactly(2))
 			->method('getRemoteAddress')
 			->willReturn('192.168.0.1');
+		$this->request
+			->expects($this->once())
+			->method('passesCSRFCheck')
+			->willReturn(true);
 		$this->throttler
 			->expects($this->once())
 			->method('sleepDelay')
@@ -453,7 +543,7 @@ class LoginControllerTest extends TestCase {
 
 	public function testToNotLeakLoginName() {
 		/** @var IUser | \PHPUnit_Framework_MockObject_MockObject $user */
-		$user = $this->getMock('\OCP\IUser');
+		$user = $this->getMockBuilder('\OCP\IUser')->getMock();
 		$user->expects($this->any())
 			->method('getUID')
 			->will($this->returnValue('john'));
@@ -479,6 +569,10 @@ class LoginControllerTest extends TestCase {
 			->expects($this->exactly(3))
 			->method('getRemoteAddress')
 			->willReturn('192.168.0.1');
+		$this->request
+			->expects($this->once())
+			->method('passesCSRFCheck')
+			->willReturn(true);
 		$this->throttler
 			->expects($this->once())
 			->method('getDelay')
diff --git a/tests/Settings/Controller/AuthSettingsControllerTest.php b/tests/Settings/Controller/AuthSettingsControllerTest.php
index 1705cb5ddf1..b57aea0930c 100644
--- a/tests/Settings/Controller/AuthSettingsControllerTest.php
+++ b/tests/Settings/Controller/AuthSettingsControllerTest.php
@@ -91,6 +91,7 @@ class AuthSettingsControllerTest extends TestCase {
 				'lastActivity' => null,
 				'type' => null,
 				'canDelete' => false,
+				'current' => true,
 			],
 			[
 				'id' => 200,
diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
index 770d5a4934e..e4f66b5d879 100644
--- a/tests/Settings/Controller/CheckSetupControllerTest.php
+++ b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -37,24 +37,11 @@ use Test\TestCase;
 use OC\IntegrityCheck\Checker;
 
 /**
- * Mock version_compare
- * @param string $version1
- * @param string $version2
- * @return int
- */
-function version_compare($version1, $version2) {
-	return CheckSetupControllerTest::$version_compare;
-}
-
-/**
  * Class CheckSetupControllerTest
  *
  * @package Tests\Settings\Controller
  */
 class CheckSetupControllerTest extends TestCase {
-	/** @var int */
-	public static $version_compare;
-
 	/** @var CheckSetupController */
 	private $checkSetupController;
 	/** @var IRequest */
@@ -111,7 +98,7 @@ class CheckSetupControllerTest extends TestCase {
 				$this->checker,
 				$this->logger
 				])
-			->setMethods(['getCurlVersion'])->getMock();
+			->setMethods(['getCurlVersion', 'isPhpOutdated'])->getMock();
 	}
 
 	public function testIsInternetConnectionWorkingDisabledViaConfig() {
@@ -136,12 +123,8 @@ class CheckSetupControllerTest extends TestCase {
 
 		$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
 			->disableOriginalConstructor()->getMock();
-		$client->expects($this->at(0))
-			->method('get')
-			->with('https://www.owncloud.org/', []);
-		$client->expects($this->at(1))
-			->method('get')
-			->with('http://www.owncloud.org/', []);
+		$client->expects($this->any())
+			->method('get');
 
 		$this->clientService->expects($this->once())
 			->method('newClient')
@@ -156,7 +139,7 @@ class CheckSetupControllerTest extends TestCase {
 		);
 	}
 
-	public function testIsInternetConnectionHttpsFail() {
+	public function testIsInternetConnectionFail() {
 		$this->config->expects($this->once())
 			->method('getSystemValue')
 			->with('has_internet_connection', true)
@@ -164,12 +147,11 @@ class CheckSetupControllerTest extends TestCase {
 
 		$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
 			->disableOriginalConstructor()->getMock();
-		$client->expects($this->at(0))
+		$client->expects($this->any())
 			->method('get')
-			->with('https://www.owncloud.org/', [])
 			->will($this->throwException(new \Exception()));
 
-		$this->clientService->expects($this->once())
+		$this->clientService->expects($this->exactly(3))
 			->method('newClient')
 			->will($this->returnValue($client));
 
@@ -181,33 +163,6 @@ class CheckSetupControllerTest extends TestCase {
 		);
 	}
 
-	public function testIsInternetConnectionHttpFail() {
-		$this->config->expects($this->once())
-			->method('getSystemValue')
-			->with('has_internet_connection', true)
-			->will($this->returnValue(true));
-
-		$client = $this->getMockBuilder('\OCP\Http\Client\IClient')
-			->disableOriginalConstructor()->getMock();
-		$client->expects($this->at(0))
-			->method('get')
-			->with('https://www.owncloud.org/', []);
-		$client->expects($this->at(1))
-			->method('get')
-			->with('http://www.owncloud.org/', [])
-			->will($this->throwException(new \Exception()));
-
-		$this->clientService->expects($this->once())
-			->method('newClient')
-			->will($this->returnValue($client));
-
-		$this->assertFalse(
-			self::invokePrivate(
-				$this->checkSetupController,
-				'isInternetConnectionWorking'
-			)
-		);
-	}
 
 	public function testIsMemcacheConfiguredFalse() {
 		$this->config->expects($this->once())
@@ -238,7 +193,10 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsPhpSupportedFalse() {
-		self::$version_compare = -1;
+		$this->checkSetupController
+			->expects($this->once())
+			->method('isPhpOutdated')
+			->willReturn(true);
 
 		$this->assertEquals(
 			['eol' => true, 'version' => PHP_VERSION],
@@ -247,7 +205,10 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsPhpSupportedTrue() {
-		self::$version_compare = 0;
+		$this->checkSetupController
+			->expects($this->exactly(2))
+			->method('isPhpOutdated')
+			->willReturn(false);
 
 		$this->assertEquals(
 			['eol' => false, 'version' => PHP_VERSION],
@@ -255,8 +216,6 @@ class CheckSetupControllerTest extends TestCase {
 		);
 
 
-		self::$version_compare = 1;
-
 		$this->assertEquals(
 			['eol' => false, 'version' => PHP_VERSION],
 			self::invokePrivate($this->checkSetupController, 'isPhpSupported')
@@ -323,13 +282,17 @@ class CheckSetupControllerTest extends TestCase {
 			->disableOriginalConstructor()->getMock();
 		$client->expects($this->at(0))
 			->method('get')
-			->with('https://www.owncloud.org/', []);
+			->with('http://www.nextcloud.com/', [])
+			->will($this->throwException(new \Exception()));
 		$client->expects($this->at(1))
 			->method('get')
-			->with('http://www.owncloud.org/', [])
+			->with('http://www.google.com/', [])
 			->will($this->throwException(new \Exception()));
-
-		$this->clientService->expects($this->once())
+		$client->expects($this->at(2))
+			->method('get')
+			->with('http://www.github.com/', [])
+			->will($this->throwException(new \Exception()));
+		$this->clientService->expects($this->exactly(3))
 			->method('newClient')
 			->will($this->returnValue($client));
 		$this->urlGenerator->expects($this->at(0))
@@ -340,7 +303,10 @@ class CheckSetupControllerTest extends TestCase {
 			->method('linkToDocs')
 			->with('admin-security')
 			->willReturn('https://doc.owncloud.org/server/8.1/admin_manual/configuration_server/hardening.html');
-		self::$version_compare = -1;
+		$this->checkSetupController
+			->expects($this->once())
+			->method('isPhpOutdated')
+			->willReturn(true);
 		$this->urlGenerator->expects($this->at(2))
 			->method('linkToDocs')
 			->with('admin-reverse-proxy')
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 07de887c8cb..301f63a375d 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -8,9 +8,8 @@
 >
 	<testsuite name='ownCloud'>
 		<directory suffix='.php'>lib/</directory>
-		<directory suffix='.php'>settings/</directory>
-		<directory suffix='.php'>core/</directory>
-		<directory suffix='.php'>ocs-provider/</directory>
+		<directory suffix='.php'>Settings/</directory>
+		<directory suffix='.php'>Core/</directory>
 		<file>apps.php</file>
 	</testsuite>
 	<!-- filters for code coverage -->
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
index 19fa38209a9..d3a5897dfaf 100644
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -2,9 +2,8 @@
 <phpunit bootstrap="bootstrap.php">
 	<testsuite name='ownCloud'>
 		<directory suffix='.php'>lib/</directory>
-		<directory suffix='.php'>settings/</directory>
-		<directory suffix='.php'>core/</directory>
-		<directory suffix='.php'>ocs-provider/</directory>
+		<directory suffix='.php'>Settings/</directory>
+		<directory suffix='.php'>Core/</directory>
 		<file>apps.php</file>
 	</testsuite>
 	<!-- filters for code coverage -->