diff --git a/apps/files/l10n/fi.js b/apps/files/l10n/fi.js
index 557b4e9ff1c194dbac9f5aa1be7a99cf080ebe9e..ae678bb4c89ea60452ca5020308aaf6495b65ac6 100644
--- a/apps/files/l10n/fi.js
+++ b/apps/files/l10n/fi.js
@@ -88,6 +88,8 @@ OC.L10N.register(
     "{user} restored {file}" : "{user} palautti tiedoston {file}",
     "You renamed {oldfile} to {newfile}" : "Uudelleennimesit tiedoston {oldfile} tiedostoksi {newfile}",
     "{user} renamed {oldfile} to {newfile}" : "{user} uudelleennimesi tiedoston {oldfile} tiedostoksi {newfile}",
+    "You moved {oldfile} to {newfile}" : "Siirsit tiedoston {oldfile} tiedostoksi {newfile}",
+    "{user} moved {oldfile} to {newfile}" : "{user} siirsi tiedoston {oldfile} tiedostoksi {newfile}",
     "A file has been added to or removed from your <strong>favorites</strong>" : "Tiedosto on lisätty tai poistettu <strong>suosikeista</strong>",
     "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong> tai se on <strong>uudelleennimetty</strong>",
     "A new file or folder has been <strong>created</strong>" : "Uusi tiedosto tai kansio on <strong>luotu</strong>",
diff --git a/apps/files/l10n/fi.json b/apps/files/l10n/fi.json
index 2224ca4ac24ac26e2ceb9f62833d3474fc04db4f..cef9ff0b63db6755ffb482c9842c8eef3926abd8 100644
--- a/apps/files/l10n/fi.json
+++ b/apps/files/l10n/fi.json
@@ -86,6 +86,8 @@
     "{user} restored {file}" : "{user} palautti tiedoston {file}",
     "You renamed {oldfile} to {newfile}" : "Uudelleennimesit tiedoston {oldfile} tiedostoksi {newfile}",
     "{user} renamed {oldfile} to {newfile}" : "{user} uudelleennimesi tiedoston {oldfile} tiedostoksi {newfile}",
+    "You moved {oldfile} to {newfile}" : "Siirsit tiedoston {oldfile} tiedostoksi {newfile}",
+    "{user} moved {oldfile} to {newfile}" : "{user} siirsi tiedoston {oldfile} tiedostoksi {newfile}",
     "A file has been added to or removed from your <strong>favorites</strong>" : "Tiedosto on lisätty tai poistettu <strong>suosikeista</strong>",
     "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong> tai se on <strong>uudelleennimetty</strong>",
     "A new file or folder has been <strong>created</strong>" : "Uusi tiedosto tai kansio on <strong>luotu</strong>",
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index 3b1839bb4fb9578e43fb4dc342be7bfb6270dc2c..4f1fadc253ef7f2ecc6146557f1d8adb312aa413 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -126,6 +126,6 @@ OC.L10N.register(
     "Delete" : "Verwijder",
     "Allow users to mount external storage" : "Sta gebruikers toe om een externe opslag aan te koppelen",
     "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen",
-    "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de ownCloud server krijgen: {code} {type}"
+    "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de Nextcloud server krijgen: {code} {type}"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index 5ffd6fcd4e39d227fa582640a16b1b7402a12e87..e744f0b9bf3451f2639f65a809284adab8a9a00d 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -124,6 +124,6 @@
     "Delete" : "Verwijder",
     "Allow users to mount external storage" : "Sta gebruikers toe om een externe opslag aan te koppelen",
     "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen",
-    "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de ownCloud server krijgen: {code} {type}"
+    "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de Nextcloud server krijgen: {code} {type}"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 9ccced34f83743b8fe7038d93139c21a9fb840e2..852e6422d4ab1c77016318297725757370d4fbfb 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -78,6 +78,8 @@ OC.L10N.register(
     "Public upload is only possible for publicly shared folders" : "Das öffentliche Hochladen ist nur für öffentlich freigegebene Ordner erlaubt",
     "Invalid date, date format must be YYYY-MM-DD" : "Ungültiges Datum, das Datumsformat muss JJJJ-MM-TT sein",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %s nicht erlaubt.",
+    "You cannot share to a Circle if the app is not enabled" : "Sie können nichts mit einem Kreis teilen, wenn die App nicht aktiviert ist",
+    "Please specify a valid circle" : "Bitte einen gültigen Kreis angeben",
     "Unknown share type" : "Unbekannter Freigabetyp",
     "Not a directory" : "Kein Verzeichnis",
     "Could not lock path" : "Pfad konnte nicht gesperrt werden",
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 3c3612202275a66efe3e9df7b533dc5f8e4373b8..239d639c09faa9f1a92b4d82bea2e434840097c7 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -76,6 +76,8 @@
     "Public upload is only possible for publicly shared folders" : "Das öffentliche Hochladen ist nur für öffentlich freigegebene Ordner erlaubt",
     "Invalid date, date format must be YYYY-MM-DD" : "Ungültiges Datum, das Datumsformat muss JJJJ-MM-TT sein",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %s nicht erlaubt.",
+    "You cannot share to a Circle if the app is not enabled" : "Sie können nichts mit einem Kreis teilen, wenn die App nicht aktiviert ist",
+    "Please specify a valid circle" : "Bitte einen gültigen Kreis angeben",
     "Unknown share type" : "Unbekannter Freigabetyp",
     "Not a directory" : "Kein Verzeichnis",
     "Could not lock path" : "Pfad konnte nicht gesperrt werden",
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index ed3e31dc2d9044e586e7cac0a906c4f2f3940e8b..ca5580237356c6769b52d02759fc6932c3e750ec 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -78,6 +78,8 @@ OC.L10N.register(
     "Public upload is only possible for publicly shared folders" : "Das öffentliche Hochladen ist nur für öffentlich freigegebene Ordner erlaubt",
     "Invalid date, date format must be YYYY-MM-DD" : "Ungültiges Datum, das Datumsformat muss JJJJ-MM-TT sein",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %s nicht erlaubt.",
+    "You cannot share to a Circle if the app is not enabled" : "Sie können nichts mit einem Kreis teilen, wenn die App nicht aktiviert ist",
+    "Please specify a valid circle" : "Bitte einen gültigen Kreis angeben",
     "Unknown share type" : "Unbekannter Freigabetyp",
     "Not a directory" : "Kein Verzeichnis",
     "Could not lock path" : "Pfad konnte nicht gesperrt werden",
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 7a638223db7729f859948ecbba1d51bd9bb37f7f..3f8f02c8cc7127649a7679327179bad7ff0d5a63 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -76,6 +76,8 @@
     "Public upload is only possible for publicly shared folders" : "Das öffentliche Hochladen ist nur für öffentlich freigegebene Ordner erlaubt",
     "Invalid date, date format must be YYYY-MM-DD" : "Ungültiges Datum, das Datumsformat muss JJJJ-MM-TT sein",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Freigabe von %s fehlgeschlagen, da das Backend die Freigabe vom Typ %s nicht erlaubt.",
+    "You cannot share to a Circle if the app is not enabled" : "Sie können nichts mit einem Kreis teilen, wenn die App nicht aktiviert ist",
+    "Please specify a valid circle" : "Bitte einen gültigen Kreis angeben",
     "Unknown share type" : "Unbekannter Freigabetyp",
     "Not a directory" : "Kein Verzeichnis",
     "Could not lock path" : "Pfad konnte nicht gesperrt werden",
diff --git a/apps/files_sharing/l10n/fi.js b/apps/files_sharing/l10n/fi.js
index e8cc78564de0e6e4fdf21b2c9746f574ab7c20a9..f01506bd9ae2d9e6dad9e4525ff34455583323bb 100644
--- a/apps/files_sharing/l10n/fi.js
+++ b/apps/files_sharing/l10n/fi.js
@@ -78,6 +78,8 @@ OC.L10N.register(
     "Public upload is only possible for publicly shared folders" : "Julkinen lähettäminen on mahdollista vain julkisesti jaetuille kansioille",
     "Invalid date, date format must be YYYY-MM-DD" : "Virheellinen päiväys, päivämäärän muodon tulee olla YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Kohteen %s jakaminen epäonnistui, koska tietovarasto ei salli %s tyyppisiä jakoja",
+    "You cannot share to a Circle if the app is not enabled" : "Et voi jakaa piiriin, jos sovellusta ei ole aktivoitu",
+    "Please specify a valid circle" : "Määritä kelvollinen piiri",
     "Unknown share type" : "Tuntematon jaon tyyppi",
     "Not a directory" : "Ei hakemisto",
     "Could not lock path" : "Polun lukitseminen ei onnistunut",
diff --git a/apps/files_sharing/l10n/fi.json b/apps/files_sharing/l10n/fi.json
index 79844b4ec407d16a1d0b107ee894ebeab97a17b5..46adb12ec206207d569dc2aa64996e9a8dc217ff 100644
--- a/apps/files_sharing/l10n/fi.json
+++ b/apps/files_sharing/l10n/fi.json
@@ -76,6 +76,8 @@
     "Public upload is only possible for publicly shared folders" : "Julkinen lähettäminen on mahdollista vain julkisesti jaetuille kansioille",
     "Invalid date, date format must be YYYY-MM-DD" : "Virheellinen päiväys, päivämäärän muodon tulee olla YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Kohteen %s jakaminen epäonnistui, koska tietovarasto ei salli %s tyyppisiä jakoja",
+    "You cannot share to a Circle if the app is not enabled" : "Et voi jakaa piiriin, jos sovellusta ei ole aktivoitu",
+    "Please specify a valid circle" : "Määritä kelvollinen piiri",
     "Unknown share type" : "Tuntematon jaon tyyppi",
     "Not a directory" : "Ei hakemisto",
     "Could not lock path" : "Polun lukitseminen ei onnistunut",
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 12b86dc8596f7548bfe88dea4e8538b3088130b6..02b84a578ff3ab02d82b7fafc1c9764959a6c5a3 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -78,6 +78,8 @@ OC.L10N.register(
     "Public upload is only possible for publicly shared folders" : "Le téléversement public est possible uniquement pour les dossiers partagés publiquement",
     "Invalid date, date format must be YYYY-MM-DD" : "Date invalide, le format doit être YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Le partage %s a échoué parce que l'infrastructure n'autorise pas les partages du type %s",
+    "You cannot share to a Circle if the app is not enabled" : "Vous ne pouvez pas partager au Cercle si l'application n'est pas activée",
+    "Please specify a valid circle" : "Veuillez entrer un cercle valide",
     "Unknown share type" : "Type de partage inconnu",
     "Not a directory" : "N'est pas un répertoire",
     "Could not lock path" : "Impossible de verrouiller le chemin",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index b2b5d6df901e0dd8c51979381f9a0dff38f11943..0a964b80a30f6e96088ded1ac8055087a19f9629 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -76,6 +76,8 @@
     "Public upload is only possible for publicly shared folders" : "Le téléversement public est possible uniquement pour les dossiers partagés publiquement",
     "Invalid date, date format must be YYYY-MM-DD" : "Date invalide, le format doit être YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Le partage %s a échoué parce que l'infrastructure n'autorise pas les partages du type %s",
+    "You cannot share to a Circle if the app is not enabled" : "Vous ne pouvez pas partager au Cercle si l'application n'est pas activée",
+    "Please specify a valid circle" : "Veuillez entrer un cercle valide",
     "Unknown share type" : "Type de partage inconnu",
     "Not a directory" : "N'est pas un répertoire",
     "Could not lock path" : "Impossible de verrouiller le chemin",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index f7a536df5477033e85379f38764aa71c6ddc36ce..ef423765e86cb37dc84991b6c9c19336efe98255 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -78,6 +78,8 @@ OC.L10N.register(
     "Public upload is only possible for publicly shared folders" : "Publieke upload is alleen mogelijk voor publiek gedeelde mappen",
     "Invalid date, date format must be YYYY-MM-DD" : "Ongeldige datum, datumnotatie moet in de vorm YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Delen van %s mislukte omdat de backend het delen van type %s niet ondersteunt",
+    "You cannot share to a Circle if the app is not enabled" : "Je kunt niets met een cirkel delen als de app aan staat.",
+    "Please specify a valid circle" : "Geef een geldige circel op",
     "Unknown share type" : "Onbekend type share",
     "Not a directory" : "Geen directory",
     "Could not lock path" : "Kon pad niet blokkeren",
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index 1ad55cd928e22af93ec192761c90a8851a570d02..918e8506218750b3646a2c8bb18bd02821df6d29 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -76,6 +76,8 @@
     "Public upload is only possible for publicly shared folders" : "Publieke upload is alleen mogelijk voor publiek gedeelde mappen",
     "Invalid date, date format must be YYYY-MM-DD" : "Ongeldige datum, datumnotatie moet in de vorm YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Delen van %s mislukte omdat de backend het delen van type %s niet ondersteunt",
+    "You cannot share to a Circle if the app is not enabled" : "Je kunt niets met een cirkel delen als de app aan staat.",
+    "Please specify a valid circle" : "Geef een geldige circel op",
     "Unknown share type" : "Onbekend type share",
     "Not a directory" : "Geen directory",
     "Could not lock path" : "Kon pad niet blokkeren",
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index 13e7f36881816298aaa66a2349475ed90f89c268..69c0d0fde9ea8709206ef9459562628c366b5f53 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -78,6 +78,8 @@ OC.L10N.register(
     "Public upload is only possible for publicly shared folders" : "Herkese açık yükleme ancak herkese açık paylaşılmış klasörlere yapılabilir",
     "Invalid date, date format must be YYYY-MM-DD" : "Tarih geçersiz. Tarih biçimi YYYY-AA-GG olmalıdır",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Arka uç %s türündeki paylaşımlara izin vermediğinden %s paylaşılamadı",
+    "You cannot share to a Circle if the app is not enabled" : "Uygulama etkinleştirilmemiş ise bir Çevre ile paylaşamazsınız",
+    "Please specify a valid circle" : "Lütfen geçerli bir çevre belirtin",
     "Unknown share type" : "Paylaşım türü bilinmiyor",
     "Not a directory" : "Bir klasör değil",
     "Could not lock path" : "Yol kilitlenemedi",
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index 5ab885517bbcc51f5972a30736bee7f1c0c3b618..228e127b94d26d5cbb213c5b87830d3fdf08339c 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -76,6 +76,8 @@
     "Public upload is only possible for publicly shared folders" : "Herkese açık yükleme ancak herkese açık paylaşılmış klasörlere yapılabilir",
     "Invalid date, date format must be YYYY-MM-DD" : "Tarih geçersiz. Tarih biçimi YYYY-AA-GG olmalıdır",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Arka uç %s türündeki paylaşımlara izin vermediğinden %s paylaşılamadı",
+    "You cannot share to a Circle if the app is not enabled" : "Uygulama etkinleştirilmemiş ise bir Çevre ile paylaşamazsınız",
+    "Please specify a valid circle" : "Lütfen geçerli bir çevre belirtin",
     "Unknown share type" : "Paylaşım türü bilinmiyor",
     "Not a directory" : "Bir klasör değil",
     "Could not lock path" : "Yol kilitlenemedi",
diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js
index 8a51fd65abc1cd4bdcbdd0ba00333633982cc625..c56ee3fb36d737a9bb7f83b6f1f708b4f126af31 100644
--- a/apps/files_sharing/l10n/zh_CN.js
+++ b/apps/files_sharing/l10n/zh_CN.js
@@ -78,6 +78,8 @@ OC.L10N.register(
     "Public upload is only possible for publicly shared folders" : "公共上传仅适用于公共共享文件夹",
     "Invalid date, date format must be YYYY-MM-DD" : "无效的日期，日期格式必须是 YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "共享 %s 失败，后端不允许共享 %s 类型",
+    "You cannot share to a Circle if the app is not enabled" : "如果这个应用程序不可用，你不能分享到圈子",
+    "Please specify a valid circle" : "请指明一个可用圈子",
     "Unknown share type" : "未知共享类型",
     "Not a directory" : "不是一个目录",
     "Could not lock path" : "无法锁定路径",
diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json
index 1dfebb078d608985c04b955730db42f3fe1cbc75..8d6ff8115f30bfd0e38bf768c087dbaa85593fce 100644
--- a/apps/files_sharing/l10n/zh_CN.json
+++ b/apps/files_sharing/l10n/zh_CN.json
@@ -76,6 +76,8 @@
     "Public upload is only possible for publicly shared folders" : "公共上传仅适用于公共共享文件夹",
     "Invalid date, date format must be YYYY-MM-DD" : "无效的日期，日期格式必须是 YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "共享 %s 失败，后端不允许共享 %s 类型",
+    "You cannot share to a Circle if the app is not enabled" : "如果这个应用程序不可用，你不能分享到圈子",
+    "Please specify a valid circle" : "请指明一个可用圈子",
     "Unknown share type" : "未知共享类型",
     "Not a directory" : "不是一个目录",
     "Could not lock path" : "无法锁定路径",
diff --git a/apps/theming/l10n/fi.js b/apps/theming/l10n/fi.js
new file mode 100644
index 0000000000000000000000000000000000000000..cd9b98d29d7353bdef60608313f8fba16de9f51b
--- /dev/null
+++ b/apps/theming/l10n/fi.js
@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "theming",
+    {
+    "Admin" : "Ylläpito",
+    "a safe home for all your data" : "turvallinen koti kaikille tiedostoillesi",
+    "The given name is too long" : "Nimi on liian pitkä",
+    "The given web address is too long" : "Verkko-osoite on liian pitkä",
+    "The given slogan is too long" : "Slogani on liian pitkä",
+    "The given color is invalid" : "Väri on virheellinen",
+    "Saved" : "Tallennettu",
+    "No file uploaded" : "Ei tiedostoa lähetetty",
+    "Unsupported image type" : "Ei-tuettu kuvatiedostomuoto",
+    "You are already using a custom theme" : "Käytät jo kustomoitua ulkoasua",
+    "Theming" : "Ulkoasu",
+    "Name" : "Nimi",
+    "reset to default" : "palauta oletukseksi",
+    "Web address" : "Verkko-osoite",
+    "Web address https://…" : "Verkko-osoite https://...",
+    "Slogan" : "Slogani",
+    "Color" : "Väri",
+    "Logo" : "Logo",
+    "Upload new logo" : "Lähetä uusi logo",
+    "Login image" : "Kirjautumissivun kuva",
+    "Upload new login background" : "Lähetä uusi kirjautumissivun taustakuva",
+    "Log in image" : "Kirjautumissivun kuva"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/theming/l10n/fi.json b/apps/theming/l10n/fi.json
new file mode 100644
index 0000000000000000000000000000000000000000..d4577c727dd99e152293a8cb6d3909ff63b6d57f
--- /dev/null
+++ b/apps/theming/l10n/fi.json
@@ -0,0 +1,25 @@
+{ "translations": {
+    "Admin" : "Ylläpito",
+    "a safe home for all your data" : "turvallinen koti kaikille tiedostoillesi",
+    "The given name is too long" : "Nimi on liian pitkä",
+    "The given web address is too long" : "Verkko-osoite on liian pitkä",
+    "The given slogan is too long" : "Slogani on liian pitkä",
+    "The given color is invalid" : "Väri on virheellinen",
+    "Saved" : "Tallennettu",
+    "No file uploaded" : "Ei tiedostoa lähetetty",
+    "Unsupported image type" : "Ei-tuettu kuvatiedostomuoto",
+    "You are already using a custom theme" : "Käytät jo kustomoitua ulkoasua",
+    "Theming" : "Ulkoasu",
+    "Name" : "Nimi",
+    "reset to default" : "palauta oletukseksi",
+    "Web address" : "Verkko-osoite",
+    "Web address https://…" : "Verkko-osoite https://...",
+    "Slogan" : "Slogani",
+    "Color" : "Väri",
+    "Logo" : "Logo",
+    "Upload new logo" : "Lähetä uusi logo",
+    "Login image" : "Kirjautumissivun kuva",
+    "Upload new login background" : "Lähetä uusi kirjautumissivun taustakuva",
+    "Log in image" : "Kirjautumissivun kuva"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index 3c1e8483b687a052bb8f33a3f9aa041ee72ab6f2..3b7ba60278addea07da11f4add85d7a679a6055d 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -157,11 +157,11 @@ OC.L10N.register(
     "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standaard wordt de interne gebruikersnaam afgeleid van het UUID attribuut. dat zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft de beperking dat alleen deze tekens zijn toegestaan: [ a-zA-Z0-9_.@- ].  Andere tekens worden vervangen door hun overeenkomstige ASCII-waarde of simpelweg weggelaten. Bij conflicten wordt een nummer toegevoegd/verhoogd. De interne gebruikersnaam wordt gebruikt om een gebruiker intern te identificeren. Het is ook de standaardnaam voor de thuis-map van de gebruiker. Het is ook onderdeel van de externe URLs, bijvoorbeeld voor alle *DAV services. Met deze instelling kan het standaardgedrag worden overschreven. Laat het leeg voor de standaardwerkwijze. Wijzigingen hebben alleen effect voor nieuw gekoppelde (toegevoegde) LDAP gebruikers.",
     "Internal Username Attribute:" : "Interne gebruikersnaam attribuut:",
     "Override UUID detection" : "Negeren UUID detectie",
-    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. Je kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. Je moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standaard wordt het UUID-attribuut automatisch herkend. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. Je kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. Je moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
     "UUID Attribute for Users:" : "UUID attribuut voor gebruikers:",
     "UUID Attribute for Groups:" : "UUID attribuut voor groepen:",
     "Username-LDAP User Mapping" : "Gebruikersnaam-LDAP gebruikers vertaling",
-    "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." : "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
+    "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." : "Gebruikersnamen worden gebruikt om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de gebruikersnaam naar een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne gebruikersnaam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
     "Clear Username-LDAP User Mapping" : "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
     "Clear Groupname-LDAP Group Mapping" : "Leegmaken Groepsnaam-LDAP groep vertaling",
     "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Instellingen geverifieerd, slechts één gebruiker gevonden. Alleen de eerste kan inloggen. Overweeg een krapper filter."
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index a7dbe6a9afbc006e04b1e6e10309dc6da1230290..7c4acecdf8f54691de4cd0489874fdecd4f486a3 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -155,11 +155,11 @@
     "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standaard wordt de interne gebruikersnaam afgeleid van het UUID attribuut. dat zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft de beperking dat alleen deze tekens zijn toegestaan: [ a-zA-Z0-9_.@- ].  Andere tekens worden vervangen door hun overeenkomstige ASCII-waarde of simpelweg weggelaten. Bij conflicten wordt een nummer toegevoegd/verhoogd. De interne gebruikersnaam wordt gebruikt om een gebruiker intern te identificeren. Het is ook de standaardnaam voor de thuis-map van de gebruiker. Het is ook onderdeel van de externe URLs, bijvoorbeeld voor alle *DAV services. Met deze instelling kan het standaardgedrag worden overschreven. Laat het leeg voor de standaardwerkwijze. Wijzigingen hebben alleen effect voor nieuw gekoppelde (toegevoegde) LDAP gebruikers.",
     "Internal Username Attribute:" : "Interne gebruikersnaam attribuut:",
     "Override UUID detection" : "Negeren UUID detectie",
-    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. Je kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. Je moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standaard wordt het UUID-attribuut automatisch herkend. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. Je kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. Je moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
     "UUID Attribute for Users:" : "UUID attribuut voor gebruikers:",
     "UUID Attribute for Groups:" : "UUID attribuut voor groepen:",
     "Username-LDAP User Mapping" : "Gebruikersnaam-LDAP gebruikers vertaling",
-    "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." : "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
+    "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." : "Gebruikersnamen worden gebruikt om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de gebruikersnaam naar een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne gebruikersnaam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
     "Clear Username-LDAP User Mapping" : "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
     "Clear Groupname-LDAP Group Mapping" : "Leegmaken Groepsnaam-LDAP groep vertaling",
     "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Instellingen geverifieerd, slechts één gebruiker gevonden. Alleen de eerste kan inloggen. Overweeg een krapper filter."
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 0a506f2f07876963228849cf729fcc5c61223516..d5bda792b1714e1a293d81347d3bcee1df5b5917 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -152,6 +152,7 @@ OC.L10N.register(
     "{sharee} (group)" : "{sharee} (group)",
     "{sharee} (remote)" : "{sharee} (remote)",
     "{sharee} (email)" : "{sharee} (E-Mail)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "Teilen",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Teile mit Menschen auf anderen Servern unter Verwendung ihrer Federated Cloud ID username@example.com/nextcloud",
     "Share with users or by mail..." : "Mit Benutzern oder per E-Mail teilen…",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 5233e63fa9333decfed9cbca979a24254a0824e3..b7b2318b4949a9cbae7dc9c551e219a7306e3c56 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -150,6 +150,7 @@
     "{sharee} (group)" : "{sharee} (group)",
     "{sharee} (remote)" : "{sharee} (remote)",
     "{sharee} (email)" : "{sharee} (E-Mail)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "Teilen",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Teile mit Menschen auf anderen Servern unter Verwendung ihrer Federated Cloud ID username@example.com/nextcloud",
     "Share with users or by mail..." : "Mit Benutzern oder per E-Mail teilen…",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 7272d038df40f8d8c0011e32347db8bbc5ede005..1a6bf9d802f40638cc9b84b8b5c82048e9f63af0 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -152,6 +152,7 @@ OC.L10N.register(
     "{sharee} (group)" : "{sharee} (Gruppe)",
     "{sharee} (remote)" : "{sharee} (entfernt)",
     "{sharee} (email)" : "{sharee} (E-Mail)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "Teilen",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Teile mit Menschen auf anderen Servern unter Verwendung ihrer Federated Cloud ID username@example.com/nextcloud",
     "Share with users or by mail..." : "Mit Benutzern oder per E-Mail teilen…",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 1c6dfbeb906cea61c41e02cbddb081472293c992..98542ed9a09f449c1d2ac909924d57f0f66aa083 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -150,6 +150,7 @@
     "{sharee} (group)" : "{sharee} (Gruppe)",
     "{sharee} (remote)" : "{sharee} (entfernt)",
     "{sharee} (email)" : "{sharee} (E-Mail)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "Teilen",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Teile mit Menschen auf anderen Servern unter Verwendung ihrer Federated Cloud ID username@example.com/nextcloud",
     "Share with users or by mail..." : "Mit Benutzern oder per E-Mail teilen…",
diff --git a/core/l10n/fi.js b/core/l10n/fi.js
index c9fe61e8368c92aac0e56e43799f2c68f627509b..f85977e625f0213d0b0bf5adaffb4828ac20284f 100644
--- a/core/l10n/fi.js
+++ b/core/l10n/fi.js
@@ -106,7 +106,7 @@ OC.L10N.register(
     "Error" : "Virhe",
     "Error while sharing" : "Virhe jaettaessa",
     "Error while unsharing" : "Virhe jakoa peruttaessa",
-    "Error setting expiration date" : "Virhe vanhenemispäivää asettaessa",
+    "Error setting expiration date" : "Virhe vanhenemispäivää asetettaessa",
     "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
     "Set expiration date" : "Aseta vanhenemispäivä",
     "Expiration" : "Erääntyminen",
diff --git a/core/l10n/fi.json b/core/l10n/fi.json
index 1e46b9e4c6cb5659b3fa1d6e6510630a493da128..c6d69c744e6fc6b1a9122706c4c28fe3ffb4754a 100644
--- a/core/l10n/fi.json
+++ b/core/l10n/fi.json
@@ -104,7 +104,7 @@
     "Error" : "Virhe",
     "Error while sharing" : "Virhe jaettaessa",
     "Error while unsharing" : "Virhe jakoa peruttaessa",
-    "Error setting expiration date" : "Virhe vanhenemispäivää asettaessa",
+    "Error setting expiration date" : "Virhe vanhenemispäivää asetettaessa",
     "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
     "Set expiration date" : "Aseta vanhenemispäivä",
     "Expiration" : "Erääntyminen",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index b1be562e97cfda79a8224d1122015b812a16dc45..6a466e36af3bb3163d2f625af6861485a0bb5921 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -152,6 +152,7 @@ OC.L10N.register(
     "{sharee} (group)" : "{sharee} (groupe)",
     "{sharee} (remote)" : "{sharee} (distant)",
     "{sharee} (email)" : "{sharee} (email)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "Partager",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Partager avec des personnes sur d'autres serveurs en utilisant leur identifiant du Cloud Fédéré (utilisateur@exemple.com/nextcloud)",
     "Share with users or by mail..." : "Partager avec des utilisateurs ou par courriel…",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 4da35aa7f5147cf5e62a402eafacda06476f65c5..306024b43d28490f1138aafc6587968764d5ac76 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -150,6 +150,7 @@
     "{sharee} (group)" : "{sharee} (groupe)",
     "{sharee} (remote)" : "{sharee} (distant)",
     "{sharee} (email)" : "{sharee} (email)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "Partager",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Partager avec des personnes sur d'autres serveurs en utilisant leur identifiant du Cloud Fédéré (utilisateur@exemple.com/nextcloud)",
     "Share with users or by mail..." : "Partager avec des utilisateurs ou par courriel…",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index c3909f6bb3dcf9d31b406c3c2b184de7831f8b90..2fabdf48922342ef9d1b1b67f4be3fa7c19a6d84 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -152,6 +152,7 @@ OC.L10N.register(
     "{sharee} (group)" : "{sharee} (groep)",
     "{sharee} (remote)" : "{sharee} (extern)",
     "{sharee} (email)" : "{sharee} (e-mail)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "Delen",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Delen met mensen op andere servers via hun gefedereerde Cloud ID gebruikersnaam@voorbeeld.nl/nextcloud",
     "Share with users or by mail..." : "Delen met gebruikers per e-mail...",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 7130fb3a555a3f52e59105bc830184b0c0ea2931..10bb842ea83248cb5da39ee8894cd642263774c7 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -150,6 +150,7 @@
     "{sharee} (group)" : "{sharee} (groep)",
     "{sharee} (remote)" : "{sharee} (extern)",
     "{sharee} (email)" : "{sharee} (e-mail)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "Delen",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Delen met mensen op andere servers via hun gefedereerde Cloud ID gebruikersnaam@voorbeeld.nl/nextcloud",
     "Share with users or by mail..." : "Delen met gebruikers per e-mail...",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index b8fb18fc1c0c90d0e248717f9c0a178862b56342..d0ba6edb3176aa14fe84f5c02bd3ba6ec38080e4 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -152,6 +152,7 @@ OC.L10N.register(
     "{sharee} (group)" : "{sharee} (grup)",
     "{sharee} (remote)" : "{sharee} (uzak)",
     "{sharee} (email)" : "{sharee} (e-posta)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "PaylaÅŸ",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Birleşmiş Bulut Kodu ile diğer sunucular üzerindeki kişiler ile paylaş username@example.com/nextcloud",
     "Share with users or by mail..." : "Kullanıcılar ya da e-posta ile paylaş...",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index fcdb6f86d362337e312d918cdacbf9dccab2e3b1..523d98f2efef6c1f3e0ed284b0afd2f7a20c10d3 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -150,6 +150,7 @@
     "{sharee} (group)" : "{sharee} (grup)",
     "{sharee} (remote)" : "{sharee} (uzak)",
     "{sharee} (email)" : "{sharee} (e-posta)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
     "Share" : "PaylaÅŸ",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Birleşmiş Bulut Kodu ile diğer sunucular üzerindeki kişiler ile paylaş username@example.com/nextcloud",
     "Share with users or by mail..." : "Kullanıcılar ya da e-posta ile paylaş...",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 0b3f275377a1488fda3bf4a3bfd4f1651ddb4664..ed13dbc65f243284bfea942d67c222ac8fa9fd79 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -97,6 +97,7 @@ OC.L10N.register(
     "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\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 当前配置为分布式缓存, 但是当前安装的 PHP 模块是 \"memcache\".  \\OC\\Memcache\\Memcached 仅支持 \"memcached\" 而不是 \"memcache\". 点击<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一些文件没有通过完整性检查. 了解如何解决该问题请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">无效的文件列表…</a> / <a href=\"{rescanEndpoint}\">重新扫描…</a>)",
     "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP opcache配置不正确.<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">为更好的性能，我们建议↗</a> 使用下列设置<code>php.ini</code>:",
+    "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP的函数“set_time_limit\"是不可用的，这导致脚本在运行中被中止，暂停你的安装，我们强烈建议你开启这个函数",
     "Error occurred while checking server setup" : "检查服务器设置时出错",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "您的数据目录和文件可从互联网被访问. .htaccess 文件没有工作. 我们强烈建议您在 Web 服务器上配置不可以访问数据目录, 或者将数据目录移动到 Web 服务器根目录之外.",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP 请求头 \"{header}\" 没有配置为 \"{expected}\". 这是一个潜在的安全或隐私风险, 我们建议您调整这项设置.",
@@ -119,6 +120,7 @@ OC.L10N.register(
     "Press ⌘-C to copy." : "按 ⌘ + C 进行复制.",
     "Press Ctrl-C to copy." : "按  Ctrl + C 进行复制.",
     "Resharing is not allowed" : "不允许二次共享",
+    "Share to {name}" : "分享给(name)",
     "Share link" : "分享链接",
     "Link" : "链接",
     "Password protect" : "密码保护",
@@ -150,6 +152,7 @@ OC.L10N.register(
     "{sharee} (group)" : "{sharee} (分组)",
     "{sharee} (remote)" : "{sharee} (外部)",
     "{sharee} (email)" : "{sharee} (邮件)",
+    "{sharee} ({type}, {owner})" : "{share}({type},{owner})",
     "Share" : "分享",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "使用联合云ID与其他服务器的用户分享, 如 用户名@example.com/nextcloud",
     "Share with users or by mail..." : "通过邮件分享...",
@@ -180,6 +183,7 @@ OC.L10N.register(
     "sunny" : "æ™´",
     "Hello {name}, the weather is {weather}" : "您好 {name}, 今天天气是 {weather}",
     "Hello {name}" : "你好 {name}",
+    "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>这是你搜索的结果<script>alert(1)</script></strong>",
     "new" : "新建",
     "_download %n file_::_download %n files_" : ["下载 %n 个文件"],
     "The update is in progress, leaving this page might interrupt the process in some environments." : "正在更新, 在某些环境下离开当前页面可能会中断.",
@@ -189,6 +193,7 @@ OC.L10N.register(
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新不成功. 有关此问题的更多信息请<a href=\"{url}\">查看我们的论坛帖子</a>。",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "升级成功. 请将此问题报告给 <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud 社区</a>.",
     "Continue to Nextcloud" : "继续访问 Nextcloud",
+    "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["升级已经成功，在%n秒内重定向你到Nextcfloud。"],
     "Searching other places" : "搜索其他位置",
     "No search results in other folders for {tag}{filter}{endtag}" : "在其它的文件夹里没有关于{tag}{filter}{endtag}的搜索结果",
     "_{count} search result in another folder_::_{count} search results in other folders_" : ["在其他文件夹中找到 {count} 条搜索结果"],
@@ -243,6 +248,7 @@ OC.L10N.register(
     "Need help?" : "需要帮助?",
     "See the documentation" : "查看文档",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "对于正确的操作, 该应用需要使用 JavaScript. 请 {linkstart}启用 JavaScript{linkend}, 并重新加载页面.",
+    "More apps" : "更多的应用程序",
     "Search" : "搜索",
     "Log out" : "注销",
     "This action requires you to confirm your password:" : "此操作需要确认您的密码:",
@@ -273,7 +279,7 @@ OC.L10N.register(
     "Error while validating your second factor" : "验证您的第二项时出错",
     "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器.",
     "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." : "请联系您的系统管理员. 如果您是系统管理员, 在 config/config.php 文件中设置 \"trusted_domain\". 可以在 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." : "基于您的配置, 作为系统管理员, 您还可以点击下面的按钮来信任该域名. ",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于您的配置, 作为系统管理员, 您还可以点击下面的按钮来信任该域名.",
     "Add \"%s\" as trusted domain" : "添加 \"%s\" 为信任域名",
     "App update required" : "必须的应用更新",
     "%s will be updated to version %s" : "%s 将会更新至版本 %s",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 5db797feca998215bbf7443a0004e8e4bf703cb4..6d535f325244335d5c3dc4c1503a598f74e9b43e 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -95,6 +95,7 @@
     "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\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 当前配置为分布式缓存, 但是当前安装的 PHP 模块是 \"memcache\".  \\OC\\Memcache\\Memcached 仅支持 \"memcached\" 而不是 \"memcache\". 点击<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki</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\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一些文件没有通过完整性检查. 了解如何解决该问题请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">无效的文件列表…</a> / <a href=\"{rescanEndpoint}\">重新扫描…</a>)",
     "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "PHP opcache配置不正确.<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">为更好的性能，我们建议↗</a> 使用下列设置<code>php.ini</code>:",
+    "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "PHP的函数“set_time_limit\"是不可用的，这导致脚本在运行中被中止，暂停你的安装，我们强烈建议你开启这个函数",
     "Error occurred while checking server setup" : "检查服务器设置时出错",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "您的数据目录和文件可从互联网被访问. .htaccess 文件没有工作. 我们强烈建议您在 Web 服务器上配置不可以访问数据目录, 或者将数据目录移动到 Web 服务器根目录之外.",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP 请求头 \"{header}\" 没有配置为 \"{expected}\". 这是一个潜在的安全或隐私风险, 我们建议您调整这项设置.",
@@ -117,6 +118,7 @@
     "Press ⌘-C to copy." : "按 ⌘ + C 进行复制.",
     "Press Ctrl-C to copy." : "按  Ctrl + C 进行复制.",
     "Resharing is not allowed" : "不允许二次共享",
+    "Share to {name}" : "分享给(name)",
     "Share link" : "分享链接",
     "Link" : "链接",
     "Password protect" : "密码保护",
@@ -148,6 +150,7 @@
     "{sharee} (group)" : "{sharee} (分组)",
     "{sharee} (remote)" : "{sharee} (外部)",
     "{sharee} (email)" : "{sharee} (邮件)",
+    "{sharee} ({type}, {owner})" : "{share}({type},{owner})",
     "Share" : "分享",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "使用联合云ID与其他服务器的用户分享, 如 用户名@example.com/nextcloud",
     "Share with users or by mail..." : "通过邮件分享...",
@@ -178,6 +181,7 @@
     "sunny" : "æ™´",
     "Hello {name}, the weather is {weather}" : "您好 {name}, 今天天气是 {weather}",
     "Hello {name}" : "你好 {name}",
+    "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>这是你搜索的结果<script>alert(1)</script></strong>",
     "new" : "新建",
     "_download %n file_::_download %n files_" : ["下载 %n 个文件"],
     "The update is in progress, leaving this page might interrupt the process in some environments." : "正在更新, 在某些环境下离开当前页面可能会中断.",
@@ -187,6 +191,7 @@
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新不成功. 有关此问题的更多信息请<a href=\"{url}\">查看我们的论坛帖子</a>。",
     "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "升级成功. 请将此问题报告给 <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud 社区</a>.",
     "Continue to Nextcloud" : "继续访问 Nextcloud",
+    "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["升级已经成功，在%n秒内重定向你到Nextcfloud。"],
     "Searching other places" : "搜索其他位置",
     "No search results in other folders for {tag}{filter}{endtag}" : "在其它的文件夹里没有关于{tag}{filter}{endtag}的搜索结果",
     "_{count} search result in another folder_::_{count} search results in other folders_" : ["在其他文件夹中找到 {count} 条搜索结果"],
@@ -241,6 +246,7 @@
     "Need help?" : "需要帮助?",
     "See the documentation" : "查看文档",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "对于正确的操作, 该应用需要使用 JavaScript. 请 {linkstart}启用 JavaScript{linkend}, 并重新加载页面.",
+    "More apps" : "更多的应用程序",
     "Search" : "搜索",
     "Log out" : "注销",
     "This action requires you to confirm your password:" : "此操作需要确认您的密码:",
@@ -271,7 +277,7 @@
     "Error while validating your second factor" : "验证您的第二项时出错",
     "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器.",
     "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." : "请联系您的系统管理员. 如果您是系统管理员, 在 config/config.php 文件中设置 \"trusted_domain\". 可以在 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." : "基于您的配置, 作为系统管理员, 您还可以点击下面的按钮来信任该域名. ",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于您的配置, 作为系统管理员, 您还可以点击下面的按钮来信任该域名.",
     "Add \"%s\" as trusted domain" : "添加 \"%s\" 为信任域名",
     "App update required" : "必须的应用更新",
     "%s will be updated to version %s" : "%s 将会更新至版本 %s",
diff --git a/lib/l10n/fi.js b/lib/l10n/fi.js
index 4de820bf9ec012c9c6af2898611c5b6bdca48d2d..65732ed842d0c0e10a1b0c11b57273976b69115a 100644
--- a/lib/l10n/fi.js
+++ b/lib/l10n/fi.js
@@ -83,6 +83,7 @@ OC.L10N.register(
     "Not allowed to create a federated share with the same user" : "Saman käyttäjän kanssa ei ole sallittua luoda federoitua jakoa",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Kohteen %s jakaminen epäonnistui, kohdetta %s ei löytynyt. Kenties palvelin ei ole juuri nyt tavoitettavissa.",
     "Setting permissions for %s failed, because the item was not found" : "Kohteen %s oikeuksien asettaminen epäonnistui, koska kohdetta ei löytynyt",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Vanhenemispäivää ei voi asettaa. Jako ei voi vanhentua myöhemmin kuin %s päivää sen jälkeen kun se on jaettu",
     "Cannot set expiration date. Expiration date is in the past" : "Vanhenemispäivää ei voi asettaa. Vanhenemispäivä on jo mennyt",
     "Cannot clear expiration date. Shares are required to have an expiration date." : "Vanhenemispäivän tyhjentäminen ei onnistu. Jaoille on määritelty pakolliseksi vanhenemispäivä.",
     "Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt",
diff --git a/lib/l10n/fi.json b/lib/l10n/fi.json
index 8eacf86bc21b8647fc2c033ae1c87e73299977ee..13dceee1c69b80f58a135c7467ee557f7df76537 100644
--- a/lib/l10n/fi.json
+++ b/lib/l10n/fi.json
@@ -81,6 +81,7 @@
     "Not allowed to create a federated share with the same user" : "Saman käyttäjän kanssa ei ole sallittua luoda federoitua jakoa",
     "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Kohteen %s jakaminen epäonnistui, kohdetta %s ei löytynyt. Kenties palvelin ei ole juuri nyt tavoitettavissa.",
     "Setting permissions for %s failed, because the item was not found" : "Kohteen %s oikeuksien asettaminen epäonnistui, koska kohdetta ei löytynyt",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Vanhenemispäivää ei voi asettaa. Jako ei voi vanhentua myöhemmin kuin %s päivää sen jälkeen kun se on jaettu",
     "Cannot set expiration date. Expiration date is in the past" : "Vanhenemispäivää ei voi asettaa. Vanhenemispäivä on jo mennyt",
     "Cannot clear expiration date. Shares are required to have an expiration date." : "Vanhenemispäivän tyhjentäminen ei onnistu. Jaoille on määritelty pakolliseksi vanhenemispäivä.",
     "Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt",
diff --git a/settings/l10n/fi.js b/settings/l10n/fi.js
index 8dcb4c71f6a93e6fe68d8b84471c05ef68e461f0..5b7f0edc7d7a5c57e5119d204f3871ca2cb204b3 100644
--- a/settings/l10n/fi.js
+++ b/settings/l10n/fi.js
@@ -123,9 +123,12 @@ OC.L10N.register(
     "undo" : "kumoa",
     "never" : "ei koskaan",
     "deleted {userName}" : "poistettu {userName}",
+    "Unable to add user to group {group}" : "Käyttäjän lisääminen ryhmään {group} ei onnistunut",
+    "Unable to remove user from group {group}" : "Käyttäjän poistaminen ryhmästä {group} ei onnistunut",
     "Add group" : "Lisää ryhmä",
     "Password successfully changed" : "Salasana vaihdettiin onnistuneesti",
     "Changing the password will result in data loss, because data recovery is not available for this user" : "Salasanan muuttaminen johtaa tietojen häviämiseen, koska tietojen palautusta ei ole käytettävissä tämän käyttäjän kohdalla",
+    "Could not change the users email" : "Käyttäjän sähköpostiosoitteen vaihtaminen epäonnistui",
     "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
     "Error creating user: {message}" : "Virhe käyttäjää luotaessa: {message}",
     "A valid password must be provided" : "Anna kelvollinen salasana",
diff --git a/settings/l10n/fi.json b/settings/l10n/fi.json
index 3a1864168ad1d28560cc920d72f9d26d6b7536da..1fe33446fd3accae9cf7ce93021c3352aaa3fb3a 100644
--- a/settings/l10n/fi.json
+++ b/settings/l10n/fi.json
@@ -121,9 +121,12 @@
     "undo" : "kumoa",
     "never" : "ei koskaan",
     "deleted {userName}" : "poistettu {userName}",
+    "Unable to add user to group {group}" : "Käyttäjän lisääminen ryhmään {group} ei onnistunut",
+    "Unable to remove user from group {group}" : "Käyttäjän poistaminen ryhmästä {group} ei onnistunut",
     "Add group" : "Lisää ryhmä",
     "Password successfully changed" : "Salasana vaihdettiin onnistuneesti",
     "Changing the password will result in data loss, because data recovery is not available for this user" : "Salasanan muuttaminen johtaa tietojen häviämiseen, koska tietojen palautusta ei ole käytettävissä tämän käyttäjän kohdalla",
+    "Could not change the users email" : "Käyttäjän sähköpostiosoitteen vaihtaminen epäonnistui",
     "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
     "Error creating user: {message}" : "Virhe käyttäjää luotaessa: {message}",
     "A valid password must be provided" : "Anna kelvollinen salasana",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index abd0926de5611507bbb4fed6fdadb2a95a50ebff..b64cf2088a2c00b8441cebc4573271b74a189f25 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -377,7 +377,7 @@ OC.L10N.register(
     "Group" : "Gruppo",
     "Default Quota" : "Quota predefinita",
     "Full Name" : "Nome completo",
-    "Group Admin for" : "Gruppo di amministrazione per",
+    "Group Admin for" : "Amministratore per il gruppo",
     "Storage Location" : "Posizione di archiviazione",
     "User Backend" : "Motore utente",
     "Last Login" : "Ultimo accesso"
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index c9953f5619d02942dae6ff2d706e74b4c66c6f8d..b4eb459c8694f07eb69f472c72c9f970f096eb73 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -375,7 +375,7 @@
     "Group" : "Gruppo",
     "Default Quota" : "Quota predefinita",
     "Full Name" : "Nome completo",
-    "Group Admin for" : "Gruppo di amministrazione per",
+    "Group Admin for" : "Amministratore per il gruppo",
     "Storage Location" : "Posizione di archiviazione",
     "User Backend" : "Motore utente",
     "Last Login" : "Ultimo accesso"
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index acb7f4eecc03a9639bd8e938ed6438823b24a4b2..6b9c7d0957836a31c9e2a635f2fb3d95451bc9f8 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -20,6 +20,7 @@ OC.L10N.register(
     "Unable to add group." : "Kan de groep niet toevoegen.",
     "Unable to delete group." : "Kan de groep niet verwijderen.",
     "test email settings" : "test e-mailinstellingen",
+    "Mail could not be sent. Check your mail server log" : "E-mail kon niet verzonden worden. Kijk de logs na van je e-mail server",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Er ontstond een probleem bij het versturen van de e-mail. Controleer je instellingen.  (Fout: %s)",
     "Email sent" : "E-mail verzonden",
     "You need to set your user email before being able to send test emails." : "Je moet je e-mailadres invoeren voordat je testberichten kunt versturen.",
@@ -194,7 +195,7 @@ OC.L10N.register(
     "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.",
     "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten je uw systeem te installeren om een van de volgende talen te ondersteunen: %s.",
-    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je ownCloud (aanbevolen: \"%s\") ",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je installatie (aanbevolen: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"%s\">log</a>." : "Lees de   <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"%s\">logging</a>.",
     "All checks passed." : "Alle checks geslaagd",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 7684b6ebc390afe7103a3a4e480334076b0c1117..f4e68caf16e1f08ea2e178952adeaf3c4e47e9c9 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -18,6 +18,7 @@
     "Unable to add group." : "Kan de groep niet toevoegen.",
     "Unable to delete group." : "Kan de groep niet verwijderen.",
     "test email settings" : "test e-mailinstellingen",
+    "Mail could not be sent. Check your mail server log" : "E-mail kon niet verzonden worden. Kijk de logs na van je e-mail server",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Er ontstond een probleem bij het versturen van de e-mail. Controleer je instellingen.  (Fout: %s)",
     "Email sent" : "E-mail verzonden",
     "You need to set your user email before being able to send test emails." : "Je moet je e-mailadres invoeren voordat je testberichten kunt versturen.",
@@ -192,7 +193,7 @@
     "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.",
     "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten je uw systeem te installeren om een van de volgende talen te ondersteunen: %s.",
-    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je ownCloud (aanbevolen: \"%s\") ",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als je installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou je de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van je installatie (aanbevolen: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
     "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"%s\">log</a>." : "Lees de   <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"%s\">logging</a>.",
     "All checks passed." : "Alle checks geslaagd",