[tx-robot] updated from transifex

64 files changed, 950 insertions, 234 deletions

diff --git a/apps/dav/l10n/en_GB.js b/apps/dav/l10n/en_GB.js
new file mode 100644
index 00000000000..5d754ffe653
--- /dev/null
+++ b/apps/dav/l10n/en_GB.js
@@ -0,0 +1,50 @@
+OC.L10N.register(
+    "dav",
+    {
+    "Calendar" : "Calendar",
+    "Todos" : "Todos",
+    "{actor} created calendar {calendar}" : "{actor} created calendar {calendar}",
+    "You created calendar {calendar}" : "You created calendar {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} deleted calendar {calendar}",
+    "You deleted calendar {calendar}" : "You deleted calendar {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} updated calendar {calendar}",
+    "You updated calendar {calendar}" : "You updated calendar {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} shared calendar {calendar} with you",
+    "You shared calendar {calendar} with {user}" : "You shared calendar {calendar} with {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} shared calendar {calendar} with {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} unshared calendar {calendar} from you",
+    "You unshared calendar {calendar} from {user}" : "You unshared calendar {calendar} from {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} unshared calendar {calendar} from {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} unshared calendar {calendar} from themselves",
+    "You shared calendar {calendar} with group {group}" : "You shared calendar {calendar} with group {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} shared calendar {calendar} with group {group}",
+    "You unshared calendar {calendar} from group {group}" : "You unshared calendar {calendar} from group {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} unshared calendar {calendar} from group {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} created event {event} in calendar {calendar}",
+    "You created event {event} in calendar {calendar}" : "You created event {event} in calendar {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} deleted event {event} from calendar {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "You deleted event {event} from calendar {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} updated event {event} in calendar {calendar}",
+    "You updated event {event} in calendar {calendar}" : "You updated event {event} in calendar {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} created todo {todo} in list {calendar}",
+    "You created todo {todo} in list {calendar}" : "You created todo {todo} in list {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} deleted todo {todo} from list {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "You deleted todo {todo} from list {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} updated todo {todo} in list {calendar}",
+    "You updated todo {todo} in list {calendar}" : "You updated todo {todo} in list {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} solved todo {todo} in list {calendar}",
+    "You solved todo {todo} in list {calendar}" : "You solved todo {todo} in list {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reopened todo {todo} in list {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "You reopened todo {todo} in list {calendar}",
+    "A <strong>calendar</strong> was modified" : "A <strong>calendar</strong> was modified",
+    "A calendar <strong>event</strong> was modified" : "A calendar <strong>event</strong> was modified",
+    "A calendar <strong>todo</strong> was modified" : "A calendar <strong>todo</strong> was modified",
+    "Contact birthdays" : "Contact birthdays",
+    "Personal" : "Personal",
+    "Contacts" : "Contacts",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/dav/l10n/en_GB.json b/apps/dav/l10n/en_GB.json
new file mode 100644
index 00000000000..88317a81a2e
--- /dev/null
+++ b/apps/dav/l10n/en_GB.json
@@ -0,0 +1,48 @@
+{ "translations": {
+    "Calendar" : "Calendar",
+    "Todos" : "Todos",
+    "{actor} created calendar {calendar}" : "{actor} created calendar {calendar}",
+    "You created calendar {calendar}" : "You created calendar {calendar}",
+    "{actor} deleted calendar {calendar}" : "{actor} deleted calendar {calendar}",
+    "You deleted calendar {calendar}" : "You deleted calendar {calendar}",
+    "{actor} updated calendar {calendar}" : "{actor} updated calendar {calendar}",
+    "You updated calendar {calendar}" : "You updated calendar {calendar}",
+    "{actor} shared calendar {calendar} with you" : "{actor} shared calendar {calendar} with you",
+    "You shared calendar {calendar} with {user}" : "You shared calendar {calendar} with {user}",
+    "{actor} shared calendar {calendar} with {user}" : "{actor} shared calendar {calendar} with {user}",
+    "{actor} unshared calendar {calendar} from you" : "{actor} unshared calendar {calendar} from you",
+    "You unshared calendar {calendar} from {user}" : "You unshared calendar {calendar} from {user}",
+    "{actor} unshared calendar {calendar} from {user}" : "{actor} unshared calendar {calendar} from {user}",
+    "{actor} unshared calendar {calendar} from themselves" : "{actor} unshared calendar {calendar} from themselves",
+    "You shared calendar {calendar} with group {group}" : "You shared calendar {calendar} with group {group}",
+    "{actor} shared calendar {calendar} with group {group}" : "{actor} shared calendar {calendar} with group {group}",
+    "You unshared calendar {calendar} from group {group}" : "You unshared calendar {calendar} from group {group}",
+    "{actor} unshared calendar {calendar} from group {group}" : "{actor} unshared calendar {calendar} from group {group}",
+    "{actor} created event {event} in calendar {calendar}" : "{actor} created event {event} in calendar {calendar}",
+    "You created event {event} in calendar {calendar}" : "You created event {event} in calendar {calendar}",
+    "{actor} deleted event {event} from calendar {calendar}" : "{actor} deleted event {event} from calendar {calendar}",
+    "You deleted event {event} from calendar {calendar}" : "You deleted event {event} from calendar {calendar}",
+    "{actor} updated event {event} in calendar {calendar}" : "{actor} updated event {event} in calendar {calendar}",
+    "You updated event {event} in calendar {calendar}" : "You updated event {event} in calendar {calendar}",
+    "{actor} created todo {todo} in list {calendar}" : "{actor} created todo {todo} in list {calendar}",
+    "You created todo {todo} in list {calendar}" : "You created todo {todo} in list {calendar}",
+    "{actor} deleted todo {todo} from list {calendar}" : "{actor} deleted todo {todo} from list {calendar}",
+    "You deleted todo {todo} from list {calendar}" : "You deleted todo {todo} from list {calendar}",
+    "{actor} updated todo {todo} in list {calendar}" : "{actor} updated todo {todo} in list {calendar}",
+    "You updated todo {todo} in list {calendar}" : "You updated todo {todo} in list {calendar}",
+    "{actor} solved todo {todo} in list {calendar}" : "{actor} solved todo {todo} in list {calendar}",
+    "You solved todo {todo} in list {calendar}" : "You solved todo {todo} in list {calendar}",
+    "{actor} reopened todo {todo} in list {calendar}" : "{actor} reopened todo {todo} in list {calendar}",
+    "You reopened todo {todo} in list {calendar}" : "You reopened todo {todo} in list {calendar}",
+    "A <strong>calendar</strong> was modified" : "A <strong>calendar</strong> was modified",
+    "A calendar <strong>event</strong> was modified" : "A calendar <strong>event</strong> was modified",
+    "A calendar <strong>todo</strong> was modified" : "A calendar <strong>todo</strong> was modified",
+    "Contact birthdays" : "Contact birthdays",
+    "Personal" : "Personal",
+    "Contacts" : "Contacts",
+    "WebDAV" : "WebDAV",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
index 32621a5ba18..ac668708fa0 100644
--- a/apps/encryption/l10n/en_GB.js
+++ b/apps/encryption/l10n/en_GB.js
@@ -22,15 +22,20 @@ OC.L10N.register(
     "The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.",
     "Private key password successfully updated." : "Private key password updated successfully.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.",
+    "Encryption app is enabled and ready" : "Encryption app is enabled and ready",
     "Bad Signature" : "Bad Signature",
     "Missing Signature" : "Missing Signature",
     "one-time password for server-side-encryption" : "one-time password for server-side-encryption",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.",
+    "Default encryption module" : "Default encryption module",
     "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n",
     "The share will expire on %s." : "The share will expire on %s.",
     "Cheers!" : "Cheers!",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption app is enabled but your keys are not initialised, please log-out and log-in again",
     "Encrypt the home storage" : "Encrypt the home storage",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted",
     "Enable recovery key" : "Enable recovery key",
@@ -43,6 +48,7 @@ OC.L10N.register(
     "New recovery key password" : "New recovery key password",
     "Repeat new recovery key password" : "Repeat new recovery key password",
     "Change Password" : "Change Password",
+    "Basic encryption module" : "Basic encryption module",
     "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
     "Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
     " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
index 1b0348768a7..7db53f5938e 100644
--- a/apps/encryption/l10n/en_GB.json
+++ b/apps/encryption/l10n/en_GB.json
@@ -20,15 +20,20 @@
     "The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.",
     "Private key password successfully updated." : "Private key password updated successfully.",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator",
+    "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.",
+    "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again." : "Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.",
+    "Encryption app is enabled and ready" : "Encryption app is enabled and ready",
     "Bad Signature" : "Bad Signature",
     "Missing Signature" : "Missing Signature",
     "one-time password for server-side-encryption" : "one-time password for server-side-encryption",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.",
+    "Default encryption module" : "Default encryption module",
     "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n",
     "The share will expire on %s." : "The share will expire on %s.",
     "Cheers!" : "Cheers!",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption app is enabled but your keys are not initialised, please log-out and log-in again",
     "Encrypt the home storage" : "Encrypt the home storage",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted",
     "Enable recovery key" : "Enable recovery key",
@@ -41,6 +46,7 @@
     "New recovery key password" : "New recovery key password",
     "Repeat new recovery key password" : "Repeat new recovery key password",
     "Change Password" : "Change Password",
+    "Basic encryption module" : "Basic encryption module",
     "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
     "Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
     " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
diff --git a/apps/federatedfilesharing/l10n/en_GB.js b/apps/federatedfilesharing/l10n/en_GB.js
index 89154713a8f..dacbeeabd5b 100644
--- a/apps/federatedfilesharing/l10n/en_GB.js
+++ b/apps/federatedfilesharing/l10n/en_GB.js
@@ -2,26 +2,57 @@ OC.L10N.register(
     "federatedfilesharing",
     {
     "Federated sharing" : "Federated sharing",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Do you want to add the remote share {name} from {owner}@{remote}?",
+    "Remote share" : "Remote share",
+    "Remote share password" : "Remote share password",
+    "Cancel" : "Cancel",
+    "Add remote share" : "Add remote share",
+    "Copy" : "Copy",
+    "Copied!" : "Copied!",
+    "Not supported!" : "Not supported!",
+    "Press ⌘-C to copy." : "Press ⌘-C to copy.",
+    "Press Ctrl-C to copy." : "Press Ctrl-C to copy.",
     "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID",
+    "Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server",
+    "Couldn't establish a federated share." : "Couldn't establish a federated share.",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Couldn't establish a federated share, maybe the password was wrong.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Federated Share request was successful, you will receive a invitation. Check your notifications.",
+    "The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.",
+    "Not allowed to create a federated share with the owner." : "Not allowed to create a federated share with the owner.",
+    "Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate",
+    "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong",
+    "Storage not valid" : "Storage not valid",
+    "Federated Share successfully added" : "Federated Share successfully added",
+    "Couldn't add remote share" : "Couldn't add remote share",
     "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
     "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",
     "File is already shared with %s" : "File is already shared with %s",
-    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable.",
-    "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)",
-    "You received \"/%3$s\" as a remote share from %1$s" : "You received \"/%3$s\" as a remote share from %1$s",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate.",
+    "Could not find share" : "Could not find share",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)",
+    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "You received {share} as a remote share from {user} (on behalf of {behalf})",
+    "You received \"%3$s\" as a remote share from %1$s" : "You received \"%3$s\" as a remote share from %1$s",
+    "You received {share} as a remote share from {user}" : "You received {share} as a remote share from {user}",
     "Accept" : "Accept",
     "Decline" : "Decline",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Share with me through my #Nextcloud Federated Cloud ID, see %s",
     "Share with me through my #Nextcloud Federated Cloud ID" : "Share with me through my #Nextcloud Federated Cloud ID",
+    "Federated file sharing" : "Federated file sharing",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "Open documentation" : "Open documentation",
+    "Adjust how people can share between servers." : "Adjust how people can share between servers.",
     "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers",
     "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers",
+    "Search global and public address book for users and let local users publish their data" : "Search global and public address book for users and let local users publish their data",
+    "Allow users to publish their data to a global and public address book" : "Allow users to publish their data to a global and public address book",
     "Federated Cloud" : "Federated 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" : "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",
     "Your Federated Cloud ID:" : "Your Federated Cloud ID:",
-    "Share it:" : "Share it:",
+    "Share it so your friends can share files with you:" : "Share it so your friends can share files with you:",
     "Add to your website" : "Add to your website",
     "Share with me via Nextcloud" : "Share with me via Nextcloud",
-    "HTML Code:" : "HTML Code:"
+    "HTML Code:" : "HTML Code:",
+    "Search global and public address book for users" : "Search global and public address book for users",
+    "Share it:" : "Share it:"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/federatedfilesharing/l10n/en_GB.json b/apps/federatedfilesharing/l10n/en_GB.json
index 99080bbd766..a168322f98e 100644
--- a/apps/federatedfilesharing/l10n/en_GB.json
+++ b/apps/federatedfilesharing/l10n/en_GB.json
@@ -1,25 +1,56 @@
 { "translations": {
     "Federated sharing" : "Federated sharing",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Do you want to add the remote share {name} from {owner}@{remote}?",
+    "Remote share" : "Remote share",
+    "Remote share password" : "Remote share password",
+    "Cancel" : "Cancel",
+    "Add remote share" : "Add remote share",
+    "Copy" : "Copy",
+    "Copied!" : "Copied!",
+    "Not supported!" : "Not supported!",
+    "Press ⌘-C to copy." : "Press ⌘-C to copy.",
+    "Press Ctrl-C to copy." : "Press Ctrl-C to copy.",
     "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID",
+    "Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server",
+    "Couldn't establish a federated share." : "Couldn't establish a federated share.",
+    "Couldn't establish a federated share, maybe the password was wrong." : "Couldn't establish a federated share, maybe the password was wrong.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Federated Share request was successful, you will receive a invitation. Check your notifications.",
+    "The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.",
+    "Not allowed to create a federated share with the owner." : "Not allowed to create a federated share with the owner.",
+    "Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate",
+    "Could not authenticate to remote share, password might be wrong" : "Could not authenticate to remote share, password might be wrong",
+    "Storage not valid" : "Storage not valid",
+    "Federated Share successfully added" : "Federated Share successfully added",
+    "Couldn't add remote share" : "Couldn't add remote share",
     "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
     "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",
     "File is already shared with %s" : "File is already shared with %s",
-    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable.",
-    "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "You received \"/%3$s\" as a remote share from %1$s (on behalf of %2$s)",
-    "You received \"/%3$s\" as a remote share from %1$s" : "You received \"/%3$s\" as a remote share from %1$s",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate.",
+    "Could not find share" : "Could not find share",
+    "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)",
+    "You received {share} as a remote share from {user} (on behalf of {behalf})" : "You received {share} as a remote share from {user} (on behalf of {behalf})",
+    "You received \"%3$s\" as a remote share from %1$s" : "You received \"%3$s\" as a remote share from %1$s",
+    "You received {share} as a remote share from {user}" : "You received {share} as a remote share from {user}",
     "Accept" : "Accept",
     "Decline" : "Decline",
     "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Share with me through my #Nextcloud Federated Cloud ID, see %s",
     "Share with me through my #Nextcloud Federated Cloud ID" : "Share with me through my #Nextcloud Federated Cloud ID",
+    "Federated file sharing" : "Federated file sharing",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "Open documentation" : "Open documentation",
+    "Adjust how people can share between servers." : "Adjust how people can share between servers.",
     "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers",
     "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers",
+    "Search global and public address book for users and let local users publish their data" : "Search global and public address book for users and let local users publish their data",
+    "Allow users to publish their data to a global and public address book" : "Allow users to publish their data to a global and public address book",
     "Federated Cloud" : "Federated 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" : "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",
     "Your Federated Cloud ID:" : "Your Federated Cloud ID:",
-    "Share it:" : "Share it:",
+    "Share it so your friends can share files with you:" : "Share it so your friends can share files with you:",
     "Add to your website" : "Add to your website",
     "Share with me via Nextcloud" : "Share with me via Nextcloud",
-    "HTML Code:" : "HTML Code:"
+    "HTML Code:" : "HTML Code:",
+    "Search global and public address book for users" : "Search global and public address book for users",
+    "Share it:" : "Share it:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/federatedfilesharing/l10n/nb.js b/apps/federatedfilesharing/l10n/nb.js
index 88150a1dc4b..406b3e12a63 100644
--- a/apps/federatedfilesharing/l10n/nb.js
+++ b/apps/federatedfilesharing/l10n/nb.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Tjener til tjener deling er ikke aktivert på denne tjeneren",
     "Couldn't establish a federated share." : "Kunne ikke etablere en forent ressurs",
     "Couldn't establish a federated share, maybe the password was wrong." : "Kunne ikke etablere en forent ressurs, kanskje passordet var feil.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Forent ressurs forespørselen var vellykket, du vil motta en invitasjon. Sjekk dine varsler.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Forent ressursforespørsel vellykket, du vil motta en invitasjon. Sjekk varslene dine.",
     "The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.",
     "Not allowed to create a federated share with the owner." : "Ikke tillatt å opprette en forent ressurs med eieren.",
     "Invalid or untrusted SSL certificate" : "Ugyldig eller ikke-klarert SSL-sertifikat",
diff --git a/apps/federatedfilesharing/l10n/nb.json b/apps/federatedfilesharing/l10n/nb.json
index 3095bdf371a..028dc5e5d08 100644
--- a/apps/federatedfilesharing/l10n/nb.json
+++ b/apps/federatedfilesharing/l10n/nb.json
@@ -14,7 +14,7 @@
     "Server to server sharing is not enabled on this server" : "Tjener til tjener deling er ikke aktivert på denne tjeneren",
     "Couldn't establish a federated share." : "Kunne ikke etablere en forent ressurs",
     "Couldn't establish a federated share, maybe the password was wrong." : "Kunne ikke etablere en forent ressurs, kanskje passordet var feil.",
-    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Forent ressurs forespørselen var vellykket, du vil motta en invitasjon. Sjekk dine varsler.",
+    "Federated Share request was successful, you will receive a invitation. Check your notifications." : "Forent ressursforespørsel vellykket, du vil motta en invitasjon. Sjekk varslene dine.",
     "The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.",
     "Not allowed to create a federated share with the owner." : "Ikke tillatt å opprette en forent ressurs med eieren.",
     "Invalid or untrusted SSL certificate" : "Ugyldig eller ikke-klarert SSL-sertifikat",
diff --git a/apps/federatedfilesharing/l10n/ru.js b/apps/federatedfilesharing/l10n/ru.js
index b17c1214559..dfbf06a755a 100644
--- a/apps/federatedfilesharing/l10n/ru.js
+++ b/apps/federatedfilesharing/l10n/ru.js
@@ -46,7 +46,7 @@ OC.L10N.register(
     "Search global and public address book for users and let local users publish their data" : "Поиск пользователей в глобальной и общедоступной адресной книге и резрешение публикации своих данных локальным пользователям ",
     "Allow users to publish their data to a global and public address book" : "Резрешить пользователям публиковать свои данные в глобальной и общедосупной адресной книге",
     "Federated 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" : "Можно поделиться с любым пользователем Nextcloud, ownCloud или Pydio! Просто введите его идентификатор  федеративного облачного хранилища в диалоге предоставления общего доступа. Идектификатор указывается в виде «person@cloud.example.com».",
+    "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" : "Можно поделиться с любым пользователем Nextcloud, ownCloud или Pydio! Просто введите его идентификатор  федеративного облачного хранилища в диалоге предоставления общего доступа. Идентификатор указывается в виде «person@cloud.example.com».",
     "Your Federated Cloud ID:" : "Ваш ID в федерации облачных хранилищ:",
     "Share it so your friends can share files with you:" : "Сообщите его друзьям, что бы они могли поделиться с вами файлами:",
     "Add to your website" : "Добавить к себе на сайт",
diff --git a/apps/federatedfilesharing/l10n/ru.json b/apps/federatedfilesharing/l10n/ru.json
index ac61835fbec..adfa0a811c3 100644
--- a/apps/federatedfilesharing/l10n/ru.json
+++ b/apps/federatedfilesharing/l10n/ru.json
@@ -44,7 +44,7 @@
     "Search global and public address book for users and let local users publish their data" : "Поиск пользователей в глобальной и общедоступной адресной книге и резрешение публикации своих данных локальным пользователям ",
     "Allow users to publish their data to a global and public address book" : "Резрешить пользователям публиковать свои данные в глобальной и общедосупной адресной книге",
     "Federated 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" : "Можно поделиться с любым пользователем Nextcloud, ownCloud или Pydio! Просто введите его идентификатор  федеративного облачного хранилища в диалоге предоставления общего доступа. Идектификатор указывается в виде «person@cloud.example.com».",
+    "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" : "Можно поделиться с любым пользователем Nextcloud, ownCloud или Pydio! Просто введите его идентификатор  федеративного облачного хранилища в диалоге предоставления общего доступа. Идентификатор указывается в виде «person@cloud.example.com».",
     "Your Federated Cloud ID:" : "Ваш ID в федерации облачных хранилищ:",
     "Share it so your friends can share files with you:" : "Сообщите его друзьям, что бы они могли поделиться с вами файлами:",
     "Add to your website" : "Добавить к себе на сайт",
diff --git a/apps/federation/l10n/en_GB.js b/apps/federation/l10n/en_GB.js
index 81de668bd36..abb8ae5d351 100644
--- a/apps/federation/l10n/en_GB.js
+++ b/apps/federation/l10n/en_GB.js
@@ -3,11 +3,14 @@ OC.L10N.register(
     {
     "Added to the list of trusted servers" : "Added to the list of trusted servers",
     "Server is already in the list of trusted servers." : "Server is already in the list of trusted servers.",
-    "No server to federate found" : "Could not find server to federate",
+    "No server to federate with found" : "No server to federate with found",
     "Could not add server" : "Could not add server",
     "Federation" : "Federation",
+    "Trusted servers" : "Trusted servers",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation allows you to connect with other trusted servers to exchange the user directory. For example: to auto-complete external users for federated sharing.",
     "Add server automatically once a federated share was created successfully" : "Automatically add server once a federated share is successfully created",
-    "Trusted Servers" : "Trusted Servers"
+    "+ Add trusted server" : "+ Add trusted server",
+    "Trusted server" : "Trusted server",
+    "Add" : "Add"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/federation/l10n/en_GB.json b/apps/federation/l10n/en_GB.json
index 6db5733ed01..f38f2e323af 100644
--- a/apps/federation/l10n/en_GB.json
+++ b/apps/federation/l10n/en_GB.json
@@ -1,11 +1,14 @@
 { "translations": {
     "Added to the list of trusted servers" : "Added to the list of trusted servers",
     "Server is already in the list of trusted servers." : "Server is already in the list of trusted servers.",
-    "No server to federate found" : "Could not find server to federate",
+    "No server to federate with found" : "No server to federate with found",
     "Could not add server" : "Could not add server",
     "Federation" : "Federation",
+    "Trusted servers" : "Trusted servers",
     "Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing." : "Federation allows you to connect with other trusted servers to exchange the user directory. For example: to auto-complete external users for federated sharing.",
     "Add server automatically once a federated share was created successfully" : "Automatically add server once a federated share is successfully created",
-    "Trusted Servers" : "Trusted Servers"
+    "+ Add trusted server" : "+ Add trusted server",
+    "Trusted server" : "Trusted server",
+    "Add" : "Add"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index e3016812b25..0ced0deebbc 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Restored by {user}" : "Wiederhergestellt durch {user}",
     "Renamed by {user}" : "Umbenannt durch {user}",
     "Moved by {user}" : "Verschoben durch {user}",
+    "\"remote user\"" : "„Externer Benutzer“",
     "You created {file}" : "Du hast {file} erstellt",
     "{user} created {file}" : "{user} hat {file} erstellt",
     "{file} was created in a public folder" : "{file} wurde in einem öffentlichen Verzeichnis erstellt",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index 289d851b83e..6965267b895 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -82,6 +82,7 @@
     "Restored by {user}" : "Wiederhergestellt durch {user}",
     "Renamed by {user}" : "Umbenannt durch {user}",
     "Moved by {user}" : "Verschoben durch {user}",
+    "\"remote user\"" : "„Externer Benutzer“",
     "You created {file}" : "Du hast {file} erstellt",
     "{user} created {file}" : "{user} hat {file} erstellt",
     "{file} was created in a public folder" : "{file} wurde in einem öffentlichen Verzeichnis erstellt",
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index 34aeb6355ac..c9c6270df20 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Restored by {user}" : "Wiederhergestellt durch {user}",
     "Renamed by {user}" : "Umbenannt durch {user}",
     "Moved by {user}" : "Verschoben durch {user}",
+    "\"remote user\"" : "„Externer Benutzer“",
     "You created {file}" : "Sie haben {file} erstellt",
     "{user} created {file}" : "{user} hat {file} erstellt",
     "{file} was created in a public folder" : "{file} wurde in einem öffentlichen Ordner erstellt",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index a5c76578bb8..2bd46675bd8 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -82,6 +82,7 @@
     "Restored by {user}" : "Wiederhergestellt durch {user}",
     "Renamed by {user}" : "Umbenannt durch {user}",
     "Moved by {user}" : "Verschoben durch {user}",
+    "\"remote user\"" : "„Externer Benutzer“",
     "You created {file}" : "Sie haben {file} erstellt",
     "{user} created {file}" : "{user} hat {file} erstellt",
     "{file} was created in a public folder" : "{file} wurde in einem öffentlichen Ordner erstellt",
diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js
index 7feab942842..f999ac715f5 100644
--- a/apps/files/l10n/en_GB.js
+++ b/apps/files/l10n/en_GB.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "files",
     {
+    "Storage is temporarily not available" : "Storage is temporarily not available",
     "Storage invalid" : "Storage invalid",
     "Unknown error" : "Unknown error",
     "All files" : "All files",
+    "Recent" : "Recent",
     "File could not be found" : "File could not be found",
     "Home" : "Home",
     "Close" : "Close",
@@ -12,15 +14,20 @@ OC.L10N.register(
     "Upload cancelled." : "Upload cancelled.",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left",
+    "Target folder \"{dir}\" does not exist any more" : "Target folder \"{dir}\" does not exist any more",
+    "Not enough free space" : "Not enough free space",
     "Uploading..." : "Uploading...",
     "..." : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})",
     "Actions" : "Actions",
     "Download" : "Download",
     "Rename" : "Rename",
+    "Move" : "Move",
+    "Target folder" : "Target folder",
     "Delete" : "Delete",
     "Disconnect storage" : "Disconnect storage",
     "Unshare" : "Unshare",
+    "Could not load info for file \"{file}\"" : "Could not load info for file \"{file}\"",
     "Files" : "Files",
     "Details" : "Details",
     "Select" : "Select",
@@ -38,17 +45,20 @@ OC.L10N.register(
     "Could not create file \"{file}\" because it already exists" : "Could not create file \"{file}\" because it already exists",
     "Could not create folder \"{dir}\" because it already exists" : "Could not create folder \"{dir}\" because it already exists",
     "Error deleting file \"{fileName}\"." : "Error deleting file \"{fileName}\".",
+    "No search results in other folders for {tag}{filter}{endtag}" : "No search results in other folders for {tag}{filter}{endtag}",
     "Name" : "Name",
     "Size" : "Size",
     "Modified" : "Modified",
     "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
     "_%n file_::_%n files_" : ["%n file","%n files"],
     "{dirs} and {files}" : "{dirs} and {files}",
+    "_including %n hidden_::_including %n hidden_" : ["including %n hidden","including %n hidden"],
     "You don’t have permission to upload or create files here" : "You don’t have permission to upload or create files here",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploading %n file","Uploading %n files"],
     "New" : "New",
     "\"{name}\" is an invalid file name." : "\"{name}\" is an invalid file name.",
     "File name cannot be empty." : "File name cannot be empty.",
+    "\"{name}\" is not an allowed filetype" : "\"{name}\" is not an allowed filetype",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Storage of {owner} is full, files can not be updated or synced anymore!",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Storage of {owner} is almost full ({usedSpacePercent}%)",
@@ -59,12 +69,41 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favourited",
     "Favorite" : "Favourite",
-    "Folder" : "Folder",
+    "Copy direct link (only works for users who have access to this file/folder)" : "Copy direct link (only works for users who have access to this file/folder)",
     "New folder" : "New folder",
-    "Upload" : "Upload",
+    "Upload file" : "Upload file",
     "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags",
+    "Added to favorites" : "Added to favourites",
+    "Removed from favorites" : "Removed from favourites",
+    "You added {file} to your favorites" : "You added {file} to your favourites",
+    "You removed {file} from your favorites" : "You removed {file} from your favourites",
+    "File changes" : "File changes",
+    "Created by {user}" : "Created by {user}",
+    "Changed by {user}" : "Changed by {user}",
+    "Deleted by {user}" : "Deleted by {user}",
+    "Restored by {user}" : "Restored by {user}",
+    "Renamed by {user}" : "Renamed by {user}",
+    "Moved by {user}" : "Moved by {user}",
+    "\"remote user\"" : "\"remote user\"",
+    "You created {file}" : "You created {file}",
+    "{user} created {file}" : "{user} created {file}",
+    "{file} was created in a public folder" : "{file} was created in a public folder",
+    "You changed {file}" : "You changed {file}",
+    "{user} changed {file}" : "{user} changed {file}",
+    "You deleted {file}" : "You deleted {file}",
+    "{user} deleted {file}" : "{user} deleted {file}",
+    "You restored {file}" : "You restored {file}",
+    "{user} restored {file}" : "{user} restored {file}",
+    "You renamed {oldfile} to {newfile}" : "You renamed {oldfile} to {newfile}",
+    "{user} renamed {oldfile} to {newfile}" : "{user} renamed {oldfile} to {newfile}",
+    "You moved {oldfile} to {newfile}" : "You moved {oldfile} to {newfile}",
+    "{user} moved {oldfile} to {newfile}" : "{user} moved {oldfile} to {newfile}",
+    "A file has been added to or removed from your <strong>favorites</strong>" : "A file has been added to or removed from your <strong>favourites</strong>",
+    "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>",
     "A new file or folder has been <strong>created</strong>" : "A new file or folder has been <strong>created</strong>",
+    "A new file or folder has been <strong>deleted</strong>" : "A new file or folder has been <strong>deleted</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limit notifications about creation and changes to your <strong>favourite files</strong> <em>(Stream only)</em>",
+    "A new file or folder has been <strong>restored</strong>" : "A new file or folder has been <strong>restored</strong>",
     "Upload (max. %s)" : "Upload (max. %s)",
     "File handling" : "File handling",
     "Maximum upload size" : "Maximum upload size",
@@ -82,55 +121,27 @@ OC.L10N.register(
     "Select all" : "Select all",
     "Upload too large" : "Upload too large",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "The files you are trying to upload exceed the maximum size for file uploads on this server.",
-    "No favorites" : "No favourites",
+    "No favorites yet" : "No favourites yet",
     "Files and folders you mark as favorite will show up here" : "Files and folders you mark as favourite will show up here",
+    "Shared with you" : "Shared with you",
+    "Shared with others" : "Shared with others",
+    "Shared by link" : "Shared by link",
+    "Tags" : "Tags",
+    "Deleted files" : "Deleted files",
     "Text file" : "Text file",
     "New text file.txt" : "New text file.txt",
-    "Storage not available" : "Storage not available",
-    "Unable to set upload directory." : "Unable to set upload directory.",
-    "Invalid Token" : "Invalid Token",
-    "No file was uploaded. Unknown error" : "No file was uploaded. Unknown error",
-    "There is no error, the file uploaded with success" : "There is no error, the file uploaded successfully",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
-    "The uploaded file was only partially uploaded" : "The uploaded file was only partially uploaded",
-    "No file was uploaded" : "No file was uploaded",
-    "Missing a temporary folder" : "Missing a temporary folder",
-    "Failed to write to disk" : "Failed to write to disk",
-    "Not enough storage available" : "Not enough storage available",
-    "The target folder has been moved or deleted." : "The target folder has been moved or deleted.",
-    "Upload failed. Could not find uploaded file" : "Upload failed. Could not find uploaded file",
-    "Upload failed. Could not get file info." : "Upload failed. Could not get file info.",
-    "Invalid directory." : "Invalid directory.",
-    "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}",
-    "Error uploading file \"{fileName}\": {message}" : "Error uploading file \"{fileName}\": {message}",
-    "Could not get result from server." : "Could not get result from server.",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left",
+    "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["{hours}:{minutes}:{seconds} hours left","{hours}:{minutes}:{seconds} hours left"],
     "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} left",
+    "_{minutes}:{seconds} minute left_::_{minutes}:{seconds} minutes left_" : ["{minutes}:{seconds} minutes left","{minutes}:{seconds} minutes left"],
     "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} second{plural_s} left",
+    "_{seconds} second left_::_{seconds} seconds left_" : ["{seconds} second left","{seconds} seconds left"],
     "{seconds}s" : "{seconds}s",
     "Any moment now..." : "Any moment now...",
     "Soon..." : "Soon...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
-    "No entries in this folder match '{filter}'" : "No entries in this folder match '{filter}'",
-    "Local link" : "Local link",
-    "{newname} already exists" : "{newname} already exists",
-    "A file or folder has been <strong>changed</strong>" : "A file or folder has been <strong>changed</strong>",
-    "A file or folder has been <strong>deleted</strong>" : "A file or folder has been <strong>deleted</strong>",
-    "A file or folder has been <strong>restored</strong>" : "A file or folder has been <strong>restored</strong>",
-    "You created %1$s" : "You created %1$s",
-    "%2$s created %1$s" : "%2$s created %1$s",
-    "%1$s was created in a public folder" : "%1$s was created in a public folder",
-    "You changed %1$s" : "You changed %1$s",
-    "%2$s changed %1$s" : "%2$s changed %1$s",
-    "You deleted %1$s" : "You deleted %1$s",
-    "%2$s deleted %1$s" : "%2$s deleted %1$s",
-    "You restored %1$s" : "You restored %1$s",
-    "%2$s restored %1$s" : "%2$s restored %1$s",
-    "Changed by %2$s" : "Changed by %2$s",
-    "Deleted by %2$s" : "Deleted by %2$s",
-    "Restored by %2$s" : "Restored by %2$s"
+    "Copy local link" : "Copy local link",
+    "Folder" : "Folder",
+    "Upload" : "Upload",
+    "No favorites" : "No favourites"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json
index 1187441344f..3c4f0bf30ad 100644
--- a/apps/files/l10n/en_GB.json
+++ b/apps/files/l10n/en_GB.json
@@ -1,7 +1,9 @@
 { "translations": {
+    "Storage is temporarily not available" : "Storage is temporarily not available",
     "Storage invalid" : "Storage invalid",
     "Unknown error" : "Unknown error",
     "All files" : "All files",
+    "Recent" : "Recent",
     "File could not be found" : "File could not be found",
     "Home" : "Home",
     "Close" : "Close",
@@ -10,15 +12,20 @@
     "Upload cancelled." : "Upload cancelled.",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left",
+    "Target folder \"{dir}\" does not exist any more" : "Target folder \"{dir}\" does not exist any more",
+    "Not enough free space" : "Not enough free space",
     "Uploading..." : "Uploading...",
     "..." : "...",
     "{loadedSize} of {totalSize} ({bitrate})" : "{loadedSize} of {totalSize} ({bitrate})",
     "Actions" : "Actions",
     "Download" : "Download",
     "Rename" : "Rename",
+    "Move" : "Move",
+    "Target folder" : "Target folder",
     "Delete" : "Delete",
     "Disconnect storage" : "Disconnect storage",
     "Unshare" : "Unshare",
+    "Could not load info for file \"{file}\"" : "Could not load info for file \"{file}\"",
     "Files" : "Files",
     "Details" : "Details",
     "Select" : "Select",
@@ -36,17 +43,20 @@
     "Could not create file \"{file}\" because it already exists" : "Could not create file \"{file}\" because it already exists",
     "Could not create folder \"{dir}\" because it already exists" : "Could not create folder \"{dir}\" because it already exists",
     "Error deleting file \"{fileName}\"." : "Error deleting file \"{fileName}\".",
+    "No search results in other folders for {tag}{filter}{endtag}" : "No search results in other folders for {tag}{filter}{endtag}",
     "Name" : "Name",
     "Size" : "Size",
     "Modified" : "Modified",
     "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
     "_%n file_::_%n files_" : ["%n file","%n files"],
     "{dirs} and {files}" : "{dirs} and {files}",
+    "_including %n hidden_::_including %n hidden_" : ["including %n hidden","including %n hidden"],
     "You don’t have permission to upload or create files here" : "You don’t have permission to upload or create files here",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploading %n file","Uploading %n files"],
     "New" : "New",
     "\"{name}\" is an invalid file name." : "\"{name}\" is an invalid file name.",
     "File name cannot be empty." : "File name cannot be empty.",
+    "\"{name}\" is not an allowed filetype" : "\"{name}\" is not an allowed filetype",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Storage of {owner} is full, files can not be updated or synced anymore!",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Storage of {owner} is almost full ({usedSpacePercent}%)",
@@ -57,12 +67,41 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favourited",
     "Favorite" : "Favourite",
-    "Folder" : "Folder",
+    "Copy direct link (only works for users who have access to this file/folder)" : "Copy direct link (only works for users who have access to this file/folder)",
     "New folder" : "New folder",
-    "Upload" : "Upload",
+    "Upload file" : "Upload file",
     "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags",
+    "Added to favorites" : "Added to favourites",
+    "Removed from favorites" : "Removed from favourites",
+    "You added {file} to your favorites" : "You added {file} to your favourites",
+    "You removed {file} from your favorites" : "You removed {file} from your favourites",
+    "File changes" : "File changes",
+    "Created by {user}" : "Created by {user}",
+    "Changed by {user}" : "Changed by {user}",
+    "Deleted by {user}" : "Deleted by {user}",
+    "Restored by {user}" : "Restored by {user}",
+    "Renamed by {user}" : "Renamed by {user}",
+    "Moved by {user}" : "Moved by {user}",
+    "\"remote user\"" : "\"remote user\"",
+    "You created {file}" : "You created {file}",
+    "{user} created {file}" : "{user} created {file}",
+    "{file} was created in a public folder" : "{file} was created in a public folder",
+    "You changed {file}" : "You changed {file}",
+    "{user} changed {file}" : "{user} changed {file}",
+    "You deleted {file}" : "You deleted {file}",
+    "{user} deleted {file}" : "{user} deleted {file}",
+    "You restored {file}" : "You restored {file}",
+    "{user} restored {file}" : "{user} restored {file}",
+    "You renamed {oldfile} to {newfile}" : "You renamed {oldfile} to {newfile}",
+    "{user} renamed {oldfile} to {newfile}" : "{user} renamed {oldfile} to {newfile}",
+    "You moved {oldfile} to {newfile}" : "You moved {oldfile} to {newfile}",
+    "{user} moved {oldfile} to {newfile}" : "{user} moved {oldfile} to {newfile}",
+    "A file has been added to or removed from your <strong>favorites</strong>" : "A file has been added to or removed from your <strong>favourites</strong>",
+    "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>" : "A file or folder has been <strong>changed</strong> or <strong>renamed</strong>",
     "A new file or folder has been <strong>created</strong>" : "A new file or folder has been <strong>created</strong>",
+    "A new file or folder has been <strong>deleted</strong>" : "A new file or folder has been <strong>deleted</strong>",
     "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Limit notifications about creation and changes to your <strong>favourite files</strong> <em>(Stream only)</em>",
+    "A new file or folder has been <strong>restored</strong>" : "A new file or folder has been <strong>restored</strong>",
     "Upload (max. %s)" : "Upload (max. %s)",
     "File handling" : "File handling",
     "Maximum upload size" : "Maximum upload size",
@@ -80,55 +119,27 @@
     "Select all" : "Select all",
     "Upload too large" : "Upload too large",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "The files you are trying to upload exceed the maximum size for file uploads on this server.",
-    "No favorites" : "No favourites",
+    "No favorites yet" : "No favourites yet",
     "Files and folders you mark as favorite will show up here" : "Files and folders you mark as favourite will show up here",
+    "Shared with you" : "Shared with you",
+    "Shared with others" : "Shared with others",
+    "Shared by link" : "Shared by link",
+    "Tags" : "Tags",
+    "Deleted files" : "Deleted files",
     "Text file" : "Text file",
     "New text file.txt" : "New text file.txt",
-    "Storage not available" : "Storage not available",
-    "Unable to set upload directory." : "Unable to set upload directory.",
-    "Invalid Token" : "Invalid Token",
-    "No file was uploaded. Unknown error" : "No file was uploaded. Unknown error",
-    "There is no error, the file uploaded with success" : "There is no error, the file uploaded successfully",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
-    "The uploaded file was only partially uploaded" : "The uploaded file was only partially uploaded",
-    "No file was uploaded" : "No file was uploaded",
-    "Missing a temporary folder" : "Missing a temporary folder",
-    "Failed to write to disk" : "Failed to write to disk",
-    "Not enough storage available" : "Not enough storage available",
-    "The target folder has been moved or deleted." : "The target folder has been moved or deleted.",
-    "Upload failed. Could not find uploaded file" : "Upload failed. Could not find uploaded file",
-    "Upload failed. Could not get file info." : "Upload failed. Could not get file info.",
-    "Invalid directory." : "Invalid directory.",
-    "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}",
-    "Error uploading file \"{fileName}\": {message}" : "Error uploading file \"{fileName}\": {message}",
-    "Could not get result from server." : "Could not get result from server.",
-    "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} hour{plural_s} left",
+    "_{hours}:{minutes}:{seconds} hour left_::_{hours}:{minutes}:{seconds} hours left_" : ["{hours}:{minutes}:{seconds} hours left","{hours}:{minutes}:{seconds} hours left"],
     "{hours}:{minutes}h" : "{hours}:{minutes}h",
-    "{minutes}:{seconds} minute{plural_s} left" : "{minutes}:{seconds} minute{plural_s} left",
+    "_{minutes}:{seconds} minute left_::_{minutes}:{seconds} minutes left_" : ["{minutes}:{seconds} minutes left","{minutes}:{seconds} minutes left"],
     "{minutes}:{seconds}m" : "{minutes}:{seconds}m",
-    "{seconds} second{plural_s} left" : "{seconds} second{plural_s} left",
+    "_{seconds} second left_::_{seconds} seconds left_" : ["{seconds} second left","{seconds} seconds left"],
     "{seconds}s" : "{seconds}s",
     "Any moment now..." : "Any moment now...",
     "Soon..." : "Soon...",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
-    "No entries in this folder match '{filter}'" : "No entries in this folder match '{filter}'",
-    "Local link" : "Local link",
-    "{newname} already exists" : "{newname} already exists",
-    "A file or folder has been <strong>changed</strong>" : "A file or folder has been <strong>changed</strong>",
-    "A file or folder has been <strong>deleted</strong>" : "A file or folder has been <strong>deleted</strong>",
-    "A file or folder has been <strong>restored</strong>" : "A file or folder has been <strong>restored</strong>",
-    "You created %1$s" : "You created %1$s",
-    "%2$s created %1$s" : "%2$s created %1$s",
-    "%1$s was created in a public folder" : "%1$s was created in a public folder",
-    "You changed %1$s" : "You changed %1$s",
-    "%2$s changed %1$s" : "%2$s changed %1$s",
-    "You deleted %1$s" : "You deleted %1$s",
-    "%2$s deleted %1$s" : "%2$s deleted %1$s",
-    "You restored %1$s" : "You restored %1$s",
-    "%2$s restored %1$s" : "%2$s restored %1$s",
-    "Changed by %2$s" : "Changed by %2$s",
-    "Deleted by %2$s" : "Deleted by %2$s",
-    "Restored by %2$s" : "Restored by %2$s"
+    "Copy local link" : "Copy local link",
+    "Folder" : "Folder",
+    "Upload" : "Upload",
+    "No favorites" : "No favourites"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js
index 0959615638c..f375c5bdd5b 100644
--- a/apps/files/l10n/es_MX.js
+++ b/apps/files/l10n/es_MX.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Restored by {user}" : "Restaurado por {user}",
     "Renamed by {user}" : "Renombrado por {user}",
     "Moved by {user}" : "Movido por {user}",
+    "\"remote user\"" : "\"usuario remoto\"",
     "You created {file}" : "Usted creó {file}",
     "{user} created {file}" : "{user} creó {file}",
     "{file} was created in a public folder" : "{file} fue creado en una carpeta pública",
diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json
index 98746289bb5..0277561114f 100644
--- a/apps/files/l10n/es_MX.json
+++ b/apps/files/l10n/es_MX.json
@@ -82,6 +82,7 @@
     "Restored by {user}" : "Restaurado por {user}",
     "Renamed by {user}" : "Renombrado por {user}",
     "Moved by {user}" : "Movido por {user}",
+    "\"remote user\"" : "\"usuario remoto\"",
     "You created {file}" : "Usted creó {file}",
     "{user} created {file}" : "{user} creó {file}",
     "{file} was created in a public folder" : "{file} fue creado en una carpeta pública",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 9fd2e3bce1e..712e2e4d104 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Restored by {user}" : "Restauré par {user}",
     "Renamed by {user}" : "Renommé par {user}",
     "Moved by {user}" : "Déplacé par {user}",
+    "\"remote user\"" : "\"utilisateur distant\"",
     "You created {file}" : "Vous avez créé {file}",
     "{user} created {file}" : "{user} a créé {file}",
     "{file} was created in a public folder" : "{file} a été créé dans un dossier public",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 98c6dea8c74..0dbfe76b445 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -82,6 +82,7 @@
     "Restored by {user}" : "Restauré par {user}",
     "Renamed by {user}" : "Renommé par {user}",
     "Moved by {user}" : "Déplacé par {user}",
+    "\"remote user\"" : "\"utilisateur distant\"",
     "You created {file}" : "Vous avez créé {file}",
     "{user} created {file}" : "{user} a créé {file}",
     "{file} was created in a public folder" : "{file} a été créé dans un dossier public",
diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js
index a0e7c636695..0cff1c0b9d0 100644
--- a/apps/files/l10n/is.js
+++ b/apps/files/l10n/is.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Restored by {user}" : "Endurheimt af {user}",
     "Renamed by {user}" : "Endurnefnt af {user}",
     "Moved by {user}" : "Fært af {user}",
+    "\"remote user\"" : "\"fjartengdur notandi\"",
     "You created {file}" : "Þú bjóst til {file}",
     "{user} created {file}" : "{user} bjó til {file}",
     "{file} was created in a public folder" : "{file} var búin til í opinni möppu",
diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json
index 95e3002afa1..b18685bd2c1 100644
--- a/apps/files/l10n/is.json
+++ b/apps/files/l10n/is.json
@@ -82,6 +82,7 @@
     "Restored by {user}" : "Endurheimt af {user}",
     "Renamed by {user}" : "Endurnefnt af {user}",
     "Moved by {user}" : "Fært af {user}",
+    "\"remote user\"" : "\"fjartengdur notandi\"",
     "You created {file}" : "Þú bjóst til {file}",
     "{user} created {file}" : "{user} bjó til {file}",
     "{file} was created in a public folder" : "{file} var búin til í opinni möppu",
diff --git a/apps/files/l10n/nb.js b/apps/files/l10n/nb.js
index 52ce6eb6960..c122b32da48 100644
--- a/apps/files/l10n/nb.js
+++ b/apps/files/l10n/nb.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Restored by {user}" : "Gjenopprettet av {user}",
     "Renamed by {user}" : "Navn endret av {user}",
     "Moved by {user}" : "Flyttet av {user}",
+    "\"remote user\"" : "\"ekstern bruker\"",
     "You created {file}" : "Du opprettet {file}",
     "{user} created {file}" : "{user} opprettet {file}",
     "{file} was created in a public folder" : "{file} ble opprettet i en offentlig mappe",
diff --git a/apps/files/l10n/nb.json b/apps/files/l10n/nb.json
index 9304f59f8da..a6221a4e912 100644
--- a/apps/files/l10n/nb.json
+++ b/apps/files/l10n/nb.json
@@ -82,6 +82,7 @@
     "Restored by {user}" : "Gjenopprettet av {user}",
     "Renamed by {user}" : "Navn endret av {user}",
     "Moved by {user}" : "Flyttet av {user}",
+    "\"remote user\"" : "\"ekstern bruker\"",
     "You created {file}" : "Du opprettet {file}",
     "{user} created {file}" : "{user} opprettet {file}",
     "{file} was created in a public folder" : "{file} ble opprettet i en offentlig mappe",
diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js
index ac413b3d695..dd4db248e97 100644
--- a/apps/files/l10n/pl.js
+++ b/apps/files/l10n/pl.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Restored by {user}" : "Przywrócone przez {user}",
     "Renamed by {user}" : "Zmienione przez {user}",
     "Moved by {user}" : "Przeniesione przez {user}",
+    "\"remote user\"" : "\"użytkownik zdalny\"",
     "You created {file}" : "Utworzy‭łeś {file}",
     "{user} created {file}" : "{user} utworzy‭ł {file}",
     "{file} was created in a public folder" : "{file} został utworzony w folderze publicznym",
diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json
index 4858a697cf6..5747a902354 100644
--- a/apps/files/l10n/pl.json
+++ b/apps/files/l10n/pl.json
@@ -82,6 +82,7 @@
     "Restored by {user}" : "Przywrócone przez {user}",
     "Renamed by {user}" : "Zmienione przez {user}",
     "Moved by {user}" : "Przeniesione przez {user}",
+    "\"remote user\"" : "\"użytkownik zdalny\"",
     "You created {file}" : "Utworzy‭łeś {file}",
     "{user} created {file}" : "{user} utworzy‭ł {file}",
     "{file} was created in a public folder" : "{file} został utworzony w folderze publicznym",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index f9fe8828458..63d6063ac52 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Restored by {user}" : "Restaurado por {user}",
     "Renamed by {user}" : "Renomeado por {user}",
     "Moved by {user}" : "Movido por {user}",
+    "\"remote user\"" : "\"usuário remoto\"",
     "You created {file}" : "Você criou o arquivo {file}",
     "{user} created {file}" : "{user} criou o arquivo {file}",
     "{file} was created in a public folder" : "O arquivo {file} foi criado em uma pasta pública",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index 62e0fcb7af4..6a6a153eec4 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -82,6 +82,7 @@
     "Restored by {user}" : "Restaurado por {user}",
     "Renamed by {user}" : "Renomeado por {user}",
     "Moved by {user}" : "Movido por {user}",
+    "\"remote user\"" : "\"usuário remoto\"",
     "You created {file}" : "Você criou o arquivo {file}",
     "{user} created {file}" : "{user} criou o arquivo {file}",
     "{file} was created in a public folder" : "O arquivo {file} foi criado em uma pasta pública",
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index 605b659f03b..ca9ce488f40 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Restored by {user}" : "Восстановлено {user}",
     "Renamed by {user}" : "Переименовано {user}",
     "Moved by {user}" : "Перемещено {user}",
+    "\"remote user\"" : "«пользователь с другого сервера»",
     "You created {file}" : "Вы создали {file}",
     "{user} created {file}" : "{user} создал {file}",
     "{file} was created in a public folder" : "{file} создан в общедоступом каталоге",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 2632e0d4b03..342d97c95e1 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -82,6 +82,7 @@
     "Restored by {user}" : "Восстановлено {user}",
     "Renamed by {user}" : "Переименовано {user}",
     "Moved by {user}" : "Перемещено {user}",
+    "\"remote user\"" : "«пользователь с другого сервера»",
     "You created {file}" : "Вы создали {file}",
     "{user} created {file}" : "{user} создал {file}",
     "{file} was created in a public folder" : "{file} создан в общедоступом каталоге",
diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js
index 969853dd708..7d6a81f731e 100644
--- a/apps/files_external/l10n/en_GB.js
+++ b/apps/files_external/l10n/en_GB.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Please provide a valid app key and secret." : "Please provide a valid app key and secret.",
     "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
     "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
+    "External storages" : "External storages",
     "Dropbox App Configuration" : "Dropbox App Configuration",
     "Google Drive App Configuration" : "Google Drive App Configuration",
     "Personal" : "Personal",
@@ -24,6 +25,7 @@ OC.L10N.register(
     "Save" : "Save",
     "Empty response from the server" : "Empty response from the server",
     "Couldn't access. Please logout and login to activate this mount point" : "Couldn't access. Please logout and login to activate this mount point",
+    "Couldn't get the information from the remote server: {code} {type}" : "Couldn't get the information from the remote server: {code} {type}",
     "Couldn't get the list of external mount points: {type}" : "Couldn't get the list of external mount points: {type}",
     "There was an error with message: " : "There was an error with message: ",
     "External mount error" : "External mount error",
@@ -36,6 +38,7 @@ OC.L10N.register(
     "Credentials saved" : "Credentials saved",
     "Credentials saving failed" : "Credentials saving failed",
     "Credentials required" : "Credentials required",
+    "Storage with ID \"%d\" not found" : "Storage with ID \"%d\" not found",
     "Invalid backend or authentication mechanism class" : "Invalid backend or authentication mechanism class",
     "Invalid mount point" : "Invalid mount point",
     "Objectstore forbidden" : "Objectstore forbidden",
@@ -46,6 +49,7 @@ OC.L10N.register(
     "Unsatisfied authentication mechanism parameters" : "Unsatisfied authentication mechanism parameters",
     "Insufficient data: %s" : "Insufficient data: %s",
     "%s" : "%s",
+    "Storage with ID \"%d\" is not user editable" : "Storage with ID \"%d\" is not user editable",
     "Access key" : "Access key",
     "Secret key" : "Secret key",
     "Builtin" : "Builtin",
@@ -61,6 +65,7 @@ OC.L10N.register(
     "Identity endpoint URL" : "Identity endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "API key",
+    "Global credentials" : "Global credentials",
     "Log-in credentials, save in database" : "Log-in credentials, save in database",
     "Username and password" : "Username and password",
     "Log-in credentials, save in session" : "Log-in credentials, save in session",
@@ -85,6 +90,7 @@ OC.L10N.register(
     "Google Drive" : "Google Drive",
     "Local" : "Local",
     "Location" : "Location",
+    "Nextcloud" : "Nextcloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SFTP with secret key login" : "SFTP with secret key login",
@@ -96,6 +102,10 @@ OC.L10N.register(
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Service name",
     "Request timeout (seconds)" : "Request timeout (seconds)",
+    "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "External storage support" : "External storage support",
     "No external storage configured" : "No external storage configured",
     "You can add external storages in the personal settings" : "You can add external storages in the personal settings",
     "Name" : "Name",
diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json
index 032cda3b94c..c8dba8e5a6e 100644
--- a/apps/files_external/l10n/en_GB.json
+++ b/apps/files_external/l10n/en_GB.json
@@ -4,6 +4,7 @@
     "Please provide a valid app key and secret." : "Please provide a valid app key and secret.",
     "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
     "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
+    "External storages" : "External storages",
     "Dropbox App Configuration" : "Dropbox App Configuration",
     "Google Drive App Configuration" : "Google Drive App Configuration",
     "Personal" : "Personal",
@@ -22,6 +23,7 @@
     "Save" : "Save",
     "Empty response from the server" : "Empty response from the server",
     "Couldn't access. Please logout and login to activate this mount point" : "Couldn't access. Please logout and login to activate this mount point",
+    "Couldn't get the information from the remote server: {code} {type}" : "Couldn't get the information from the remote server: {code} {type}",
     "Couldn't get the list of external mount points: {type}" : "Couldn't get the list of external mount points: {type}",
     "There was an error with message: " : "There was an error with message: ",
     "External mount error" : "External mount error",
@@ -34,6 +36,7 @@
     "Credentials saved" : "Credentials saved",
     "Credentials saving failed" : "Credentials saving failed",
     "Credentials required" : "Credentials required",
+    "Storage with ID \"%d\" not found" : "Storage with ID \"%d\" not found",
     "Invalid backend or authentication mechanism class" : "Invalid backend or authentication mechanism class",
     "Invalid mount point" : "Invalid mount point",
     "Objectstore forbidden" : "Objectstore forbidden",
@@ -44,6 +47,7 @@
     "Unsatisfied authentication mechanism parameters" : "Unsatisfied authentication mechanism parameters",
     "Insufficient data: %s" : "Insufficient data: %s",
     "%s" : "%s",
+    "Storage with ID \"%d\" is not user editable" : "Storage with ID \"%d\" is not user editable",
     "Access key" : "Access key",
     "Secret key" : "Secret key",
     "Builtin" : "Builtin",
@@ -59,6 +63,7 @@
     "Identity endpoint URL" : "Identity endpoint URL",
     "Rackspace" : "Rackspace",
     "API key" : "API key",
+    "Global credentials" : "Global credentials",
     "Log-in credentials, save in database" : "Log-in credentials, save in database",
     "Username and password" : "Username and password",
     "Log-in credentials, save in session" : "Log-in credentials, save in session",
@@ -83,6 +88,7 @@
     "Google Drive" : "Google Drive",
     "Local" : "Local",
     "Location" : "Location",
+    "Nextcloud" : "Nextcloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SFTP with secret key login" : "SFTP with secret key login",
@@ -94,6 +100,10 @@
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Service name",
     "Request timeout (seconds)" : "Request timeout (seconds)",
+    "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "\"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "External storage support" : "External storage support",
     "No external storage configured" : "No external storage configured",
     "You can add external storages in the personal settings" : "You can add external storages in the personal settings",
     "Name" : "Name",
diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js
index ab3e39bff69..4f0af371866 100644
--- a/apps/files_external/l10n/ru.js
+++ b/apps/files_external/l10n/ru.js
@@ -11,7 +11,7 @@ OC.L10N.register(
     "Google Drive App Configuration" : "Настройка приложения Google Drive",
     "Personal" : "Личное",
     "System" : "Система",
-    "Grant access" : "Предоставить доступ",
+    "Grant access" : "Предоставить досту",
     "Error configuring OAuth1" : "Ошибка настройки OAuth1",
     "Error configuring OAuth2" : "Ошибка настройки OAuth2",
     "Generate keys" : "Создать ключи",
@@ -36,15 +36,15 @@ OC.L10N.register(
     "Username" : "Имя пользователя",
     "Password" : "Пароль",
     "Credentials saved" : "Учетные данные сохранены",
-    "Credentials saving failed" : "Ошибка сохранения учетных данных",
-    "Credentials required" : "Требуются учетные данные",
+    "Credentials saving failed" : "Ошибка сохранения учётных данных",
+    "Credentials required" : "Требуются учётные данные",
     "Storage with ID \"%d\" not found" : "Хранилище с идентификатором «%d» не найдено",
     "Invalid backend or authentication mechanism class" : "Некорректный механизм авторизации или бэкенд",
     "Invalid mount point" : "Неправильная точка входа",
     "Objectstore forbidden" : "Хранение объектов запрещено",
-    "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
-    "Not permitted to use backend \"%s\"" : "Не допускается использование бэкенда \"%s\"",
-    "Not permitted to use authentication mechanism \"%s\"" : "Не допускается использование механизма авторизации \"%s\"",
+    "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища «%s»",
+    "Not permitted to use backend \"%s\"" : "Не допускается использование бэкенда «%s»",
+    "Not permitted to use authentication mechanism \"%s\"" : "Не допускается использование механизма авторизации «%s»",
     "Unsatisfied backend parameters" : "Недопустимые настройки бэкенда",
     "Unsatisfied authentication mechanism parameters" : "Недопустимые настройки механизма авторизации",
     "Insufficient data: %s" : "Недостаточно данных: %s",
diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json
index e817c9dea50..5daace75d58 100644
--- a/apps/files_external/l10n/ru.json
+++ b/apps/files_external/l10n/ru.json
@@ -9,7 +9,7 @@
     "Google Drive App Configuration" : "Настройка приложения Google Drive",
     "Personal" : "Личное",
     "System" : "Система",
-    "Grant access" : "Предоставить доступ",
+    "Grant access" : "Предоставить досту",
     "Error configuring OAuth1" : "Ошибка настройки OAuth1",
     "Error configuring OAuth2" : "Ошибка настройки OAuth2",
     "Generate keys" : "Создать ключи",
@@ -34,15 +34,15 @@
     "Username" : "Имя пользователя",
     "Password" : "Пароль",
     "Credentials saved" : "Учетные данные сохранены",
-    "Credentials saving failed" : "Ошибка сохранения учетных данных",
-    "Credentials required" : "Требуются учетные данные",
+    "Credentials saving failed" : "Ошибка сохранения учётных данных",
+    "Credentials required" : "Требуются учётные данные",
     "Storage with ID \"%d\" not found" : "Хранилище с идентификатором «%d» не найдено",
     "Invalid backend or authentication mechanism class" : "Некорректный механизм авторизации или бэкенд",
     "Invalid mount point" : "Неправильная точка входа",
     "Objectstore forbidden" : "Хранение объектов запрещено",
-    "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
-    "Not permitted to use backend \"%s\"" : "Не допускается использование бэкенда \"%s\"",
-    "Not permitted to use authentication mechanism \"%s\"" : "Не допускается использование механизма авторизации \"%s\"",
+    "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища «%s»",
+    "Not permitted to use backend \"%s\"" : "Не допускается использование бэкенда «%s»",
+    "Not permitted to use authentication mechanism \"%s\"" : "Не допускается использование механизма авторизации «%s»",
     "Unsatisfied backend parameters" : "Недопустимые настройки бэкенда",
     "Unsatisfied authentication mechanism parameters" : "Недопустимые настройки механизма авторизации",
     "Insufficient data: %s" : "Недостаточно данных: %s",
diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js
index f495a5d25f6..3bc3572ceff 100644
--- a/apps/files_sharing/l10n/en_GB.js
+++ b/apps/files_sharing/l10n/en_GB.js
@@ -11,13 +11,66 @@ OC.L10N.register(
     "No shared links" : "No shared links",
     "Files and folders you share by link will show up here" : "Files and folders you share by link will show up here",
     "You can upload into this folder" : "You can upload into this folder",
+    "No compatible server found at {remote}" : "No compatible server found at {remote}",
+    "Invalid server URL" : "Invalid server URL",
+    "Failed to add the public link to your Nextcloud" : "Failed to add the public link to your Nextcloud",
+    "Share" : "Share",
     "No expiration date set" : "No expiration date set",
     "Shared by" : "Shared by",
     "Sharing" : "Sharing",
+    "File shares" : "File shares",
+    "Downloaded via public link" : "Downloaded via public link",
+    "Downloaded by {email}" : "Downloaded by {email}",
+    "{file} downloaded via public link" : "{file} downloaded via public link",
+    "{email} downloaded {file}" : "{email} downloaded {file}",
+    "Shared with group {group}" : "Shared with group {group}",
+    "Removed share for group {group}" : "Removed share for group {group}",
+    "{actor} shared with group {group}" : "{actor} shared with group {group}",
+    "{actor} removed share for group {group}" : "{actor} removed share for group {group}",
+    "You shared {file} with group {group}" : "You shared {file} with group {group}",
+    "You removed group {group} from {file}" : "You removed group {group} from {file}",
+    "{actor} shared {file} with group {group}" : "{actor} shared {file} with group {group}",
+    "{actor} removed group {group} from {file}" : "{actor} removed group {group} from {file}",
+    "Shared as public link" : "Shared as public link",
+    "Removed public link" : "Removed public link",
+    "Public link expired" : "Public link expired",
+    "{actor} shared as public link" : "{actor} shared as public link",
+    "{actor} removed public link" : "{actor} removed public link",
+    "Public link of {actor} expired" : "Public link of {actor} expired",
+    "You shared {file} as public link" : "You shared {file} as public link",
+    "You removed public link for {file}" : "You removed public link for {file}",
+    "Public link expired for {file}" : "Public link expired for {file}",
+    "{actor} shared {file} as public link" : "{actor} shared {file} as public link",
+    "{actor} removed public link for {file}" : "{actor} removed public link for {file}",
+    "Public link of {actor} for {file} expired" : "Public link of {actor} for {file} expired",
+    "{user} accepted the remote share" : "{user} accepted the remote share",
+    "{user} declined the remote share" : "{user} declined the remote share",
+    "You received a new remote share {file} from {user}" : "You received a new remote share {file} from {user}",
+    "{user} accepted the remote share of {file}" : "{user} accepted the remote share of {file}",
+    "{user} declined the remote share of {file}" : "{user} declined the remote share of {file}",
+    "{user} unshared {file} from you" : "{user} unshared {file} from you",
+    "Shared with {user}" : "Shared with {user}",
+    "Removed share for {user}" : "Removed share for {user}",
+    "{actor} shared with {user}" : "{actor} shared with {user}",
+    "{actor} removed share for {user}" : "{actor} removed share for {user}",
+    "Shared by {actor}" : "Shared by {actor}",
+    "{actor} removed share" : "{actor} removed share",
+    "You shared {file} with {user}" : "You shared {file} with {user}",
+    "You removed {user} from {file}" : "You removed {user} from {file}",
+    "{actor} shared {file} with {user}" : "{actor} shared {file} with {user}",
+    "{actor} removed {user} from {file}" : "{actor} removed {user} from {file}",
+    "{actor} shared {file} with you" : "{actor} shared {file} with you",
+    "{actor} removed you from {file}" : "{actor} removed you from {file}",
+    "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "A file or folder shared by mail or by public link was <strong>downloaded</strong>",
+    "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>",
+    "A file or folder has been <strong>shared</strong>" : "A file or folder has been <strong>shared</strong>",
     "Wrong share ID, share doesn't exist" : "Wrong share ID, share doesn't exist",
+    "could not delete share" : "could not delete share",
     "Could not delete share" : "Could not delete share",
     "Please specify a file or folder path" : "Please specify a file or folder path",
     "Wrong path, file/folder doesn't exist" : "Wrong path, file/folder doesn't exist",
+    "Could not create share" : "Could not create share",
+    "invalid permissions" : "invalid permissions",
     "Please specify a valid user" : "Please specify a valid user",
     "Group sharing is disabled by the administrator" : "Group sharing is disabled by the administrator",
     "Please specify a valid group" : "Please specify a valid group",
@@ -26,56 +79,17 @@ OC.L10N.register(
     "Public upload is only possible for publicly shared folders" : "Public upload is only possible for publicly shared folders",
     "Invalid date, date format must be YYYY-MM-DD" : "Invalid date, date format must be YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Sharing %s failed because the back end does not allow shares from type %s",
+    "You cannot share to a Circle if the app is not enabled" : "You cannot share to a Circle if the app is not enabled",
+    "Please specify a valid circle" : "Please specify a valid circle",
     "Unknown share type" : "Unknown share type",
     "Not a directory" : "Not a directory",
     "Could not lock path" : "Could not lock path",
     "Wrong or no update parameter given" : "Wrong or no update parameter given",
     "Can't change permissions for public share links" : "Can't change permissions for public share links",
     "Cannot increase permissions" : "Cannot increase permissions",
-    "A file or folder has been <strong>shared</strong>" : "A file or folder has been <strong>shared</strong>",
-    "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>",
-    "A public shared file or folder was <strong>downloaded</strong>" : "A public shared file or folder was <strong>downloaded</strong>",
-    "You received a new remote share %2$s from %1$s" : "You received a new remote share %2$s from %1$s",
-    "You received a new remote share from %s" : "You received a new remote share from %s",
-    "%1$s accepted remote share %2$s" : "%1$s accepted remote share %2$s",
-    "%1$s declined remote share %2$s" : "%1$s declined remote share %2$s",
-    "%1$s unshared %2$s from you" : "%1$s unshared %2$s from you",
-    "Public shared folder %1$s was downloaded" : "Public shared folder %1$s was downloaded",
-    "Public shared file %1$s was downloaded" : "Public shared file %1$s was downloaded",
-    "You shared %1$s with %2$s" : "You shared %1$s with %2$s",
-    "%2$s shared %1$s with %3$s" : "%2$s shared %1$s with %3$s",
-    "You removed the share of %2$s for %1$s" : "You removed the share of %2$s for %1$s",
-    "%2$s removed the share of %3$s for %1$s" : "%2$s removed the share of %3$s for %1$s",
-    "You shared %1$s with group %2$s" : "You shared %1$s with group %2$s",
-    "%2$s shared %1$s with group %3$s" : "%2$s shared %1$s with group %3$s",
-    "You removed the share of group %2$s for %1$s" : "You removed the share of group %2$s for %1$s",
-    "%2$s removed the share of group %3$s for %1$s" : "%2$s removed the share of group %3$s for %1$s",
-    "%2$s shared %1$s via link" : "%2$s shared %1$s via link",
-    "You shared %1$s via link" : "You shared %1$s via link",
-    "You removed the public link for %1$s" : "You removed the public link for %1$s",
-    "%2$s removed the public link for %1$s" : "%2$s removed the public link for %1$s",
-    "Your public link for %1$s expired" : "Your public link for %1$s expired",
-    "The public link of %2$s for %1$s expired" : "The public link of %2$s for %1$s expired",
-    "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
-    "%2$s removed the share for %1$s" : "%2$s removed the share for %1$s",
-    "Downloaded via public link" : "Downloaded via public link",
-    "Shared with %2$s" : "Shared with %2$s",
-    "Shared with %3$s by %2$s" : "Shared with %3$s by %2$s",
-    "Removed share for %2$s" : "Removed share for %2$s",
-    "%2$s removed share for %3$s" : "%2$s removed share for %3$s",
-    "Shared with group %2$s" : "Shared with group %2$s",
-    "Shared with group %3$s by %2$s" : "Shared with group %3$s by %2$s",
-    "Removed share of group %2$s" : "Removed share of group %2$s",
-    "%2$s removed share of group %3$s" : "%2$s removed share of group %3$s",
-    "Shared via link by %2$s" : "Shared via link by %2$s",
-    "Shared via public link" : "Shared via public link",
-    "Removed public link" : "Removed public link",
-    "%2$s removed public link" : "%2$s removed public link",
-    "Public link expired" : "Public link expired",
-    "Public link of %2$s expired" : "Public link of %2$s expired",
-    "Shared by %2$s" : "Shared by %2$s",
-    "Shares" : "Shares",
+    "%s is publicly shared" : "%s is publicly shared",
     "Share API is disabled" : "Share API is disabled",
+    "File sharing" : "File sharing",
     "This share is password-protected" : "This share is password-protected",
     "The password is wrong. Try again." : "The password is wrong. Try again.",
     "Password" : "Password",
@@ -89,6 +103,7 @@ OC.L10N.register(
     "the link expired" : "the link expired",
     "sharing is disabled" : "sharing is disabled",
     "For more info, please ask the person who sent this link." : "For more info, please ask the person who sent this link.",
+    "Add to your Nextcloud" : "Add to your Nextcloud",
     "Download" : "Download",
     "Download %s" : "Download %s",
     "Direct link" : "Direct link",
diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json
index b4ec32c05d7..0d09d445bc9 100644
--- a/apps/files_sharing/l10n/en_GB.json
+++ b/apps/files_sharing/l10n/en_GB.json
@@ -9,13 +9,66 @@
     "No shared links" : "No shared links",
     "Files and folders you share by link will show up here" : "Files and folders you share by link will show up here",
     "You can upload into this folder" : "You can upload into this folder",
+    "No compatible server found at {remote}" : "No compatible server found at {remote}",
+    "Invalid server URL" : "Invalid server URL",
+    "Failed to add the public link to your Nextcloud" : "Failed to add the public link to your Nextcloud",
+    "Share" : "Share",
     "No expiration date set" : "No expiration date set",
     "Shared by" : "Shared by",
     "Sharing" : "Sharing",
+    "File shares" : "File shares",
+    "Downloaded via public link" : "Downloaded via public link",
+    "Downloaded by {email}" : "Downloaded by {email}",
+    "{file} downloaded via public link" : "{file} downloaded via public link",
+    "{email} downloaded {file}" : "{email} downloaded {file}",
+    "Shared with group {group}" : "Shared with group {group}",
+    "Removed share for group {group}" : "Removed share for group {group}",
+    "{actor} shared with group {group}" : "{actor} shared with group {group}",
+    "{actor} removed share for group {group}" : "{actor} removed share for group {group}",
+    "You shared {file} with group {group}" : "You shared {file} with group {group}",
+    "You removed group {group} from {file}" : "You removed group {group} from {file}",
+    "{actor} shared {file} with group {group}" : "{actor} shared {file} with group {group}",
+    "{actor} removed group {group} from {file}" : "{actor} removed group {group} from {file}",
+    "Shared as public link" : "Shared as public link",
+    "Removed public link" : "Removed public link",
+    "Public link expired" : "Public link expired",
+    "{actor} shared as public link" : "{actor} shared as public link",
+    "{actor} removed public link" : "{actor} removed public link",
+    "Public link of {actor} expired" : "Public link of {actor} expired",
+    "You shared {file} as public link" : "You shared {file} as public link",
+    "You removed public link for {file}" : "You removed public link for {file}",
+    "Public link expired for {file}" : "Public link expired for {file}",
+    "{actor} shared {file} as public link" : "{actor} shared {file} as public link",
+    "{actor} removed public link for {file}" : "{actor} removed public link for {file}",
+    "Public link of {actor} for {file} expired" : "Public link of {actor} for {file} expired",
+    "{user} accepted the remote share" : "{user} accepted the remote share",
+    "{user} declined the remote share" : "{user} declined the remote share",
+    "You received a new remote share {file} from {user}" : "You received a new remote share {file} from {user}",
+    "{user} accepted the remote share of {file}" : "{user} accepted the remote share of {file}",
+    "{user} declined the remote share of {file}" : "{user} declined the remote share of {file}",
+    "{user} unshared {file} from you" : "{user} unshared {file} from you",
+    "Shared with {user}" : "Shared with {user}",
+    "Removed share for {user}" : "Removed share for {user}",
+    "{actor} shared with {user}" : "{actor} shared with {user}",
+    "{actor} removed share for {user}" : "{actor} removed share for {user}",
+    "Shared by {actor}" : "Shared by {actor}",
+    "{actor} removed share" : "{actor} removed share",
+    "You shared {file} with {user}" : "You shared {file} with {user}",
+    "You removed {user} from {file}" : "You removed {user} from {file}",
+    "{actor} shared {file} with {user}" : "{actor} shared {file} with {user}",
+    "{actor} removed {user} from {file}" : "{actor} removed {user} from {file}",
+    "{actor} shared {file} with you" : "{actor} shared {file} with you",
+    "{actor} removed you from {file}" : "{actor} removed you from {file}",
+    "A file or folder shared by mail or by public link was <strong>downloaded</strong>" : "A file or folder shared by mail or by public link was <strong>downloaded</strong>",
+    "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>",
+    "A file or folder has been <strong>shared</strong>" : "A file or folder has been <strong>shared</strong>",
     "Wrong share ID, share doesn't exist" : "Wrong share ID, share doesn't exist",
+    "could not delete share" : "could not delete share",
     "Could not delete share" : "Could not delete share",
     "Please specify a file or folder path" : "Please specify a file or folder path",
     "Wrong path, file/folder doesn't exist" : "Wrong path, file/folder doesn't exist",
+    "Could not create share" : "Could not create share",
+    "invalid permissions" : "invalid permissions",
     "Please specify a valid user" : "Please specify a valid user",
     "Group sharing is disabled by the administrator" : "Group sharing is disabled by the administrator",
     "Please specify a valid group" : "Please specify a valid group",
@@ -24,56 +77,17 @@
     "Public upload is only possible for publicly shared folders" : "Public upload is only possible for publicly shared folders",
     "Invalid date, date format must be YYYY-MM-DD" : "Invalid date, date format must be YYYY-MM-DD",
     "Sharing %s failed because the back end does not allow shares from type %s" : "Sharing %s failed because the back end does not allow shares from type %s",
+    "You cannot share to a Circle if the app is not enabled" : "You cannot share to a Circle if the app is not enabled",
+    "Please specify a valid circle" : "Please specify a valid circle",
     "Unknown share type" : "Unknown share type",
     "Not a directory" : "Not a directory",
     "Could not lock path" : "Could not lock path",
     "Wrong or no update parameter given" : "Wrong or no update parameter given",
     "Can't change permissions for public share links" : "Can't change permissions for public share links",
     "Cannot increase permissions" : "Cannot increase permissions",
-    "A file or folder has been <strong>shared</strong>" : "A file or folder has been <strong>shared</strong>",
-    "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>",
-    "A public shared file or folder was <strong>downloaded</strong>" : "A public shared file or folder was <strong>downloaded</strong>",
-    "You received a new remote share %2$s from %1$s" : "You received a new remote share %2$s from %1$s",
-    "You received a new remote share from %s" : "You received a new remote share from %s",
-    "%1$s accepted remote share %2$s" : "%1$s accepted remote share %2$s",
-    "%1$s declined remote share %2$s" : "%1$s declined remote share %2$s",
-    "%1$s unshared %2$s from you" : "%1$s unshared %2$s from you",
-    "Public shared folder %1$s was downloaded" : "Public shared folder %1$s was downloaded",
-    "Public shared file %1$s was downloaded" : "Public shared file %1$s was downloaded",
-    "You shared %1$s with %2$s" : "You shared %1$s with %2$s",
-    "%2$s shared %1$s with %3$s" : "%2$s shared %1$s with %3$s",
-    "You removed the share of %2$s for %1$s" : "You removed the share of %2$s for %1$s",
-    "%2$s removed the share of %3$s for %1$s" : "%2$s removed the share of %3$s for %1$s",
-    "You shared %1$s with group %2$s" : "You shared %1$s with group %2$s",
-    "%2$s shared %1$s with group %3$s" : "%2$s shared %1$s with group %3$s",
-    "You removed the share of group %2$s for %1$s" : "You removed the share of group %2$s for %1$s",
-    "%2$s removed the share of group %3$s for %1$s" : "%2$s removed the share of group %3$s for %1$s",
-    "%2$s shared %1$s via link" : "%2$s shared %1$s via link",
-    "You shared %1$s via link" : "You shared %1$s via link",
-    "You removed the public link for %1$s" : "You removed the public link for %1$s",
-    "%2$s removed the public link for %1$s" : "%2$s removed the public link for %1$s",
-    "Your public link for %1$s expired" : "Your public link for %1$s expired",
-    "The public link of %2$s for %1$s expired" : "The public link of %2$s for %1$s expired",
-    "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
-    "%2$s removed the share for %1$s" : "%2$s removed the share for %1$s",
-    "Downloaded via public link" : "Downloaded via public link",
-    "Shared with %2$s" : "Shared with %2$s",
-    "Shared with %3$s by %2$s" : "Shared with %3$s by %2$s",
-    "Removed share for %2$s" : "Removed share for %2$s",
-    "%2$s removed share for %3$s" : "%2$s removed share for %3$s",
-    "Shared with group %2$s" : "Shared with group %2$s",
-    "Shared with group %3$s by %2$s" : "Shared with group %3$s by %2$s",
-    "Removed share of group %2$s" : "Removed share of group %2$s",
-    "%2$s removed share of group %3$s" : "%2$s removed share of group %3$s",
-    "Shared via link by %2$s" : "Shared via link by %2$s",
-    "Shared via public link" : "Shared via public link",
-    "Removed public link" : "Removed public link",
-    "%2$s removed public link" : "%2$s removed public link",
-    "Public link expired" : "Public link expired",
-    "Public link of %2$s expired" : "Public link of %2$s expired",
-    "Shared by %2$s" : "Shared by %2$s",
-    "Shares" : "Shares",
+    "%s is publicly shared" : "%s is publicly shared",
     "Share API is disabled" : "Share API is disabled",
+    "File sharing" : "File sharing",
     "This share is password-protected" : "This share is password-protected",
     "The password is wrong. Try again." : "The password is wrong. Try again.",
     "Password" : "Password",
@@ -87,6 +101,7 @@
     "the link expired" : "the link expired",
     "sharing is disabled" : "sharing is disabled",
     "For more info, please ask the person who sent this link." : "For more info, please ask the person who sent this link.",
+    "Add to your Nextcloud" : "Add to your Nextcloud",
     "Download" : "Download",
     "Download %s" : "Download %s",
     "Direct link" : "Direct link",
diff --git a/apps/files_versions/l10n/en_GB.js b/apps/files_versions/l10n/en_GB.js
index a2c3bb03996..6127c0dcdf4 100644
--- a/apps/files_versions/l10n/en_GB.js
+++ b/apps/files_versions/l10n/en_GB.js
@@ -4,8 +4,11 @@ OC.L10N.register(
     "Could not revert: %s" : "Could not revert: %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Failed to revert {file} to revision {timestamp}.",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Restore" : "Restore",
-    "More versions..." : "More versions...",
-    "No other versions available" : "No other versions available"
+    "No earlier versions available" : "No earlier versions available",
+    "More versions …" : "More versions …",
+    "No versions available" : "No versions available",
+    "More versions..." : "More versions..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/en_GB.json b/apps/files_versions/l10n/en_GB.json
index 43cfb596726..683af5d9168 100644
--- a/apps/files_versions/l10n/en_GB.json
+++ b/apps/files_versions/l10n/en_GB.json
@@ -2,8 +2,11 @@
     "Could not revert: %s" : "Could not revert: %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Failed to revert {file} to revision {timestamp}.",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Restore" : "Restore",
-    "More versions..." : "More versions...",
-    "No other versions available" : "No other versions available"
+    "No earlier versions available" : "No earlier versions available",
+    "More versions …" : "More versions …",
+    "No versions available" : "No versions available",
+    "More versions..." : "More versions..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/oauth2/l10n/en_GB.js b/apps/oauth2/l10n/en_GB.js
new file mode 100644
index 00000000000..bb685a2578d
--- /dev/null
+++ b/apps/oauth2/l10n/en_GB.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "oauth2",
+    {
+    "OAuth 2.0" : "OAuth 2.0",
+    "OAuth 2.0 clients" : "OAuth 2.0 clients",
+    "OAuth 2.0 allows external services to request access to your %s." : "OAuth 2.0 allows external services to request access to your %s.",
+    "Name" : "Name",
+    "Redirection URI" : "Redirection URI",
+    "Client Identifier" : "Client Identifier",
+    "Secret" : "Secret",
+    "Add client" : "Add client",
+    "Add" : "Add"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/oauth2/l10n/en_GB.json b/apps/oauth2/l10n/en_GB.json
new file mode 100644
index 00000000000..b313edb241a
--- /dev/null
+++ b/apps/oauth2/l10n/en_GB.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "OAuth 2.0" : "OAuth 2.0",
+    "OAuth 2.0 clients" : "OAuth 2.0 clients",
+    "OAuth 2.0 allows external services to request access to your %s." : "OAuth 2.0 allows external services to request access to your %s.",
+    "Name" : "Name",
+    "Redirection URI" : "Redirection URI",
+    "Client Identifier" : "Client Identifier",
+    "Secret" : "Secret",
+    "Add client" : "Add client",
+    "Add" : "Add"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/sharebymail/l10n/en_GB.js b/apps/sharebymail/l10n/en_GB.js
new file mode 100644
index 00000000000..58f75a06040
--- /dev/null
+++ b/apps/sharebymail/l10n/en_GB.js
@@ -0,0 +1,49 @@
+OC.L10N.register(
+    "sharebymail",
+    {
+    "Shared with %1$s" : "Shared with %1$s",
+    "Shared with {email}" : "Shared with {email}",
+    "Shared with %1$s by %2$s" : "Shared with %1$s by %2$s",
+    "Shared with {email} by {actor}" : "Shared with {email} by {actor}",
+    "Password for mail share sent to %1$s" : "Password for mail share sent to %1$s",
+    "Password for mail share sent to {email}" : "Password for mail share sent to {email}",
+    "Password for mail share sent to you" : "Password for mail share sent to you",
+    "You shared %1$s with %2$s by mail" : "You shared %1$s with %2$s by mail",
+    "You shared {file} with {email} by mail" : "You shared {file} with {email} by mail",
+    "%3$s shared %1$s with %2$s by mail" : "%3$s shared %1$s with %2$s by mail",
+    "{actor} shared {file} with {email} by mail" : "{actor} shared {file} with {email} by mail",
+    "Password to access %1$s was sent to %2s" : "Password to access %1$s was sent to %2s",
+    "Password to access {file} was sent to {email}" : "Password to access {file} was sent to {email}",
+    "Password to access %1$s was sent to you" : "Password to access %1$s was sent to you",
+    "Password to access {file} was sent to you" : "Password to access {file} was sent to you",
+    "Sharing %s failed, this item is already shared with %s" : "Sharing %s failed, this item is already shared with %s",
+    "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "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 E-mail" : "Failed to send share by E-mail",
+    "%s shared »%s« with you" : "%s shared »%s« with you",
+    "%s shared »%s« with you." : "%s shared »%s« with you.",
+    "Click the button below to open it." : "Click the button below to open it.",
+    "Open »%s«" : "Open »%s«",
+    "%s via %s" : "%s via %s",
+    "Password to access »%s« shared to you by %s" : "Password to access »%s« shared to you by %s",
+    "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n",
+    "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s shared »%s« with you. You should have already received a separate mail with a link to access it.",
+    "Password to access »%s«" : "Password to access »%s«",
+    "It is protected with the following password: %s" : "It is protected with the following password: %s",
+    "Password to access »%s« shared with %s" : "Password to access »%s« shared with %s",
+    "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.",
+    "This is the password: %s" : "This is the password: %s",
+    "You can choose a different password at any time in the share dialog." : "You can choose a different password at any time in the share dialog.",
+    "Could not find share" : "Could not find share",
+    "Share by mail" : "Share by mail",
+    "Allows users to share a personalized link to a file or folder by putting in an email address." : "Allows users to share a personalised link to a file or folder by putting in an email address.",
+    "Send password by mail" : "Send password by mail",
+    "Enforce password protection" : "Enforce password protection",
+    "%s shared »%s« with you on behalf of %s" : "%s shared »%s« with you on behalf of %s",
+    "Failed to create the E-mail" : "Failed to create the E-mail",
+    "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n",
+    "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n",
+    "Cheers!" : "Cheers!",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/sharebymail/l10n/en_GB.json b/apps/sharebymail/l10n/en_GB.json
new file mode 100644
index 00000000000..a4fc08678a2
--- /dev/null
+++ b/apps/sharebymail/l10n/en_GB.json
@@ -0,0 +1,47 @@
+{ "translations": {
+    "Shared with %1$s" : "Shared with %1$s",
+    "Shared with {email}" : "Shared with {email}",
+    "Shared with %1$s by %2$s" : "Shared with %1$s by %2$s",
+    "Shared with {email} by {actor}" : "Shared with {email} by {actor}",
+    "Password for mail share sent to %1$s" : "Password for mail share sent to %1$s",
+    "Password for mail share sent to {email}" : "Password for mail share sent to {email}",
+    "Password for mail share sent to you" : "Password for mail share sent to you",
+    "You shared %1$s with %2$s by mail" : "You shared %1$s with %2$s by mail",
+    "You shared {file} with {email} by mail" : "You shared {file} with {email} by mail",
+    "%3$s shared %1$s with %2$s by mail" : "%3$s shared %1$s with %2$s by mail",
+    "{actor} shared {file} with {email} by mail" : "{actor} shared {file} with {email} by mail",
+    "Password to access %1$s was sent to %2s" : "Password to access %1$s was sent to %2s",
+    "Password to access {file} was sent to {email}" : "Password to access {file} was sent to {email}",
+    "Password to access %1$s was sent to you" : "Password to access %1$s was sent to you",
+    "Password to access {file} was sent to you" : "Password to access {file} was sent to you",
+    "Sharing %s failed, this item is already shared with %s" : "Sharing %s failed, this item is already shared with %s",
+    "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "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 E-mail" : "Failed to send share by E-mail",
+    "%s shared »%s« with you" : "%s shared »%s« with you",
+    "%s shared »%s« with you." : "%s shared »%s« with you.",
+    "Click the button below to open it." : "Click the button below to open it.",
+    "Open »%s«" : "Open »%s«",
+    "%s via %s" : "%s via %s",
+    "Password to access »%s« shared to you by %s" : "Password to access »%s« shared to you by %s",
+    "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n" : "%s shared »%s« with you.\nYou should have already received a separate mail with a link to access it.\n",
+    "%s shared »%s« with you. You should have already received a separate mail with a link to access it." : "%s shared »%s« with you. You should have already received a separate mail with a link to access it.",
+    "Password to access »%s«" : "Password to access »%s«",
+    "It is protected with the following password: %s" : "It is protected with the following password: %s",
+    "Password to access »%s« shared with %s" : "Password to access »%s« shared with %s",
+    "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient." : "You just shared »%s« with %s. The share was already send to the recipient. Due to the security policies defined by the administrator of %s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.",
+    "This is the password: %s" : "This is the password: %s",
+    "You can choose a different password at any time in the share dialog." : "You can choose a different password at any time in the share dialog.",
+    "Could not find share" : "Could not find share",
+    "Share by mail" : "Share by mail",
+    "Allows users to share a personalized link to a file or folder by putting in an email address." : "Allows users to share a personalised link to a file or folder by putting in an email address.",
+    "Send password by mail" : "Send password by mail",
+    "Enforce password protection" : "Enforce password protection",
+    "%s shared »%s« with you on behalf of %s" : "%s shared »%s« with you on behalf of %s",
+    "Failed to create the E-mail" : "Failed to create the E-mail",
+    "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n",
+    "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n",
+    "Cheers!" : "Cheers!",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>" : "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you on behalf of %s.<br><br>",
+    "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>" : "Hey there,<br><br>%s shared <a href=\"%s\">%s</a> with you.<br><br>"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/sharebymail/l10n/nb.js b/apps/sharebymail/l10n/nb.js
index c054547dc3e..b9a88de6f21 100644
--- a/apps/sharebymail/l10n/nb.js
+++ b/apps/sharebymail/l10n/nb.js
@@ -18,7 +18,7 @@ OC.L10N.register(
     "Password to access {file} was sent to you" : "Du ble tildelt passord for å benytte {file}",
     "Sharing %s failed, this item is already shared with %s" : "Deling %s feilet, dette elementet er allerede delt med %s",
     "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Vi kan ikke sende det auto-genererte passordet. Angi en gyldig e-postadresse i dine personlige innstillinger og prøv igjen.",
-    "Failed to send share by E-mail" : "Feilet når delingen skulle sendes på epost",
+    "Failed to send share by E-mail" : "Mislyktes i å sende delt ressurs per e-post",
     "%s shared »%s« with you" : "%s delte »%s« med deg",
     "%s shared »%s« with you." : "%s delte »%s« med deg.",
     "Click the button below to open it." : "Klikk på knappen nedenfor for å åpne den.",
@@ -39,7 +39,7 @@ OC.L10N.register(
     "Send password by mail" : "Send passord via e-post",
     "Enforce password protection" : "Krev passordbeskyttelse",
     "%s shared »%s« with you on behalf of %s" : "%s delte »%s« med deg på vegne av %s",
-    "Failed to create the E-mail" : "Feilet ved opprettelse av epost",
+    "Failed to create the E-mail" : "Klarte ikke å opprette e-posten",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hei,\n\n%s delte »%s« med deg på vegne av %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hei,\n\n%s delte »%s« med deg.\n\n%s\n\n",
     "Cheers!" : "Skål!",
diff --git a/apps/sharebymail/l10n/nb.json b/apps/sharebymail/l10n/nb.json
index 896cc3b3729..ff1a0876543 100644
--- a/apps/sharebymail/l10n/nb.json
+++ b/apps/sharebymail/l10n/nb.json
@@ -16,7 +16,7 @@
     "Password to access {file} was sent to you" : "Du ble tildelt passord for å benytte {file}",
     "Sharing %s failed, this item is already shared with %s" : "Deling %s feilet, dette elementet er allerede delt med %s",
     "We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again." : "Vi kan ikke sende det auto-genererte passordet. Angi en gyldig e-postadresse i dine personlige innstillinger og prøv igjen.",
-    "Failed to send share by E-mail" : "Feilet når delingen skulle sendes på epost",
+    "Failed to send share by E-mail" : "Mislyktes i å sende delt ressurs per e-post",
     "%s shared »%s« with you" : "%s delte »%s« med deg",
     "%s shared »%s« with you." : "%s delte »%s« med deg.",
     "Click the button below to open it." : "Klikk på knappen nedenfor for å åpne den.",
@@ -37,7 +37,7 @@
     "Send password by mail" : "Send passord via e-post",
     "Enforce password protection" : "Krev passordbeskyttelse",
     "%s shared »%s« with you on behalf of %s" : "%s delte »%s« med deg på vegne av %s",
-    "Failed to create the E-mail" : "Feilet ved opprettelse av epost",
+    "Failed to create the E-mail" : "Klarte ikke å opprette e-posten",
     "Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n" : "Hei,\n\n%s delte »%s« med deg på vegne av %s.\n\n%s\n\n",
     "Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n" : "Hei,\n\n%s delte »%s« med deg.\n\n%s\n\n",
     "Cheers!" : "Skål!",
diff --git a/apps/systemtags/l10n/en_GB.js b/apps/systemtags/l10n/en_GB.js
index 2e64bf6720f..ae56a3d14f5 100644
--- a/apps/systemtags/l10n/en_GB.js
+++ b/apps/systemtags/l10n/en_GB.js
@@ -2,28 +2,54 @@ OC.L10N.register(
     "systemtags",
     {
     "Tags" : "Tags",
+    "Update" : "Update",
+    "Create" : "Create",
+    "Select tag…" : "Select tag…",
     "Tagged files" : "Tagged files",
     "Select tags to filter by" : "Select tags to filter by",
+    "No tags found" : "No tags found",
     "Please select tags to filter by" : "Please select tags to filter by",
     "No files found for the selected tags" : "No files found for the selected tags",
-    "<strong>System tags</strong> for a file have been modified" : "<strong>System tags</strong> for a file have been modified",
-    "You assigned system tag %3$s" : "You assigned system tag %3$s",
-    "%1$s assigned system tag %3$s" : "%1$s assigned system tag %3$s",
-    "You unassigned system tag %3$s" : "You unassigned system tag %3$s",
-    "%1$s unassigned system tag %3$s" : "%1$s unassigned system tag %3$s",
-    "You created system tag %2$s" : "You created system tag %2$s",
+    "Added system tag %1$s" : "Added system tag %1$s",
+    "Added system tag {systemtag}" : "Added system tag {systemtag}",
+    "%1$s added system tag %2$s" : "%1$s added system tag %2$s",
+    "{actor} added system tag {systemtag}" : "{actor} added system tag {systemtag}",
+    "Removed system tag %1$s" : "Removed system tag %1$s",
+    "Removed system tag {systemtag}" : "Removed system tag {systemtag}",
+    "%1$s removed system tag %2$s" : "%1$s removed system tag %2$s",
+    "{actor} removed system tag {systemtag}" : "{actor} removed system tag {systemtag}",
+    "You created system tag %1$s" : "You created system tag %1$s",
+    "You created system tag {systemtag}" : "You created system tag {systemtag}",
     "%1$s created system tag %2$s" : "%1$s created system tag %2$s",
-    "You deleted system tag %2$s" : "You deleted system tag %2$s",
+    "{actor} created system tag {systemtag}" : "{actor} created system tag {systemtag}",
+    "You deleted system tag %1$s" : "You deleted system tag %1$s",
+    "You deleted system tag {systemtag}" : "You deleted system tag {systemtag}",
     "%1$s deleted system tag %2$s" : "%1$s deleted system tag %2$s",
-    "You updated system tag %3$s to %2$s" : "You updated system tag %3$s to %2$s",
+    "{actor} deleted system tag {systemtag}" : "{actor} deleted system tag {systemtag}",
+    "You updated system tag %2$s to %1$s" : "You updated system tag %2$s to %1$s",
+    "You updated system tag {oldsystemtag} to {newsystemtag}" : "You updated system tag {oldsystemtag} to {newsystemtag}",
     "%1$s updated system tag %3$s to %2$s" : "%1$s updated system tag %3$s to %2$s",
-    "You assigned system tag %3$s to %2$s" : "You assigned system tag %3$s to %2$s",
-    "%1$s assigned system tag %3$s to %2$s" : "%1$s assigned system tag %3$s to %2$s",
-    "You unassigned system tag %3$s from %2$s" : "You unassigned system tag %3$s from %2$s",
-    "%1$s unassigned system tag %3$s from %2$s" : "%1$s unassigned system tag %3$s from %2$s",
+    "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} updated system tag {oldsystemtag} to {newsystemtag}",
+    "You added system tag %2$s to %1$s" : "You added system tag %2$s to %1$s",
+    "You added system tag {systemtag} to {file}" : "You added system tag {systemtag} to {file}",
+    "%1$s added system tag %3$s to %2$s" : "%1$s added system tag %3$s to %2$s",
+    "{actor} added system tag {systemtag} to {file}" : "{actor} added system tag {systemtag} to {file}",
+    "You removed system tag %2$s from %1$s" : "You removed system tag %2$s from %1$s",
+    "You removed system tag {systemtag} from {file}" : "You removed system tag {systemtag} from {file}",
+    "%1$s removed system tag %3$s from %2$s" : "%1$s removed system tag %3$s from %2$s",
+    "{actor} removed system tag {systemtag} from {file}" : "{actor} removed system tag {systemtag} from {file}",
     "%s (restricted)" : "%s (restricted)",
     "%s (invisible)" : "%s (invisible)",
+    "<strong>System tags</strong> for a file have been modified" : "<strong>System tags</strong> for a file have been modified",
+    "Collaborative tags" : "Collaborative tags",
+    "Create and edit collaborative tags. These tags affect all users." : "Create and edit collaborative tags. These tags affect all users.",
+    "Select tag …" : "Select tag …",
     "Name" : "Name",
+    "Delete" : "Delete",
+    "Public" : "Public",
+    "Restricted" : "Restricted",
+    "Invisible" : "Invisible",
+    "Reset" : "Reset",
     "No files in here" : "No files in here",
     "No entries found in this folder" : "No entries found in this folder",
     "Size" : "Size",
diff --git a/apps/systemtags/l10n/en_GB.json b/apps/systemtags/l10n/en_GB.json
index 865bd76d220..5e97f6af4e3 100644
--- a/apps/systemtags/l10n/en_GB.json
+++ b/apps/systemtags/l10n/en_GB.json
@@ -1,27 +1,53 @@
 { "translations": {
     "Tags" : "Tags",
+    "Update" : "Update",
+    "Create" : "Create",
+    "Select tag…" : "Select tag…",
     "Tagged files" : "Tagged files",
     "Select tags to filter by" : "Select tags to filter by",
+    "No tags found" : "No tags found",
     "Please select tags to filter by" : "Please select tags to filter by",
     "No files found for the selected tags" : "No files found for the selected tags",
-    "<strong>System tags</strong> for a file have been modified" : "<strong>System tags</strong> for a file have been modified",
-    "You assigned system tag %3$s" : "You assigned system tag %3$s",
-    "%1$s assigned system tag %3$s" : "%1$s assigned system tag %3$s",
-    "You unassigned system tag %3$s" : "You unassigned system tag %3$s",
-    "%1$s unassigned system tag %3$s" : "%1$s unassigned system tag %3$s",
-    "You created system tag %2$s" : "You created system tag %2$s",
+    "Added system tag %1$s" : "Added system tag %1$s",
+    "Added system tag {systemtag}" : "Added system tag {systemtag}",
+    "%1$s added system tag %2$s" : "%1$s added system tag %2$s",
+    "{actor} added system tag {systemtag}" : "{actor} added system tag {systemtag}",
+    "Removed system tag %1$s" : "Removed system tag %1$s",
+    "Removed system tag {systemtag}" : "Removed system tag {systemtag}",
+    "%1$s removed system tag %2$s" : "%1$s removed system tag %2$s",
+    "{actor} removed system tag {systemtag}" : "{actor} removed system tag {systemtag}",
+    "You created system tag %1$s" : "You created system tag %1$s",
+    "You created system tag {systemtag}" : "You created system tag {systemtag}",
     "%1$s created system tag %2$s" : "%1$s created system tag %2$s",
-    "You deleted system tag %2$s" : "You deleted system tag %2$s",
+    "{actor} created system tag {systemtag}" : "{actor} created system tag {systemtag}",
+    "You deleted system tag %1$s" : "You deleted system tag %1$s",
+    "You deleted system tag {systemtag}" : "You deleted system tag {systemtag}",
     "%1$s deleted system tag %2$s" : "%1$s deleted system tag %2$s",
-    "You updated system tag %3$s to %2$s" : "You updated system tag %3$s to %2$s",
+    "{actor} deleted system tag {systemtag}" : "{actor} deleted system tag {systemtag}",
+    "You updated system tag %2$s to %1$s" : "You updated system tag %2$s to %1$s",
+    "You updated system tag {oldsystemtag} to {newsystemtag}" : "You updated system tag {oldsystemtag} to {newsystemtag}",
     "%1$s updated system tag %3$s to %2$s" : "%1$s updated system tag %3$s to %2$s",
-    "You assigned system tag %3$s to %2$s" : "You assigned system tag %3$s to %2$s",
-    "%1$s assigned system tag %3$s to %2$s" : "%1$s assigned system tag %3$s to %2$s",
-    "You unassigned system tag %3$s from %2$s" : "You unassigned system tag %3$s from %2$s",
-    "%1$s unassigned system tag %3$s from %2$s" : "%1$s unassigned system tag %3$s from %2$s",
+    "{actor} updated system tag {oldsystemtag} to {newsystemtag}" : "{actor} updated system tag {oldsystemtag} to {newsystemtag}",
+    "You added system tag %2$s to %1$s" : "You added system tag %2$s to %1$s",
+    "You added system tag {systemtag} to {file}" : "You added system tag {systemtag} to {file}",
+    "%1$s added system tag %3$s to %2$s" : "%1$s added system tag %3$s to %2$s",
+    "{actor} added system tag {systemtag} to {file}" : "{actor} added system tag {systemtag} to {file}",
+    "You removed system tag %2$s from %1$s" : "You removed system tag %2$s from %1$s",
+    "You removed system tag {systemtag} from {file}" : "You removed system tag {systemtag} from {file}",
+    "%1$s removed system tag %3$s from %2$s" : "%1$s removed system tag %3$s from %2$s",
+    "{actor} removed system tag {systemtag} from {file}" : "{actor} removed system tag {systemtag} from {file}",
     "%s (restricted)" : "%s (restricted)",
     "%s (invisible)" : "%s (invisible)",
+    "<strong>System tags</strong> for a file have been modified" : "<strong>System tags</strong> for a file have been modified",
+    "Collaborative tags" : "Collaborative tags",
+    "Create and edit collaborative tags. These tags affect all users." : "Create and edit collaborative tags. These tags affect all users.",
+    "Select tag …" : "Select tag …",
     "Name" : "Name",
+    "Delete" : "Delete",
+    "Public" : "Public",
+    "Restricted" : "Restricted",
+    "Invisible" : "Invisible",
+    "Reset" : "Reset",
     "No files in here" : "No files in here",
     "No entries found in this folder" : "No entries found in this folder",
     "Size" : "Size",
diff --git a/apps/theming/l10n/en_GB.js b/apps/theming/l10n/en_GB.js
index 547008525e4..8d18b1ff95c 100644
--- a/apps/theming/l10n/en_GB.js
+++ b/apps/theming/l10n/en_GB.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Theming" : "Theming",
     "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming makes it possible to easily customise the look and feel of your instance and supported clients. This will be visible for all users.",
     "Name" : "Name",
+    "Reset to default" : "Reset to default",
     "Web address" : "Web address",
     "Web address https://…" : "Web address https://…",
     "Slogan" : "Slogan",
@@ -23,6 +24,7 @@ OC.L10N.register(
     "Upload new logo" : "Upload new logo",
     "Login image" : "Login image",
     "Upload new login background" : "Upload new login background",
+    "Remove background image" : "Remove background image",
     "reset to default" : "reset to default",
     "Log in image" : "Log in image"
 },
diff --git a/apps/theming/l10n/en_GB.json b/apps/theming/l10n/en_GB.json
index 447de863a81..ace85849a36 100644
--- a/apps/theming/l10n/en_GB.json
+++ b/apps/theming/l10n/en_GB.json
@@ -13,6 +13,7 @@
     "Theming" : "Theming",
     "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Theming makes it possible to easily customise the look and feel of your instance and supported clients. This will be visible for all users.",
     "Name" : "Name",
+    "Reset to default" : "Reset to default",
     "Web address" : "Web address",
     "Web address https://…" : "Web address https://…",
     "Slogan" : "Slogan",
@@ -21,6 +22,7 @@
     "Upload new logo" : "Upload new logo",
     "Login image" : "Login image",
     "Upload new login background" : "Upload new login background",
+    "Remove background image" : "Remove background image",
     "reset to default" : "reset to default",
     "Log in image" : "Log in image"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/theming/l10n/es_MX.js b/apps/theming/l10n/es_MX.js
index 4abbb4df43f..5e92199f177 100644
--- a/apps/theming/l10n/es_MX.js
+++ b/apps/theming/l10n/es_MX.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Theming" : "Tematizar",
     "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve su instancia y clientes soportados. Esto será visible para todos los usuarios. ",
     "Name" : "Nombre",
+    "Reset to default" : "Restablecer al predeterminado",
     "Web address" : "Dirección web",
     "Web address https://…" : "Dirección web https://...",
     "Slogan" : "Lema",
diff --git a/apps/theming/l10n/es_MX.json b/apps/theming/l10n/es_MX.json
index 46f6196a998..8ea9de1e3e8 100644
--- a/apps/theming/l10n/es_MX.json
+++ b/apps/theming/l10n/es_MX.json
@@ -13,6 +13,7 @@
     "Theming" : "Tematizar",
     "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "El tematizar hace posible personalizar facilmente la manera en que se ve su instancia y clientes soportados. Esto será visible para todos los usuarios. ",
     "Name" : "Nombre",
+    "Reset to default" : "Restablecer al predeterminado",
     "Web address" : "Dirección web",
     "Web address https://…" : "Dirección web https://...",
     "Slogan" : "Lema",
diff --git a/apps/twofactor_backupcodes/l10n/en_GB.js b/apps/twofactor_backupcodes/l10n/en_GB.js
new file mode 100644
index 00000000000..fc9ec043807
--- /dev/null
+++ b/apps/twofactor_backupcodes/l10n/en_GB.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "twofactor_backupcodes",
+    {
+    "Generate backup codes" : "Generate backup codes",
+    "Backup codes have been generated. {{used}} of {{total}} codes have been used." : "Backup codes have been generated. {{used}} of {{total}} codes have been used.",
+    "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later" : "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later",
+    "Save backup codes" : "Save backup codes",
+    "Print backup codes" : "Print backup codes",
+    "Regenerate backup codes" : "Regenerate backup codes",
+    "If you regenerate backup codes, you automatically invalidate old codes." : "If you regenerate backup codes, you automatically invalidate old codes.",
+    "An error occurred while generating your backup codes" : "An error occurred while generating your backup codes",
+    "Nextcloud backup codes" : "Nextcloud backup codes",
+    "You created two-factor backup codes for your account" : "You created two-factor backup codes for your account",
+    "Backup code" : "Backup code",
+    "Use backup code" : "Use backup code",
+    "Two factor backup codes" : "Two factor backup codes",
+    "Second-factor backup codes" : "Second-factor backup codes"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/twofactor_backupcodes/l10n/en_GB.json b/apps/twofactor_backupcodes/l10n/en_GB.json
new file mode 100644
index 00000000000..21e2d234baa
--- /dev/null
+++ b/apps/twofactor_backupcodes/l10n/en_GB.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Generate backup codes" : "Generate backup codes",
+    "Backup codes have been generated. {{used}} of {{total}} codes have been used." : "Backup codes have been generated. {{used}} of {{total}} codes have been used.",
+    "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later" : "These are your backup codes. Please save and/or print them as you will not be able to read the codes again later",
+    "Save backup codes" : "Save backup codes",
+    "Print backup codes" : "Print backup codes",
+    "Regenerate backup codes" : "Regenerate backup codes",
+    "If you regenerate backup codes, you automatically invalidate old codes." : "If you regenerate backup codes, you automatically invalidate old codes.",
+    "An error occurred while generating your backup codes" : "An error occurred while generating your backup codes",
+    "Nextcloud backup codes" : "Nextcloud backup codes",
+    "You created two-factor backup codes for your account" : "You created two-factor backup codes for your account",
+    "Backup code" : "Backup code",
+    "Use backup code" : "Use backup code",
+    "Two factor backup codes" : "Two factor backup codes",
+    "Second-factor backup codes" : "Second-factor backup codes"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/twofactor_backupcodes/l10n/fi.js b/apps/twofactor_backupcodes/l10n/fi.js
index 01203d93c9b..c267ef4a037 100644
--- a/apps/twofactor_backupcodes/l10n/fi.js
+++ b/apps/twofactor_backupcodes/l10n/fi.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "You created two-factor backup codes for your account" : "Loit kaksivaiheisen tunnistautumisen varakoodit tilillesi",
     "Backup code" : "Varakoodi",
     "Use backup code" : "Käytä varakoodia",
+    "Two factor backup codes" : "Kaksivaiheisen tunnistautumisen varakoodit",
     "Second-factor backup codes" : "Kaksivaiheisen tunnistautumisen varakoodit"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/twofactor_backupcodes/l10n/fi.json b/apps/twofactor_backupcodes/l10n/fi.json
index 516e00216ff..2552aa37d71 100644
--- a/apps/twofactor_backupcodes/l10n/fi.json
+++ b/apps/twofactor_backupcodes/l10n/fi.json
@@ -11,6 +11,7 @@
     "You created two-factor backup codes for your account" : "Loit kaksivaiheisen tunnistautumisen varakoodit tilillesi",
     "Backup code" : "Varakoodi",
     "Use backup code" : "Käytä varakoodia",
+    "Two factor backup codes" : "Kaksivaiheisen tunnistautumisen varakoodit",
     "Second-factor backup codes" : "Kaksivaiheisen tunnistautumisen varakoodit"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/updatenotification/l10n/en_GB.js b/apps/updatenotification/l10n/en_GB.js
index cd32df87ae2..bafff3481ea 100644
--- a/apps/updatenotification/l10n/en_GB.js
+++ b/apps/updatenotification/l10n/en_GB.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Update to %1$s is available." : "Update to %1$s is available.",
     "Update for %1$s to version %2$s is available." : "Update for %1$s to version %2$s is available.",
     "Update for {app} to version %s is available." : "Update for {app} to version %s is available.",
+    "Update notification" : "Update notification",
     "A new version is available: %s" : "A new version is available: %s",
     "Open updater" : "Open updater",
     "Download now" : "Download now",
diff --git a/apps/updatenotification/l10n/en_GB.json b/apps/updatenotification/l10n/en_GB.json
index f8c435efdb7..d79882ae5b1 100644
--- a/apps/updatenotification/l10n/en_GB.json
+++ b/apps/updatenotification/l10n/en_GB.json
@@ -8,6 +8,7 @@
     "Update to %1$s is available." : "Update to %1$s is available.",
     "Update for %1$s to version %2$s is available." : "Update for %1$s to version %2$s is available.",
     "Update for {app} to version %s is available." : "Update for {app} to version %s is available.",
+    "Update notification" : "Update notification",
     "A new version is available: %s" : "A new version is available: %s",
     "Open updater" : "Open updater",
     "Download now" : "Download now",
diff --git a/apps/updatenotification/l10n/fi.js b/apps/updatenotification/l10n/fi.js
index 3c65b0ad132..c321c228e8a 100644
--- a/apps/updatenotification/l10n/fi.js
+++ b/apps/updatenotification/l10n/fi.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Update to %1$s is available." : "Kohteen %1$s päivitys on saatavilla.",
     "Update for %1$s to version %2$s is available." : "Kohteen %1$s päivitys versioon %2$s on saatavilla.",
     "Update for {app} to version %s is available." : "Sovelluksen {app} päivitys versioon %s on saatavilla.",
+    "Update notification" : "Päivitysilmoitus",
     "A new version is available: %s" : "Uusi versio on saatavilla: %s",
     "Open updater" : "Avaa päivittäjä",
     "Download now" : "Lataa heti",
diff --git a/apps/updatenotification/l10n/fi.json b/apps/updatenotification/l10n/fi.json
index 77ce0f5238f..8745f7fc9de 100644
--- a/apps/updatenotification/l10n/fi.json
+++ b/apps/updatenotification/l10n/fi.json
@@ -8,6 +8,7 @@
     "Update to %1$s is available." : "Kohteen %1$s päivitys on saatavilla.",
     "Update for %1$s to version %2$s is available." : "Kohteen %1$s päivitys versioon %2$s on saatavilla.",
     "Update for {app} to version %s is available." : "Sovelluksen {app} päivitys versioon %s on saatavilla.",
+    "Update notification" : "Päivitysilmoitus",
     "A new version is available: %s" : "Uusi versio on saatavilla: %s",
     "Open updater" : "Avaa päivittäjä",
     "Download now" : "Lataa heti",
diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js
index 43475532412..08e2c27dc9d 100644
--- a/apps/user_ldap/l10n/en_GB.js
+++ b/apps/user_ldap/l10n/en_GB.js
@@ -12,6 +12,13 @@ OC.L10N.register(
     "No data specified" : "No data specified",
     " Could not set configuration %s" : " Could not set configuration %s",
     "Action does not exist" : "Action does not exist",
+    "LDAP user and group backend" : "LDAP user and group backend",
+    "Renewing …" : "Renewing …",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
     "The Base DN appears to be wrong" : "The Base DN appears to be wrong",
     "Testing configuration…" : "Testing configuration…",
     "Configuration incorrect" : "Configuration incorrect",
@@ -40,11 +47,19 @@ OC.L10N.register(
     "Select attributes" : "Select attributes",
     "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>",
     "User found and settings verified." : "User found and settings verified.",
+    "Settings verified, but more than one user found. Only the first will be able to login. Consider a more narrow filter." : "Settings verified, but more than one user found. Only the first will be able to login. Consider a more narrow filter.",
     "An unspecified error occurred. Please check the settings and the log." : "An unspecified error occurred. Please check the settings and the log.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "The search filter is invalid, probably due to syntax issues like an uneven number of opened and closed brackets. Please revise.",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "A connection error to LDAP / AD occurred, please check host, port and credentials.",
+    "The \"%uid\" placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "The \"%uid\" placeholder is missing. It will be replaced with the login name when querying LDAP / AD.",
     "Please provide a login name to test against" : "Please provide a login name to test against",
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "The group box was disabled, because the LDAP / AD server does not support memberOf.",
+    "Password change rejected. Hint: " : "Password change rejected. Hint: ",
+    "Please login with the new password" : "Please login with the new password",
+    "Your password will expire tomorrow." : "Your password will expire tomorrow.",
+    "Your password will expire today." : "Your password will expire today.",
+    "_Your password will expire within %n day._::_Your password will expire within %n days._" : ["Your password will expire within %n day.","Your password will expire within %n days."],
+    "LDAP / AD integration" : "LDAP / AD integration",
     "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
     "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.",
@@ -61,8 +76,10 @@ OC.L10N.register(
     "Edit LDAP Query" : "Edit LDAP Query",
     "LDAP Filter:" : "LDAP Filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "The filter specifies which LDAP groups shall have access to the %s instance.",
+    "Verify settings and count the groups" : "Verify settings and count the groups",
     "When logging in, %s will find the user based on the following attributes:" : "When logging in, %s will find the user based on the following attributes:",
     "LDAP / AD Username:" : "LDAP / AD Username:",
+    "Allows login against the LDAP / AD username, which is either uid or sAMAccountName and will be detected." : "Allows login against the LDAP / AD username, which is either uid or samAccountName and will be detected.",
     "LDAP / AD Email Address:" : "LDAP / AD Email Address:",
     "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed.",
     "Other Attributes:" : "Other Attributes:",
@@ -71,9 +88,11 @@ OC.L10N.register(
     "Verify settings" : "Verify settings",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
+    "Add a new configuration" : "Add a new configuration",
     "Copy current configuration into new directory binding" : "Copy current configuration into new directory binding",
     "Delete the current configuration" : "Delete the current configuration",
     "Host" : "Host",
+    "You can omit the protocol, unless you require SSL. If so, start with ldaps://" : "You can omit the protocol, unless you require SSL. If so, start with ldaps://",
     "Port" : "Port",
     "Detect Port" : "Detect Port",
     "User DN" : "User DN",
@@ -86,12 +105,22 @@ OC.L10N.register(
     "Test Base DN" : "Test Base DN",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.",
     "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)",
+    "Listing and searching for users is constrained by these criteria:" : "Listing and searching for users is constrained by these criteria:",
     "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.",
     "Verify settings and count users" : "Verify settings and count users",
     "Saving" : "Saving",
     "Back" : "Back",
     "Continue" : "Continue",
+    "Please renew your password." : "Please renew your password.",
+    "An internal error occurred." : "An internal error occurred.",
+    "Please try again or contact your administrator." : "Please try again or contact your administrator.",
+    "Current password" : "Current password",
+    "New password" : "New password",
+    "Renew password" : "Renew password",
+    "Wrong password. Reset it?" : "Wrong password. Reset it?",
+    "Wrong password." : "Wrong password.",
+    "Cancel" : "Cancel",
     "LDAP" : "LDAP",
     "Server" : "Server",
     "Users" : "Users",
@@ -134,10 +163,18 @@ OC.L10N.register(
     "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)",
     "Paging chunksize" : "Paging chunksize",
     "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)",
+    "Enable LDAP password changes per user" : "Enable LDAP password changes per user",
+    "Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server." : "Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server.",
+    "(New password is sent as plain text to LDAP)" : "(New password is sent as plain text to LDAP)",
+    "Default password policy DN" : "Default password policy DN",
+    "The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling." : "The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling.",
     "Special Attributes" : "Special Attributes",
     "Quota Field" : "Quota Field",
+    "Leave empty for user's default quota. Otherwise, specify an LDAP/AD attribute." : "Leave empty for user's default quota. Otherwise, specify an LDAP/AD attribute.",
     "Quota Default" : "Quota Default",
+    "Override default quota for LDAP users who do not have a quota set in the Quota Field." : "Override default quota for LDAP users who do not have a quota set in the Quota Field.",
     "Email Field" : "Email Field",
+    "Set the user's email from their LDAP attribute. Leave it empty for default behaviour." : "Set the user's email from their LDAP attribute. Leave it empty for default behaviour.",
     "User Home Folder Naming Rule" : "User Home Folder Naming Rule",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.",
     "Internal Username" : "Internal Username",
diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json
index 85328b1fff8..bee955fed3b 100644
--- a/apps/user_ldap/l10n/en_GB.json
+++ b/apps/user_ldap/l10n/en_GB.json
@@ -10,6 +10,13 @@
     "No data specified" : "No data specified",
     " Could not set configuration %s" : " Could not set configuration %s",
     "Action does not exist" : "Action does not exist",
+    "LDAP user and group backend" : "LDAP user and group backend",
+    "Renewing …" : "Renewing …",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
     "The Base DN appears to be wrong" : "The Base DN appears to be wrong",
     "Testing configuration…" : "Testing configuration…",
     "Configuration incorrect" : "Configuration incorrect",
@@ -38,11 +45,19 @@
     "Select attributes" : "Select attributes",
     "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>",
     "User found and settings verified." : "User found and settings verified.",
+    "Settings verified, but more than one user found. Only the first will be able to login. Consider a more narrow filter." : "Settings verified, but more than one user found. Only the first will be able to login. Consider a more narrow filter.",
     "An unspecified error occurred. Please check the settings and the log." : "An unspecified error occurred. Please check the settings and the log.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "The search filter is invalid, probably due to syntax issues like an uneven number of opened and closed brackets. Please revise.",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "A connection error to LDAP / AD occurred, please check host, port and credentials.",
+    "The \"%uid\" placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "The \"%uid\" placeholder is missing. It will be replaced with the login name when querying LDAP / AD.",
     "Please provide a login name to test against" : "Please provide a login name to test against",
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "The group box was disabled, because the LDAP / AD server does not support memberOf.",
+    "Password change rejected. Hint: " : "Password change rejected. Hint: ",
+    "Please login with the new password" : "Please login with the new password",
+    "Your password will expire tomorrow." : "Your password will expire tomorrow.",
+    "Your password will expire today." : "Your password will expire today.",
+    "_Your password will expire within %n day._::_Your password will expire within %n days._" : ["Your password will expire within %n day.","Your password will expire within %n days."],
+    "LDAP / AD integration" : "LDAP / AD integration",
     "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
     "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.",
@@ -59,8 +74,10 @@
     "Edit LDAP Query" : "Edit LDAP Query",
     "LDAP Filter:" : "LDAP Filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "The filter specifies which LDAP groups shall have access to the %s instance.",
+    "Verify settings and count the groups" : "Verify settings and count the groups",
     "When logging in, %s will find the user based on the following attributes:" : "When logging in, %s will find the user based on the following attributes:",
     "LDAP / AD Username:" : "LDAP / AD Username:",
+    "Allows login against the LDAP / AD username, which is either uid or sAMAccountName and will be detected." : "Allows login against the LDAP / AD username, which is either uid or samAccountName and will be detected.",
     "LDAP / AD Email Address:" : "LDAP / AD Email Address:",
     "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed.",
     "Other Attributes:" : "Other Attributes:",
@@ -69,9 +86,11 @@
     "Verify settings" : "Verify settings",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
+    "Add a new configuration" : "Add a new configuration",
     "Copy current configuration into new directory binding" : "Copy current configuration into new directory binding",
     "Delete the current configuration" : "Delete the current configuration",
     "Host" : "Host",
+    "You can omit the protocol, unless you require SSL. If so, start with ldaps://" : "You can omit the protocol, unless you require SSL. If so, start with ldaps://",
     "Port" : "Port",
     "Detect Port" : "Detect Port",
     "User DN" : "User DN",
@@ -84,12 +103,22 @@
     "Test Base DN" : "Test Base DN",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.",
     "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)",
+    "Listing and searching for users is constrained by these criteria:" : "Listing and searching for users is constrained by these criteria:",
     "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.",
     "Verify settings and count users" : "Verify settings and count users",
     "Saving" : "Saving",
     "Back" : "Back",
     "Continue" : "Continue",
+    "Please renew your password." : "Please renew your password.",
+    "An internal error occurred." : "An internal error occurred.",
+    "Please try again or contact your administrator." : "Please try again or contact your administrator.",
+    "Current password" : "Current password",
+    "New password" : "New password",
+    "Renew password" : "Renew password",
+    "Wrong password. Reset it?" : "Wrong password. Reset it?",
+    "Wrong password." : "Wrong password.",
+    "Cancel" : "Cancel",
     "LDAP" : "LDAP",
     "Server" : "Server",
     "Users" : "Users",
@@ -132,10 +161,18 @@
     "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)",
     "Paging chunksize" : "Paging chunksize",
     "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)",
+    "Enable LDAP password changes per user" : "Enable LDAP password changes per user",
+    "Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server." : "Allow LDAP users to change their password and allow Super Administrators and Group Administrators to change the password of their LDAP users. Only works when access control policies are configured accordingly on the LDAP server. As passwords are sent in plaintext to the LDAP server, transport encryption must be used and password hashing should be configured on the LDAP server.",
+    "(New password is sent as plain text to LDAP)" : "(New password is sent as plain text to LDAP)",
+    "Default password policy DN" : "Default password policy DN",
+    "The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling." : "The DN of a default password policy that will be used for password expiry handling. Works only when LDAP password changes per user are enabled and is only supported by OpenLDAP. Leave empty to disable password expiry handling.",
     "Special Attributes" : "Special Attributes",
     "Quota Field" : "Quota Field",
+    "Leave empty for user's default quota. Otherwise, specify an LDAP/AD attribute." : "Leave empty for user's default quota. Otherwise, specify an LDAP/AD attribute.",
     "Quota Default" : "Quota Default",
+    "Override default quota for LDAP users who do not have a quota set in the Quota Field." : "Override default quota for LDAP users who do not have a quota set in the Quota Field.",
     "Email Field" : "Email Field",
+    "Set the user's email from their LDAP attribute. Leave it empty for default behaviour." : "Set the user's email from their LDAP attribute. Leave it empty for default behaviour.",
     "User Home Folder Naming Rule" : "User Home Folder Naming Rule",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.",
     "Internal Username" : "Internal Username",
diff --git a/apps/workflowengine/l10n/en_GB.js b/apps/workflowengine/l10n/en_GB.js
new file mode 100644
index 00000000000..735142aefbc
--- /dev/null
+++ b/apps/workflowengine/l10n/en_GB.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "workflowengine",
+    {
+    "Saved" : "Saved",
+    "Saving failed:" : "Saving failed:",
+    "File MIME type" : "File MIME type",
+    "is" : "is",
+    "is not" : "is not",
+    "matches" : "matches",
+    "does not match" : "does not match",
+    "Example: {placeholder}" : "Example: {placeholder}",
+    "File size (upload)" : "File size (upload)",
+    "less" : "less",
+    "less or equals" : "less or equals",
+    "greater or equals" : "greater or equals",
+    "greater" : "greater",
+    "File system tag" : "File system tag",
+    "is tagged with" : "is tagged with",
+    "is not tagged with" : "is not tagged with",
+    "Select tag…" : "Select tag…",
+    "Request remote address" : "Request remote address",
+    "matches IPv4" : "matches IPv4",
+    "does not match IPv4" : "does not match IPv4",
+    "matches IPv6" : "matches IPv6",
+    "does not match IPv6" : "does not match IPv6",
+    "Request time" : "Request time",
+    "between" : "between",
+    "not between" : "not between",
+    "Start" : "Start",
+    "End" : "End",
+    "Select timezone…" : "Select timezone…",
+    "Request URL" : "Request URL",
+    "Predefined URLs" : "Predefined URLs",
+    "Files WebDAV" : "Files WebDAV",
+    "Request user agent" : "Request user agent",
+    "Sync clients" : "Sync clients",
+    "Android client" : "Android client",
+    "iOS client" : "iOS client",
+    "Desktop client" : "Desktop client",
+    "User group membership" : "User group membership",
+    "is member of" : "is member of",
+    "is not member of" : "is not member of",
+    "The given operator is invalid" : "The given operator is invalid",
+    "The given regular expression is invalid" : "The given regular expression is invalid",
+    "The given file size is invalid" : "The given file size is invalid",
+    "The given tag id is invalid" : "The given tag id is invalid",
+    "The given IP range is invalid" : "The given IP range is invalid",
+    "The given IP range is not valid for IPv4" : "The given IP range is not valid for IPv4",
+    "The given IP range is not valid for IPv6" : "The given IP range is not valid for IPv6",
+    "The given time span is invalid" : "The given time span is invalid",
+    "The given start time is invalid" : "The given start time is invalid",
+    "The given end time is invalid" : "The given end time is invalid",
+    "The given group does not exist" : "The given group does not exist",
+    "Check %s is invalid or does not exist" : "Check %s is invalid or does not exist",
+    "Operation #%s does not exist" : "Operation #%s does not exist",
+    "Operation %s does not exist" : "Operation %s does not exist",
+    "Operation %s is invalid" : "Operation %s is invalid",
+    "Check %s does not exist" : "Check %s does not exist",
+    "Check %s is invalid" : "Check %s is invalid",
+    "Check #%s does not exist" : "Check #%s does not exist",
+    "Workflow" : "Workflow",
+    "Files workflow engine" : "Files workflow engine",
+    "Open documentation" : "Open documentation",
+    "Add rule group" : "Add rule group",
+    "Short rule description" : "Short rule description",
+    "Add rule" : "Add rule",
+    "Reset" : "Reset",
+    "Save" : "Save",
+    "Saving…" : "Saving…",
+    "Loading…" : "Loading…",
+    "Successfully saved" : "Successfully saved",
+    "File mime type" : "File mime type"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/workflowengine/l10n/en_GB.json b/apps/workflowengine/l10n/en_GB.json
new file mode 100644
index 00000000000..e05329d3f45
--- /dev/null
+++ b/apps/workflowengine/l10n/en_GB.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Saved" : "Saved",
+    "Saving failed:" : "Saving failed:",
+    "File MIME type" : "File MIME type",
+    "is" : "is",
+    "is not" : "is not",
+    "matches" : "matches",
+    "does not match" : "does not match",
+    "Example: {placeholder}" : "Example: {placeholder}",
+    "File size (upload)" : "File size (upload)",
+    "less" : "less",
+    "less or equals" : "less or equals",
+    "greater or equals" : "greater or equals",
+    "greater" : "greater",
+    "File system tag" : "File system tag",
+    "is tagged with" : "is tagged with",
+    "is not tagged with" : "is not tagged with",
+    "Select tag…" : "Select tag…",
+    "Request remote address" : "Request remote address",
+    "matches IPv4" : "matches IPv4",
+    "does not match IPv4" : "does not match IPv4",
+    "matches IPv6" : "matches IPv6",
+    "does not match IPv6" : "does not match IPv6",
+    "Request time" : "Request time",
+    "between" : "between",
+    "not between" : "not between",
+    "Start" : "Start",
+    "End" : "End",
+    "Select timezone…" : "Select timezone…",
+    "Request URL" : "Request URL",
+    "Predefined URLs" : "Predefined URLs",
+    "Files WebDAV" : "Files WebDAV",
+    "Request user agent" : "Request user agent",
+    "Sync clients" : "Sync clients",
+    "Android client" : "Android client",
+    "iOS client" : "iOS client",
+    "Desktop client" : "Desktop client",
+    "User group membership" : "User group membership",
+    "is member of" : "is member of",
+    "is not member of" : "is not member of",
+    "The given operator is invalid" : "The given operator is invalid",
+    "The given regular expression is invalid" : "The given regular expression is invalid",
+    "The given file size is invalid" : "The given file size is invalid",
+    "The given tag id is invalid" : "The given tag id is invalid",
+    "The given IP range is invalid" : "The given IP range is invalid",
+    "The given IP range is not valid for IPv4" : "The given IP range is not valid for IPv4",
+    "The given IP range is not valid for IPv6" : "The given IP range is not valid for IPv6",
+    "The given time span is invalid" : "The given time span is invalid",
+    "The given start time is invalid" : "The given start time is invalid",
+    "The given end time is invalid" : "The given end time is invalid",
+    "The given group does not exist" : "The given group does not exist",
+    "Check %s is invalid or does not exist" : "Check %s is invalid or does not exist",
+    "Operation #%s does not exist" : "Operation #%s does not exist",
+    "Operation %s does not exist" : "Operation %s does not exist",
+    "Operation %s is invalid" : "Operation %s is invalid",
+    "Check %s does not exist" : "Check %s does not exist",
+    "Check %s is invalid" : "Check %s is invalid",
+    "Check #%s does not exist" : "Check #%s does not exist",
+    "Workflow" : "Workflow",
+    "Files workflow engine" : "Files workflow engine",
+    "Open documentation" : "Open documentation",
+    "Add rule group" : "Add rule group",
+    "Short rule description" : "Short rule description",
+    "Add rule" : "Add rule",
+    "Reset" : "Reset",
+    "Save" : "Save",
+    "Saving…" : "Saving…",
+    "Loading…" : "Loading…",
+    "Successfully saved" : "Successfully saved",
+    "File mime type" : "File mime type"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file