diff --git a/apps/federatedfilesharing/l10n/nl.js b/apps/federatedfilesharing/l10n/nl.js
index a7f99406a0..60a713ed4b 100644
--- a/apps/federatedfilesharing/l10n/nl.js
+++ b/apps/federatedfilesharing/l10n/nl.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "federatedfilesharing",
     {
-    "Federated sharing" : "Federated sharing",
+    "Federated sharing" : "Gefedereerd delen",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wil je de externe share {name} van {owner}@{remote} toevoegen?",
     "Remote share" : "Externe share",
     "Remote share password" : "Wachtwoord externe share",
@@ -12,7 +12,7 @@ OC.L10N.register(
     "Not supported!" : "Niet ondersteund!",
     "Press ⌘-C to copy." : "Druk op ⌘-C om te kopiëren.",
     "Press Ctrl-C to copy." : "Druk op Ctrl-C om te kopiëren.",
-    "Invalid Federated Cloud ID" : "Ongeldige Federated Cloud ID",
+    "Invalid Federated Cloud ID" : "Ongeldige gefedereerde Cloud ID",
     "Server to server sharing is not enabled on this server" : "Server met server delen is op deze server niet ingeschakeld",
     "Couldn't establish a federated share." : "Kon geen gefedereerde share tot stand brengen",
     "Couldn't establish a federated share, maybe the password was wrong." : "Kon geen gefedereerde share tot stand brengen, misschien was het wachtwoord onjuist.",
@@ -35,8 +35,8 @@ OC.L10N.register(
     "You received {share} as a remote share from {user}" : "Je ontving {share} als een extren deel verzoek van {user}",
     "Accept" : "Accepteren",
     "Decline" : "Afwijzen",
-    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Deel met mij via mijn #Nextcloud federated Cloud ID, zie %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud federated Cloud ID",
+    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID, zie %s",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID",
     "Federated file sharing" : "Gefedereerd bestand delen",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "Open documentation" : "Open documentatie",
@@ -46,8 +46,8 @@ OC.L10N.register(
     "Search global and public address book for users" : "Doorzoeken van openbare adresboeken voor gebruikers",
     "Allow users to publish their data to a global and public address book" : "Publiek maken van data met een openbaar adresboek toestaan",
     "Federated Cloud" : "Gefedereerde Cloud",
-    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Je kunt met iedereeen delen die Nextcloud, ownCloud of Pydio gebruikt! Gebruik gewoon hun federatieID in de deel-dialoog. Het ziet eruit als iemand@cloud.voorbeeld.com",
-    "Your Federated Cloud ID:" : "Je Federated Cloud ID:",
+    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Je kunt met iedereen delen die Nextcloud, ownCloud of Pydio gebruikt! Gebruik simpelweg hun gefedereerde Cloud ID in de deel-dialoog. Het ziet eruit als iemand@cloud.voorbeeld.com",
+    "Your Federated Cloud ID:" : "Je gefedereerde Cloud ID:",
     "Share it so your friends can share files with you:" : "Deel het, zodat anderen bestanden met jou kunnen delen:",
     "Add to your website" : "Toevoegen aan je website",
     "Share with me via Nextcloud" : "Deel met mij via Nextcloud",
diff --git a/apps/federatedfilesharing/l10n/nl.json b/apps/federatedfilesharing/l10n/nl.json
index 5db918b769..9332c1f5d3 100644
--- a/apps/federatedfilesharing/l10n/nl.json
+++ b/apps/federatedfilesharing/l10n/nl.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Federated sharing" : "Federated sharing",
+    "Federated sharing" : "Gefedereerd delen",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wil je de externe share {name} van {owner}@{remote} toevoegen?",
     "Remote share" : "Externe share",
     "Remote share password" : "Wachtwoord externe share",
@@ -10,7 +10,7 @@
     "Not supported!" : "Niet ondersteund!",
     "Press ⌘-C to copy." : "Druk op ⌘-C om te kopiëren.",
     "Press Ctrl-C to copy." : "Druk op Ctrl-C om te kopiëren.",
-    "Invalid Federated Cloud ID" : "Ongeldige Federated Cloud ID",
+    "Invalid Federated Cloud ID" : "Ongeldige gefedereerde Cloud ID",
     "Server to server sharing is not enabled on this server" : "Server met server delen is op deze server niet ingeschakeld",
     "Couldn't establish a federated share." : "Kon geen gefedereerde share tot stand brengen",
     "Couldn't establish a federated share, maybe the password was wrong." : "Kon geen gefedereerde share tot stand brengen, misschien was het wachtwoord onjuist.",
@@ -33,8 +33,8 @@
     "You received {share} as a remote share from {user}" : "Je ontving {share} als een extren deel verzoek van {user}",
     "Accept" : "Accepteren",
     "Decline" : "Afwijzen",
-    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Deel met mij via mijn #Nextcloud federated Cloud ID, zie %s",
-    "Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud federated Cloud ID",
+    "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID, zie %s",
+    "Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud ID",
     "Federated file sharing" : "Gefedereerd bestand delen",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "Open documentation" : "Open documentatie",
@@ -44,8 +44,8 @@
     "Search global and public address book for users" : "Doorzoeken van openbare adresboeken voor gebruikers",
     "Allow users to publish their data to a global and public address book" : "Publiek maken van data met een openbaar adresboek toestaan",
     "Federated Cloud" : "Gefedereerde Cloud",
-    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Je kunt met iedereeen delen die Nextcloud, ownCloud of Pydio gebruikt! Gebruik gewoon hun federatieID in de deel-dialoog. Het ziet eruit als iemand@cloud.voorbeeld.com",
-    "Your Federated Cloud ID:" : "Je Federated Cloud ID:",
+    "You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com" : "Je kunt met iedereen delen die Nextcloud, ownCloud of Pydio gebruikt! Gebruik simpelweg hun gefedereerde Cloud ID in de deel-dialoog. Het ziet eruit als iemand@cloud.voorbeeld.com",
+    "Your Federated Cloud ID:" : "Je gefedereerde Cloud ID:",
     "Share it so your friends can share files with you:" : "Deel het, zodat anderen bestanden met jou kunnen delen:",
     "Add to your website" : "Toevoegen aan je website",
     "Share with me via Nextcloud" : "Deel met mij via Nextcloud",
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index 076b2140fe..7ab696ede4 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -65,6 +65,7 @@ OC.L10N.register(
     "Your storage is almost full ({usedSpacePercent}%)" : "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"],
     "View in folder" : "Vis i mappe",
+    "Copied!" : "Kopieret",
     "Copy direct link (only works for users who have access to this file/folder)" : "Kopier direkte link (virker kun for brugere der har adgang til denne fil/mappe)",
     "Path" : "Sti",
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
@@ -84,6 +85,7 @@ OC.L10N.register(
     "Restored by {user}" : "Gendannet af {user}",
     "Renamed by {user}" : "Omdøbt af {user}",
     "Moved by {user}" : "Flyttet af {user}",
+    "\"remote user\"" : "\"ekstern bruger\"",
     "You created {file}" : "Du har oprettet {file}",
     "{user} created {file}" : "{user} oprettede {file}",
     "{file} was created in a public folder" : "{file} blev oprettet i en offentlig mappe",
@@ -103,6 +105,7 @@ OC.L10N.register(
     "A new file or folder has been <strong>deleted</strong>" : "En ny fil eller mappe er blevet <strong>slettet</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Begræns noter om oprettelse og ændringer af dine <strong>favorit filer</strong> <em>(Kun streaming)</em>",
     "A new file or folder has been <strong>restored</strong>" : "En ny fil eller mappe er blevet <strong>gendannet</strong>",
+    "Unlimited" : "Ubegrænset",
     "Upload (max. %s)" : "Upload (max. %s)",
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Maksimal upload-størrelse",
@@ -110,6 +113,8 @@ OC.L10N.register(
     "Save" : "Gem",
     "With PHP-FPM it might take 5 minutes for changes to be applied." : "Med PHP-FPM kan det tage 5 minuter for ændringerne at blive udført.",
     "Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted",
+    "%s of %s used" : "%s af %s brugt",
+    "%s used" : "%s brugt",
     "Settings" : "Indstillinger",
     "Show hidden files" : "Vis skjulte filer",
     "WebDAV" : "WebDAV",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index 23c3eb8290..5c10d48e6d 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -63,6 +63,7 @@
     "Your storage is almost full ({usedSpacePercent}%)" : "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"],
     "View in folder" : "Vis i mappe",
+    "Copied!" : "Kopieret",
     "Copy direct link (only works for users who have access to this file/folder)" : "Kopier direkte link (virker kun for brugere der har adgang til denne fil/mappe)",
     "Path" : "Sti",
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
@@ -82,6 +83,7 @@
     "Restored by {user}" : "Gendannet af {user}",
     "Renamed by {user}" : "Omdøbt af {user}",
     "Moved by {user}" : "Flyttet af {user}",
+    "\"remote user\"" : "\"ekstern bruger\"",
     "You created {file}" : "Du har oprettet {file}",
     "{user} created {file}" : "{user} oprettede {file}",
     "{file} was created in a public folder" : "{file} blev oprettet i en offentlig mappe",
@@ -101,6 +103,7 @@
     "A new file or folder has been <strong>deleted</strong>" : "En ny fil eller mappe er blevet <strong>slettet</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Begræns noter om oprettelse og ændringer af dine <strong>favorit filer</strong> <em>(Kun streaming)</em>",
     "A new file or folder has been <strong>restored</strong>" : "En ny fil eller mappe er blevet <strong>gendannet</strong>",
+    "Unlimited" : "Ubegrænset",
     "Upload (max. %s)" : "Upload (max. %s)",
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Maksimal upload-størrelse",
@@ -108,6 +111,8 @@
     "Save" : "Gem",
     "With PHP-FPM it might take 5 minutes for changes to be applied." : "Med PHP-FPM kan det tage 5 minuter for ændringerne at blive udført.",
     "Missing permissions to edit from here." : "Rettighed mangler til at redigere på dette sted",
+    "%s of %s used" : "%s af %s brugt",
+    "%s used" : "%s brugt",
     "Settings" : "Indstillinger",
     "Show hidden files" : "Vis skjulte filer",
     "WebDAV" : "WebDAV",
diff --git a/apps/sharebymail/l10n/zh_CN.js b/apps/sharebymail/l10n/zh_CN.js
index e9872e858e..7586c87a06 100644
--- a/apps/sharebymail/l10n/zh_CN.js
+++ b/apps/sharebymail/l10n/zh_CN.js
@@ -5,7 +5,9 @@ OC.L10N.register(
     "Shared with {email}" : "用 {email} 分享",
     "Shared with %1$s by %2$s" : "由 %2$s 共享给 %1$s",
     "Shared with {email} by {actor}" : "由 {actor} 通过 {email} 分享",
+    "Password for mail share sent to %1$s" : "发送给%1$s的邮件共享的密码",
     "Password for mail share sent to {email}" : "Password for mail share sent to {email}",
+    "Password for mail share sent to you" : "发送给您的邮件共享的密码",
     "You shared %1$s with %2$s by mail" : "您通过邮件把 %1$s 分享给了 %2$s",
     "You shared {file} with {email} by mail" : "您通过邮件 {email} 分享了 {file} ",
     "%3$s shared %1$s with %2$s by mail" : "%3$s 通过邮件将 %1$s 分享给了 %2$s",
@@ -15,11 +17,15 @@ OC.L10N.register(
     "Password to access %1$s was sent to you" : "访问 %1$s 的密码已发送给你",
     "Password to access {file} was sent to you" : "访问 {file} 的密码已发送给你",
     "Sharing %s failed, this item is already shared with %s" : "共享 %s 失败, 该项目已经共享于 %s",
+    "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "我们无法将自动生成的密码发送与您。请在您的个人设置中提供有效的邮箱后重试。",
+    "Failed to send share by email" : "通过邮件发送共享失败",
     "%s shared »%s« with you" : "%s 共享 »%s« 与你",
     "%s shared »%s« with you." : "%s 与你分享分享 »%s« ",
     "Click the button below to open it." : "点击下面的按钮打开它。",
     "Open »%s«" : "打开 »%s«",
     "%s via %s" : "%s通过%s",
+    "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s与您共享了%s\n访问链接已另外以邮件方式发送到您的邮箱\n",
+    "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s与您共享了%s。访问链接已另外以邮件方式发送到您的邮箱。",
     "Password to access »%s«" : "访问 »%s« 的密码",
     "This is the password: %s" : "这是密码: %s",
     "You can choose a different password at any time in the share dialog." : "您可以随时在共享对话框中选择不同的密码。",
diff --git a/apps/sharebymail/l10n/zh_CN.json b/apps/sharebymail/l10n/zh_CN.json
index f776b7788a..89be7076f6 100644
--- a/apps/sharebymail/l10n/zh_CN.json
+++ b/apps/sharebymail/l10n/zh_CN.json
@@ -3,7 +3,9 @@
     "Shared with {email}" : "用 {email} 分享",
     "Shared with %1$s by %2$s" : "由 %2$s 共享给 %1$s",
     "Shared with {email} by {actor}" : "由 {actor} 通过 {email} 分享",
+    "Password for mail share sent to %1$s" : "发送给%1$s的邮件共享的密码",
     "Password for mail share sent to {email}" : "Password for mail share sent to {email}",
+    "Password for mail share sent to you" : "发送给您的邮件共享的密码",
     "You shared %1$s with %2$s by mail" : "您通过邮件把 %1$s 分享给了 %2$s",
     "You shared {file} with {email} by mail" : "您通过邮件 {email} 分享了 {file} ",
     "%3$s shared %1$s with %2$s by mail" : "%3$s 通过邮件将 %1$s 分享给了 %2$s",
@@ -13,11 +15,15 @@
     "Password to access %1$s was sent to you" : "访问 %1$s 的密码已发送给你",
     "Password to access {file} was sent to you" : "访问 {file} 的密码已发送给你",
     "Sharing %s failed, this item is already shared with %s" : "共享 %s 失败, 该项目已经共享于 %s",
+    "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "我们无法将自动生成的密码发送与您。请在您的个人设置中提供有效的邮箱后重试。",
+    "Failed to send share by email" : "通过邮件发送共享失败",
     "%s shared »%s« with you" : "%s 共享 »%s« 与你",
     "%s shared »%s« with you." : "%s 与你分享分享 »%s« ",
     "Click the button below to open it." : "点击下面的按钮打开它。",
     "Open »%s«" : "打开 »%s«",
     "%s via %s" : "%s通过%s",
+    "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s与您共享了%s\n访问链接已另外以邮件方式发送到您的邮箱\n",
+    "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s与您共享了%s。访问链接已另外以邮件方式发送到您的邮箱。",
     "Password to access »%s«" : "访问 »%s« 的密码",
     "This is the password: %s" : "这是密码: %s",
     "You can choose a different password at any time in the share dialog." : "您可以随时在共享对话框中选择不同的密码。",
diff --git a/apps/user_ldap/l10n/zh_CN.js b/apps/user_ldap/l10n/zh_CN.js
index c1b6840a39..ff259ae235 100644
--- a/apps/user_ldap/l10n/zh_CN.js
+++ b/apps/user_ldap/l10n/zh_CN.js
@@ -56,6 +56,7 @@ OC.L10N.register(
     "Please login with the new password" : "请使用新密码登录",
     "Your password will expire tomorrow." : "您的密码将在明天过期",
     "Your password will expire today." : "您的明码将在今天过期",
+    "_Your password will expire within %n day._::_Your password will expire within %n days._" : ["您的密码会在%n天后过期"],
     "LDAP / AD integration" : "LDAP / AD 整合",
     "_%s group found_::_%s groups found_" : ["发现 %s 个群组"],
     "_%s user found_::_%s users found_" : ["发现 %s 个用户"],
@@ -87,6 +88,7 @@ OC.L10N.register(
     "Copy current configuration into new directory binding" : "当前配置复制到新目录",
     "Delete the current configuration" : "删除当前配置",
     "Host" : "主机",
+    "You can omit the protocol, unless you require SSL. If so, start with ldaps://" : "您可以省略协议前缀，但如果您要求使用SSL，请确保附加 ldaps:// 前缀",
     "Port" : "端口",
     "Detect Port" : "检测端口",
     "User DN" : "User DN",
diff --git a/apps/user_ldap/l10n/zh_CN.json b/apps/user_ldap/l10n/zh_CN.json
index d4cc793bdb..d238123f81 100644
--- a/apps/user_ldap/l10n/zh_CN.json
+++ b/apps/user_ldap/l10n/zh_CN.json
@@ -54,6 +54,7 @@
     "Please login with the new password" : "请使用新密码登录",
     "Your password will expire tomorrow." : "您的密码将在明天过期",
     "Your password will expire today." : "您的明码将在今天过期",
+    "_Your password will expire within %n day._::_Your password will expire within %n days._" : ["您的密码会在%n天后过期"],
     "LDAP / AD integration" : "LDAP / AD 整合",
     "_%s group found_::_%s groups found_" : ["发现 %s 个群组"],
     "_%s user found_::_%s users found_" : ["发现 %s 个用户"],
@@ -85,6 +86,7 @@
     "Copy current configuration into new directory binding" : "当前配置复制到新目录",
     "Delete the current configuration" : "删除当前配置",
     "Host" : "主机",
+    "You can omit the protocol, unless you require SSL. If so, start with ldaps://" : "您可以省略协议前缀，但如果您要求使用SSL，请确保附加 ldaps:// 前缀",
     "Port" : "端口",
     "Detect Port" : "检测端口",
     "User DN" : "User DN",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 280dbe16a5..bf108e0845 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -178,7 +178,7 @@ OC.L10N.register(
     "Share with other people by entering a user or group or an email address." : "Deel met anderen door het invullen van een gebruiker, groep of een emailadres.",
     "Name or email address..." : "Naam of emailadres...",
     "Name or federated cloud ID..." : "Naam of gefedereerd Cloud ID:",
-    "Name, federated cloud ID or email address..." : "Naam, gefedereed cloud ID of een e-mailadres",
+    "Name, federated cloud ID or email address..." : "Naam, gefedereerde Cloud ID of een e-mailadres",
     "Name..." : "Naam...",
     "Error" : "Fout",
     "Error removing share" : "Fout bij verwijderen gedeelde",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 6c9589b0f4..c3a71c9744 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -176,7 +176,7 @@
     "Share with other people by entering a user or group or an email address." : "Deel met anderen door het invullen van een gebruiker, groep of een emailadres.",
     "Name or email address..." : "Naam of emailadres...",
     "Name or federated cloud ID..." : "Naam of gefedereerd Cloud ID:",
-    "Name, federated cloud ID or email address..." : "Naam, gefedereed cloud ID of een e-mailadres",
+    "Name, federated cloud ID or email address..." : "Naam, gefedereerde Cloud ID of een e-mailadres",
     "Name..." : "Naam...",
     "Error" : "Fout",
     "Error removing share" : "Fout bij verwijderen gedeelde",
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
index 27b66aac25..62bcb4fadd 100644
--- a/lib/l10n/en_GB.js
+++ b/lib/l10n/en_GB.js
@@ -109,7 +109,11 @@ OC.L10N.register(
     "Sharing %s failed, because resharing is not allowed" : "Sharing %s failed, because resharing is not allowed",
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sharing %s failed, because the sharing backend for %s could not find its source",
     "Sharing %s failed, because the file could not be found in the file cache" : "Sharing %s failed, because the file could not be found in the file cache",
+    "Can’t increase permissions of %s" : "Can’t increase permissions of %s",
+    "Files can’t be shared with delete permissions" : "Files can’t be shared with delete permissions",
+    "Files can’t be shared with create permissions" : "Files can’t be shared with create permissions",
     "Expiration date is in the past" : "Expiration date is in the past",
+    "Can’t set expiration date more than %s days in the future" : "Can’t set expiration date more than %s days in the future",
     "The requested share does not exist anymore" : "The requested share does not exist anymore",
     "Could not find category \"%s\"" : "Could not find category \"%s\"",
     "Sunday" : "Sunday",
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
index 57c53d69b4..626ecdff65 100644
--- a/lib/l10n/en_GB.json
+++ b/lib/l10n/en_GB.json
@@ -107,7 +107,11 @@
     "Sharing %s failed, because resharing is not allowed" : "Sharing %s failed, because resharing is not allowed",
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sharing %s failed, because the sharing backend for %s could not find its source",
     "Sharing %s failed, because the file could not be found in the file cache" : "Sharing %s failed, because the file could not be found in the file cache",
+    "Can’t increase permissions of %s" : "Can’t increase permissions of %s",
+    "Files can’t be shared with delete permissions" : "Files can’t be shared with delete permissions",
+    "Files can’t be shared with create permissions" : "Files can’t be shared with create permissions",
     "Expiration date is in the past" : "Expiration date is in the past",
+    "Can’t set expiration date more than %s days in the future" : "Can’t set expiration date more than %s days in the future",
     "The requested share does not exist anymore" : "The requested share does not exist anymore",
     "Could not find category \"%s\"" : "Could not find category \"%s\"",
     "Sunday" : "Sunday",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 97c6835197..a4d338d04c 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -109,7 +109,11 @@ OC.L10N.register(
     "Sharing %s failed, because resharing is not allowed" : "Le partage de %s a échoué car le repartage n'est pas autorisé",
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage de %s a échoué car le service %s n'a pas trouvé sa source..",
     "Sharing %s failed, because the file could not be found in the file cache" : "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.",
+    "Can’t increase permissions of %s" : "Impossible d'augmenter les permissions de %s",
+    "Files can’t be shared with delete permissions" : "Les fichiers ne peuvent pas être partagés avec les autorisations de suppression",
+    "Files can’t be shared with create permissions" : "Les fichiers ne peuvent pas être partagés avec les autorisations de création",
     "Expiration date is in the past" : "La date d'expiration est dans le passé",
+    "Can’t set expiration date more than %s days in the future" : "Impossible de définir la date d'expiration à plus de %s jours dans le futur",
     "The requested share does not exist anymore" : "Le partage demandé n'existe plus",
     "Could not find category \"%s\"" : "Impossible de trouver la catégorie \"%s\"",
     "Sunday" : "Dimanche",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 88cf63fd2d..97686ac9e5 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -107,7 +107,11 @@
     "Sharing %s failed, because resharing is not allowed" : "Le partage de %s a échoué car le repartage n'est pas autorisé",
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage de %s a échoué car le service %s n'a pas trouvé sa source..",
     "Sharing %s failed, because the file could not be found in the file cache" : "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.",
+    "Can’t increase permissions of %s" : "Impossible d'augmenter les permissions de %s",
+    "Files can’t be shared with delete permissions" : "Les fichiers ne peuvent pas être partagés avec les autorisations de suppression",
+    "Files can’t be shared with create permissions" : "Les fichiers ne peuvent pas être partagés avec les autorisations de création",
     "Expiration date is in the past" : "La date d'expiration est dans le passé",
+    "Can’t set expiration date more than %s days in the future" : "Impossible de définir la date d'expiration à plus de %s jours dans le futur",
     "The requested share does not exist anymore" : "Le partage demandé n'existe plus",
     "Could not find category \"%s\"" : "Impossible de trouver la catégorie \"%s\"",
     "Sunday" : "Dimanche",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 33a052ca2b..fb15af1c90 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -80,7 +80,7 @@ OC.L10N.register(
     "Set an admin username." : "Stel de gebruikersnaam van de beheerder in.",
     "Set an admin password." : "Stel een beheerderswachtwoord in.",
     "Can't create or write into the data directory %s" : "Kan niets creëren of wegschrijven in datadirectory %s",
-    "Invalid Federated Cloud ID" : "Ongeldige Federated Cloud ID",
+    "Invalid Federated Cloud ID" : "Ongeldige gefedereerde Cloud ID",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Delen van %s is mislukt, omdat de share-backend niet toestaat om type %i te delen",
     "Sharing %s failed, because the file does not exist" : "Delen van %s is mislukt, omdat het bestand niet bestaat",
     "You are not allowed to share %s" : "Je bent niet bevoegd om %s te delen",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index ea8db28c96..b90315330d 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -78,7 +78,7 @@
     "Set an admin username." : "Stel de gebruikersnaam van de beheerder in.",
     "Set an admin password." : "Stel een beheerderswachtwoord in.",
     "Can't create or write into the data directory %s" : "Kan niets creëren of wegschrijven in datadirectory %s",
-    "Invalid Federated Cloud ID" : "Ongeldige Federated Cloud ID",
+    "Invalid Federated Cloud ID" : "Ongeldige gefedereerde Cloud ID",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Delen van %s is mislukt, omdat de share-backend niet toestaat om type %i te delen",
     "Sharing %s failed, because the file does not exist" : "Delen van %s is mislukt, omdat het bestand niet bestaat",
     "You are not allowed to share %s" : "Je bent niet bevoegd om %s te delen",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 92dfc3522d..17c2f2d3e3 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -152,6 +152,7 @@ OC.L10N.register(
     "Will be synced to a global and public address book" : "Will be synced to a global and public address book",
     "Verify" : "Verify",
     "Verifying …" : "Verifying …",
+    "An error occured while changing your language. Please reload the page and try again." : "An error occurred while changing your language. Please reload the page and try again.",
     "Select a profile picture" : "Select a profile picture",
     "Very weak password" : "Very weak password",
     "Weak password" : "Weak password",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index ace0ffea02..e561582716 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -150,6 +150,7 @@
     "Will be synced to a global and public address book" : "Will be synced to a global and public address book",
     "Verify" : "Verify",
     "Verifying …" : "Verifying …",
+    "An error occured while changing your language. Please reload the page and try again." : "An error occurred while changing your language. Please reload the page and try again.",
     "Select a profile picture" : "Select a profile picture",
     "Very weak password" : "Very weak password",
     "Weak password" : "Weak password",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index a630c3d4fb..4096d9b8b5 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -152,6 +152,7 @@ OC.L10N.register(
     "Will be synced to a global and public address book" : "Va être synchronisé dans un carnet d'adresse global et public",
     "Verify" : "Vérifier",
     "Verifying …" : "Vérification en cours...",
+    "An error occured while changing your language. Please reload the page and try again." : "Une erreur est survenue lors du changement de votre langue. Merci de recharger la page et de réessayer.",
     "Select a profile picture" : "Selectionnez une photo de profil ",
     "Very weak password" : "Mot de passe de très faible sécurité",
     "Weak password" : "Mot de passe de faible sécurité",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 9bc3bd5708..8d097f0469 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -150,6 +150,7 @@
     "Will be synced to a global and public address book" : "Va être synchronisé dans un carnet d'adresse global et public",
     "Verify" : "Vérifier",
     "Verifying …" : "Vérification en cours...",
+    "An error occured while changing your language. Please reload the page and try again." : "Une erreur est survenue lors du changement de votre langue. Merci de recharger la page et de réessayer.",
     "Select a profile picture" : "Selectionnez une photo de profil ",
     "Very weak password" : "Mot de passe de très faible sécurité",
     "Weak password" : "Mot de passe de faible sécurité",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 3e69105e85..658e2be884 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -23,8 +23,8 @@ OC.L10N.register(
     "Please provide an admin recovery password; otherwise, all user data will be lost." : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
     "Wrong admin recovery password. Please check the password and try again." : "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
     "Backend doesn't support password change, but the user's encryption key was updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
-    "installing and updating apps via the app store or Federated Cloud Sharing" : "installeren en bijwerken applicaties via de app store of gefedereerd cloud delen",
-    "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installeren en bijwerken van applicaties via de app store of gefedereerd delen",
+    "Federated Cloud Sharing" : "Gefedereerd delen via de cloud",
     "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cUrl gebruikt een verouderde %s versie (%s). Werk het besturingssysteem bij, want anders zullen functies als %s niet betrouwbaar werken.",
     "A problem occurred, please check your log files (Error: %s)" : "Er trad een een probleem op, controleer je logbestanden (Fout: %s).",
     "Migration Completed" : "Migratie gereed",
@@ -152,6 +152,7 @@ OC.L10N.register(
     "Will be synced to a global and public address book" : "Wordt gesyncht met een globaal en openbaar adresboek",
     "Verify" : "Verifiëren",
     "Verifying …" : "Verifiëren...",
+    "An error occured while changing your language. Please reload the page and try again." : "Er trad een fout op bij het aanpassen van de taal. Ververs de pagina en probeer het opnieuw.",
     "Select a profile picture" : "Kies een profielafbeelding",
     "Very weak password" : "Zeer zwak wachtwoord",
     "Weak password" : "Zwak wachtwoord",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 27ba239831..692a00e302 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -21,8 +21,8 @@
     "Please provide an admin recovery password; otherwise, all user data will be lost." : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
     "Wrong admin recovery password. Please check the password and try again." : "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
     "Backend doesn't support password change, but the user's encryption key was updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
-    "installing and updating apps via the app store or Federated Cloud Sharing" : "installeren en bijwerken applicaties via de app store of gefedereerd cloud delen",
-    "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installeren en bijwerken van applicaties via de app store of gefedereerd delen",
+    "Federated Cloud Sharing" : "Gefedereerd delen via de cloud",
     "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cUrl gebruikt een verouderde %s versie (%s). Werk het besturingssysteem bij, want anders zullen functies als %s niet betrouwbaar werken.",
     "A problem occurred, please check your log files (Error: %s)" : "Er trad een een probleem op, controleer je logbestanden (Fout: %s).",
     "Migration Completed" : "Migratie gereed",
@@ -150,6 +150,7 @@
     "Will be synced to a global and public address book" : "Wordt gesyncht met een globaal en openbaar adresboek",
     "Verify" : "Verifiëren",
     "Verifying …" : "Verifiëren...",
+    "An error occured while changing your language. Please reload the page and try again." : "Er trad een fout op bij het aanpassen van de taal. Ververs de pagina en probeer het opnieuw.",
     "Select a profile picture" : "Kies een profielafbeelding",
     "Very weak password" : "Zeer zwak wachtwoord",
     "Weak password" : "Zwak wachtwoord",