[tx-robot] updated from transifex

76 files changed, 2436 insertions, 246 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
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
new file mode 100644
index 00000000000..51c2264d1af
--- /dev/null
+++ b/core/l10n/en_GB.js
@@ -0,0 +1,344 @@
+OC.L10N.register(
+    "core",
+    {
+    "Please select a file." : "Please select a file.",
+    "File is too big" : "File is too big",
+    "The selected file is not an image." : "The selected file is not an image.",
+    "The selected file cannot be read." : "The selected file cannot be read.",
+    "Invalid file provided" : "Invalid file provided",
+    "No image or file provided" : "No image or file provided",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "An error occurred. Please contact your admin." : "An error occurred. Please contact your admin.",
+    "No temporary profile picture available, try again" : "No temporary profile picture available, try again",
+    "No crop data provided" : "No crop data provided",
+    "No valid crop data provided" : "No valid crop data provided",
+    "Crop is not square" : "Crop is not square",
+    "State token does not match" : "State token does not match",
+    "Password reset is disabled" : "Password reset is disabled",
+    "Couldn't reset password because the token is invalid" : "Couldn't reset password because the token is invalid",
+    "Couldn't reset password because the token is expired" : "Couldn't reset password because the token is expired",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Could not send reset email because there is no email address for this username. Please contact your administrator.",
+    "Password reset" : "Password reset",
+    "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Click the following button to reset your password. If you have not requested the password reset, then ignore this email.",
+    "Click the following link to reset your password. If you have not requested the password reset, then ignore this email." : "Click the following link to reset your password. If you have not requested the password reset, then ignore this email.",
+    "Reset your password" : "Reset your password",
+    "%s password reset" : "%s password reset",
+    "Couldn't send reset email. Please contact your administrator." : "Couldn't send reset email. Please contact your administrator.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Couldn't send reset email. Please make sure your username is correct.",
+    "Preparing update" : "Preparing update",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Repair warning: ",
+    "Repair error: " : "Repair error: ",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Please use the command line updater because automatic updating is disabled in the config.php.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Checking table %s",
+    "Turned on maintenance mode" : "Turned on maintenance mode",
+    "Turned off maintenance mode" : "Turned off maintenance mode",
+    "Maintenance mode is kept active" : "Maintenance mode is kept active",
+    "Updating database schema" : "Updating database schema",
+    "Updated database" : "Updated database",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Checking whether the database schema can be updated (this can take a long time depending on the database size)",
+    "Checked database schema update" : "Checked database schema update",
+    "Checking updates of apps" : "Checking updates of apps",
+    "Checking for update of app \"%s\" in appstore" : "Checking for update of app \"%s\" in appstore",
+    "Update app \"%s\" from appstore" : "Update app \"%s\" from appstore",
+    "Checked for update of app \"%s\" in appstore" : "Checked for update of app \"%s\" in appstore",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)",
+    "Checked database schema update for apps" : "Checked database schema update for apps",
+    "Updated \"%s\" to %s" : "Updated \"%s\" to %s",
+    "Set log level to debug" : "Set log level to debug",
+    "Reset log level" : "Reset log level",
+    "Starting code integrity check" : "Starting code integrity check",
+    "Finished code integrity check" : "Finished code integrity check",
+    "%s (3rdparty)" : "%s (3rdparty)",
+    "%s (incompatible)" : "%s (incompatible)",
+    "Following apps have been disabled: %s" : "Following apps have been disabled: %s",
+    "Already up to date" : "Already up to date",
+    "No contacts found" : "No contacts found",
+    "Show all contacts …" : "Show all contacts …",
+    "There was an error loading your contacts" : "There was an error loading your contacts",
+    "Loading your contacts …" : "Loading your contacts …",
+    "Looking for {term} …" : "Looking for {term} …",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>",
+    "No action available" : "No action available",
+    "Error fetching contact actions" : "Error fetching contact actions",
+    "Settings" : "Settings",
+    "Connection to server lost" : "Connection to server lost",
+    "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem loading page, reloading in %n second","Problem loading page, reloading in %n seconds"],
+    "Saving..." : "Saving...",
+    "Dismiss" : "Dismiss",
+    "This action requires you to confirm your password" : "This action requires you to confirm your password",
+    "Authentication required" : "Authentication required",
+    "Password" : "Password",
+    "Cancel" : "Cancel",
+    "Confirm" : "Confirm",
+    "Failed to authenticate, try again" : "Failed to authenticate, try again",
+    "seconds ago" : "seconds ago",
+    "Logging in …" : "Logging in …",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.",
+    "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
+    "I know what I'm doing" : "I know what I'm doing",
+    "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
+    "No" : "No",
+    "Yes" : "Yes",
+    "No files in here" : "No files in here",
+    "Choose" : "Choose",
+    "Error loading file picker template: {error}" : "Error loading file picker template: {error}",
+    "OK" : "OK",
+    "Error loading message template: {error}" : "Error loading message template: {error}",
+    "read-only" : "read-only",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file conflict","{count} file conflicts"],
+    "One file conflict" : "One file conflict",
+    "New Files" : "New Files",
+    "Already existing files" : "Already existing files",
+    "Which files do you want to keep?" : "Which files do you wish to keep?",
+    "If you select both versions, the copied file will have a number added to its name." : "If you select both versions, the copied file will have a number added to its name.",
+    "Continue" : "Continue",
+    "(all selected)" : "(all selected)",
+    "({count} selected)" : "({count} selected)",
+    "Error loading file exists template" : "Error loading file exists template",
+    "Pending" : "Pending",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Your web server is not yet set up properly to allow file synchronisation because the WebDAV interface seems to be broken.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)",
+    "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:",
+    "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function.",
+    "Error occurred while checking server setup" : "Error occurred whilst checking server setup",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.",
+    "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>.",
+    "Shared" : "Shared",
+    "Shared with {recipients}" : "Shared with {recipients}",
+    "Error setting expiration date" : "Error setting expiration date",
+    "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
+    "Set expiration date" : "Set expiration date",
+    "Expiration" : "Expiration",
+    "Expiration date" : "Expiration date",
+    "Choose a password for the public link" : "Choose a password for the public link",
+    "Choose a password for the public link or press \"Enter ↵\"" : "Choose a password for the public link or press \"Enter 
\"",
+    "Copied!" : "Copied!",
+    "Copy" : "Copy",
+    "Not supported!" : "Not supported!",
+    "Press ⌘-C to copy." : "Press ⌘-C to copy.",
+    "Press Ctrl-C to copy." : "Press Ctrl-C to copy.",
+    "Resharing is not allowed" : "Resharing is not allowed",
+    "Share to {name}" : "Share to {name}",
+    "Share link" : "Share link",
+    "Link" : "Link",
+    "Password protect" : "Password protect",
+    "Allow editing" : "Allow editing",
+    "Email link to person" : "Email link to person",
+    "Send" : "Send",
+    "Allow upload and editing" : "Allow upload and editing",
+    "Read only" : "Read only",
+    "File drop (upload only)" : "File drop (upload only)",
+    "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
+    "Shared with you by {owner}" : "Shared with you by {owner}",
+    "Choose a password for the mail share" : "Choose a password for the mail share",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} shared via link",
+    "group" : "group",
+    "remote" : "remote",
+    "email" : "email",
+    "shared by {sharer}" : "shared by {sharer}",
+    "Unshare" : "Unshare",
+    "Can reshare" : "Can reshare",
+    "Can edit" : "Can edit",
+    "Can create" : "Can create",
+    "Can change" : "Can change",
+    "Can delete" : "Can delete",
+    "Access control" : "Access control",
+    "Could not unshare" : "Could not unshare",
+    "Error while sharing" : "Error whilst sharing",
+    "Share details could not be loaded for this item." : "Share details could not be loaded for this item.",
+    "_At least {count} character is needed for autocompletion_::_At least {count} characters are needed for autocompletion_" : ["At least {count} character is needed for autocompletion","At least {count} characters are needed for autocompletion"],
+    "This list is maybe truncated - please refine your search term to see more results." : "This list is maybe truncated - please refine your search term to see more results.",
+    "No users or groups found for {search}" : "No users or groups found for {search}",
+    "No users found for {search}" : "No users found for {search}",
+    "An error occurred. Please try again" : "An error occurred. Please try again",
+    "{sharee} (group)" : "{sharee} (group)",
+    "{sharee} (remote)" : "{sharee} (remote)",
+    "{sharee} (email)" : "{sharee} (email)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
+    "Share" : "Share",
+    "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Share with other people by entering a user or group, a federated cloud ID or an email address.",
+    "Share with other people by entering a user or group or a federated cloud ID." : "Share with other people by entering a user or group or a federated cloud ID.",
+    "Share with other people by entering a user or group or an email address." : "Share with other people by entering a user or group or an email address.",
+    "Name or email address..." : "Name or email address...",
+    "Name or federated cloud ID..." : "Name or federated cloud ID...",
+    "Name, federated cloud ID or email address..." : "Name, federated cloud ID or email address...",
+    "Name..." : "Name...",
+    "Error" : "Error",
+    "Error removing share" : "Error removing share",
+    "Non-existing tag #{tag}" : "Non-existing tag #{tag}",
+    "restricted" : "restricted",
+    "invisible" : "invisible",
+    "({scope})" : "({scope})",
+    "Delete" : "Delete",
+    "Rename" : "Rename",
+    "Collaborative tags" : "Collaborative tags",
+    "No tags found" : "No tags found",
+    "unknown text" : "unknown text",
+    "Hello world!" : "Hello world!",
+    "sunny" : "sunny",
+    "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}",
+    "Hello {name}" : "Hello {name}",
+    "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>These are your search results<script>alert(1)</script></strong>",
+    "new" : "new",
+    "_download %n file_::_download %n files_" : ["download %n file","download %n files"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "The update is in progress, leaving this page might interrupt the process in some environments.",
+    "Update to {version}" : "Update to {version}",
+    "An error occurred." : "An error occurred.",
+    "Please reload the page." : "Please reload the page.",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>.",
+    "Continue to Nextcloud" : "Continue to Nextcloud",
+    "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["The update was successful. Redirecting you to Nextcloud in %n second.","The update was successful. Redirecting you to Nextcloud in %n seconds."],
+    "Searching other places" : "Searching other places",
+    "No search results in other folders for {tag}{filter}{endtag}" : "No search results in other folders for {tag}{filter}{endtag}",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} search result in another folder","{count} search results in other folders"],
+    "Personal" : "Personal",
+    "Users" : "Users",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Help",
+    "Access forbidden" : "Access denied",
+    "File not found" : "File not found",
+    "The specified document has not been found on the server." : "The specified document has not been found on the server.",
+    "You can click here to return to %s." : "You can click here to return to %s.",
+    "Internal Server Error" : "Internal Server Error",
+    "The server encountered an internal error and was unable to complete your request." : "The server encountered an internal error and was unable to complete your request.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.",
+    "More details can be found in the server log." : "More details can be found in the server log.",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Type: %s" : "Type: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "Security warning" : "Security warning",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Username" : "Username",
+    "Storage & database" : "Storage & database",
+    "Data folder" : "Data folder",
+    "Configure the database" : "Configure the database",
+    "Only %s is available." : "Only %s is available.",
+    "Install and activate additional PHP modules to choose other database types." : "Install and activate additional PHP modules to choose other database types.",
+    "For more details check out the documentation." : "For more details check out the documentation.",
+    "Database user" : "Database user",
+    "Database password" : "Database password",
+    "Database name" : "Database name",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Database host",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Please specify the port number along with the host name (e.g., localhost:5432).",
+    "Performance warning" : "Performance warning",
+    "SQLite will be used as database." : "SQLite will be used as database.",
+    "For larger installations we recommend to choose a different database backend." : "For larger installations we recommend to choose a different database backend.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especially when using the desktop client for file syncing, the use of SQLite is discouraged.",
+    "Finish setup" : "Finish setup",
+    "Finishing …" : "Finishing …",
+    "Need help?" : "Need help?",
+    "See the documentation" : "See the documentation",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.",
+    "More apps" : "More apps",
+    "Search" : "Search",
+    "This action requires you to confirm your password:" : "This action requires you to confirm your password:",
+    "Confirm your password" : "Confirm your password",
+    "Server side authentication failed!" : "Server side authentication failed!",
+    "Please contact your administrator." : "Please contact your administrator.",
+    "An internal error occurred." : "An internal error occurred.",
+    "Please try again or contact your administrator." : "Please try again or contact your administrator.",
+    "Username or email" : "Username or email",
+    "Wrong password. Reset it?" : "Wrong password. Reset it?",
+    "Wrong password." : "Wrong password.",
+    "Log in" : "Log in",
+    "Stay logged in" : "Stay logged in",
+    "Alternative Logins" : "Alternative Logins",
+    "You are about to grant \"%s\" access to your %s account." : "You are about to grant \"%s\" access to your %s account.",
+    "App token" : "App token",
+    "Alternative login using app token" : "Alternative login using app token",
+    "Redirecting …" : "Redirecting …",
+    "New password" : "New password",
+    "New Password" : "New Password",
+    "Reset password" : "Reset password",
+    "This Nextcloud instance is currently in single user mode." : "This Nextcloud instance is currently in single user mode.",
+    "This means only administrators can use the instance." : "This means only administrators can use the instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contact your system administrator if this message persists or appeared unexpectedly.",
+    "Thank you for your patience." : "Thank you for your patience.",
+    "Log out" : "Log out",
+    "Two-factor authentication" : "Two-factor authentication",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Enhanced security is enabled for your account. Please authenticate using a second factor.",
+    "Cancel log in" : "Cancel log in",
+    "Use backup code" : "Use backup code",
+    "Error while validating your second factor" : "Error while validating your second factor",
+    "You are accessing the server from an untrusted domain." : "You are accessing the server from an untrusted domain.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
+    "Add \"%s\" as trusted domain" : "Add \"%s\" as a trusted domain",
+    "App update required" : "App update required",
+    "%s will be updated to version %s" : "%s will be updated to version %s",
+    "These apps will be updated:" : "These apps will be updated:",
+    "These incompatible apps will be disabled:" : "These incompatible apps will be disabled:",
+    "The theme %s has been disabled." : "The theme %s has been disabled.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
+    "Start update" : "Start update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:",
+    "Detailed logs" : "Detailed logs",
+    "Update needed" : "Update needed",
+    "Please use the command line updater because you have a big instance with more than 50 users." : "Please use the command line updater because you have a big instance with more than 50 users.",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>.",
+    "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.",
+    "Upgrade via web on my own risk" : "Upgrade via web on my own risk",
+    "This %s instance is currently in maintenance mode, which may take a while." : "This %s instance is currently in maintenance mode, which may take a while.",
+    "This page will refresh itself when the %s instance is available again." : "This page will refresh itself when the %s instance is available again.",
+    "Problem loading page, reloading in 5 seconds" : "Problem loading page, reloading in 5 seconds",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
+    "Ok" : "OK",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.",
+    "Error while unsharing" : "Error whilst unsharing",
+    "can reshare" : "can reshare",
+    "can edit" : "can edit",
+    "can create" : "can create",
+    "can change" : "can change",
+    "can delete" : "can delete",
+    "access control" : "access control",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud",
+    "Share with users or by mail..." : "Share with users or by mail...",
+    "Share with users or remote users..." : "Share with users or remote users...",
+    "Share with users, remote users or by mail..." : "Share with users, remote users or by mail...",
+    "Share with users or groups..." : "Share with users or groups...",
+    "Share with users, groups or by mail..." : "Share with users, groups or by mail...",
+    "Share with users, groups or remote users..." : "Share with users, groups or remote users...",
+    "Share with users, groups, remote users or by mail..." : "Share with users, groups, remote users or by mail...",
+    "Share with users..." : "Share with users...",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Enter new",
+    "Add" : "Add",
+    "Edit tags" : "Edit tags",
+    "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
+    "No tags selected for deletion." : "No tags selected for deletion.",
+    "The update was successful. Redirecting you to Nextcloud now." : "The update was successful. Redirecting you to Nextcloud.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
+    "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
+    "Please use the command line updater because you have a big instance." : "Please use the command line updater because you have a big instance."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
new file mode 100644
index 00000000000..2e34c322d78
--- /dev/null
+++ b/core/l10n/en_GB.json
@@ -0,0 +1,342 @@
+{ "translations": {
+    "Please select a file." : "Please select a file.",
+    "File is too big" : "File is too big",
+    "The selected file is not an image." : "The selected file is not an image.",
+    "The selected file cannot be read." : "The selected file cannot be read.",
+    "Invalid file provided" : "Invalid file provided",
+    "No image or file provided" : "No image or file provided",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "An error occurred. Please contact your admin." : "An error occurred. Please contact your admin.",
+    "No temporary profile picture available, try again" : "No temporary profile picture available, try again",
+    "No crop data provided" : "No crop data provided",
+    "No valid crop data provided" : "No valid crop data provided",
+    "Crop is not square" : "Crop is not square",
+    "State token does not match" : "State token does not match",
+    "Password reset is disabled" : "Password reset is disabled",
+    "Couldn't reset password because the token is invalid" : "Couldn't reset password because the token is invalid",
+    "Couldn't reset password because the token is expired" : "Couldn't reset password because the token is expired",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Could not send reset email because there is no email address for this username. Please contact your administrator.",
+    "Password reset" : "Password reset",
+    "Click the following button to reset your password. If you have not requested the password reset, then ignore this email." : "Click the following button to reset your password. If you have not requested the password reset, then ignore this email.",
+    "Click the following link to reset your password. If you have not requested the password reset, then ignore this email." : "Click the following link to reset your password. If you have not requested the password reset, then ignore this email.",
+    "Reset your password" : "Reset your password",
+    "%s password reset" : "%s password reset",
+    "Couldn't send reset email. Please contact your administrator." : "Couldn't send reset email. Please contact your administrator.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Couldn't send reset email. Please make sure your username is correct.",
+    "Preparing update" : "Preparing update",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Repair warning: ",
+    "Repair error: " : "Repair error: ",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Please use the command line updater because automatic updating is disabled in the config.php.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Checking table %s",
+    "Turned on maintenance mode" : "Turned on maintenance mode",
+    "Turned off maintenance mode" : "Turned off maintenance mode",
+    "Maintenance mode is kept active" : "Maintenance mode is kept active",
+    "Updating database schema" : "Updating database schema",
+    "Updated database" : "Updated database",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Checking whether the database schema can be updated (this can take a long time depending on the database size)",
+    "Checked database schema update" : "Checked database schema update",
+    "Checking updates of apps" : "Checking updates of apps",
+    "Checking for update of app \"%s\" in appstore" : "Checking for update of app \"%s\" in appstore",
+    "Update app \"%s\" from appstore" : "Update app \"%s\" from appstore",
+    "Checked for update of app \"%s\" in appstore" : "Checked for update of app \"%s\" in appstore",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)",
+    "Checked database schema update for apps" : "Checked database schema update for apps",
+    "Updated \"%s\" to %s" : "Updated \"%s\" to %s",
+    "Set log level to debug" : "Set log level to debug",
+    "Reset log level" : "Reset log level",
+    "Starting code integrity check" : "Starting code integrity check",
+    "Finished code integrity check" : "Finished code integrity check",
+    "%s (3rdparty)" : "%s (3rdparty)",
+    "%s (incompatible)" : "%s (incompatible)",
+    "Following apps have been disabled: %s" : "Following apps have been disabled: %s",
+    "Already up to date" : "Already up to date",
+    "No contacts found" : "No contacts found",
+    "Show all contacts …" : "Show all contacts …",
+    "There was an error loading your contacts" : "There was an error loading your contacts",
+    "Loading your contacts …" : "Loading your contacts …",
+    "Looking for {term} …" : "Looking for {term} …",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>",
+    "No action available" : "No action available",
+    "Error fetching contact actions" : "Error fetching contact actions",
+    "Settings" : "Settings",
+    "Connection to server lost" : "Connection to server lost",
+    "_Problem loading page, reloading in %n second_::_Problem loading page, reloading in %n seconds_" : ["Problem loading page, reloading in %n second","Problem loading page, reloading in %n seconds"],
+    "Saving..." : "Saving...",
+    "Dismiss" : "Dismiss",
+    "This action requires you to confirm your password" : "This action requires you to confirm your password",
+    "Authentication required" : "Authentication required",
+    "Password" : "Password",
+    "Cancel" : "Cancel",
+    "Confirm" : "Confirm",
+    "Failed to authenticate, try again" : "Failed to authenticate, try again",
+    "seconds ago" : "seconds ago",
+    "Logging in …" : "Logging in …",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.",
+    "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. There will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
+    "I know what I'm doing" : "I know what I'm doing",
+    "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
+    "No" : "No",
+    "Yes" : "Yes",
+    "No files in here" : "No files in here",
+    "Choose" : "Choose",
+    "Error loading file picker template: {error}" : "Error loading file picker template: {error}",
+    "OK" : "OK",
+    "Error loading message template: {error}" : "Error loading message template: {error}",
+    "read-only" : "read-only",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file conflict","{count} file conflicts"],
+    "One file conflict" : "One file conflict",
+    "New Files" : "New Files",
+    "Already existing files" : "Already existing files",
+    "Which files do you want to keep?" : "Which files do you wish to keep?",
+    "If you select both versions, the copied file will have a number added to its name." : "If you select both versions, the copied file will have a number added to its name.",
+    "Continue" : "Continue",
+    "(all selected)" : "(all selected)",
+    "({count} selected)" : "({count} selected)",
+    "Error loading file exists template" : "Error loading file exists template",
+    "Pending" : "Pending",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Your web server is not yet set up properly to allow file synchronisation because the WebDAV interface seems to be broken.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "This server has no working Internet connection: Multiple endpoints could not be reached. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)",
+    "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:" : "The PHP Opcache is not properly configured. <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">For better performance we recommend ↗</a> to use following settings in the <code>php.ini</code>:",
+    "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function." : "The PHP function \"set_time_limit\" is not available. This could result in scripts being halted mid-execution, breaking your installation. We strongly recommend enabling this function.",
+    "Error occurred while checking server setup" : "Error occurred whilst checking server setup",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. It is strongly recommended that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.",
+    "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>.",
+    "Shared" : "Shared",
+    "Shared with {recipients}" : "Shared with {recipients}",
+    "Error setting expiration date" : "Error setting expiration date",
+    "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
+    "Set expiration date" : "Set expiration date",
+    "Expiration" : "Expiration",
+    "Expiration date" : "Expiration date",
+    "Choose a password for the public link" : "Choose a password for the public link",
+    "Choose a password for the public link or press \"Enter ↵\"" : "Choose a password for the public link or press \"Enter 
\"",
+    "Copied!" : "Copied!",
+    "Copy" : "Copy",
+    "Not supported!" : "Not supported!",
+    "Press ⌘-C to copy." : "Press ⌘-C to copy.",
+    "Press Ctrl-C to copy." : "Press Ctrl-C to copy.",
+    "Resharing is not allowed" : "Resharing is not allowed",
+    "Share to {name}" : "Share to {name}",
+    "Share link" : "Share link",
+    "Link" : "Link",
+    "Password protect" : "Password protect",
+    "Allow editing" : "Allow editing",
+    "Email link to person" : "Email link to person",
+    "Send" : "Send",
+    "Allow upload and editing" : "Allow upload and editing",
+    "Read only" : "Read only",
+    "File drop (upload only)" : "File drop (upload only)",
+    "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
+    "Shared with you by {owner}" : "Shared with you by {owner}",
+    "Choose a password for the mail share" : "Choose a password for the mail share",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} shared via link",
+    "group" : "group",
+    "remote" : "remote",
+    "email" : "email",
+    "shared by {sharer}" : "shared by {sharer}",
+    "Unshare" : "Unshare",
+    "Can reshare" : "Can reshare",
+    "Can edit" : "Can edit",
+    "Can create" : "Can create",
+    "Can change" : "Can change",
+    "Can delete" : "Can delete",
+    "Access control" : "Access control",
+    "Could not unshare" : "Could not unshare",
+    "Error while sharing" : "Error whilst sharing",
+    "Share details could not be loaded for this item." : "Share details could not be loaded for this item.",
+    "_At least {count} character is needed for autocompletion_::_At least {count} characters are needed for autocompletion_" : ["At least {count} character is needed for autocompletion","At least {count} characters are needed for autocompletion"],
+    "This list is maybe truncated - please refine your search term to see more results." : "This list is maybe truncated - please refine your search term to see more results.",
+    "No users or groups found for {search}" : "No users or groups found for {search}",
+    "No users found for {search}" : "No users found for {search}",
+    "An error occurred. Please try again" : "An error occurred. Please try again",
+    "{sharee} (group)" : "{sharee} (group)",
+    "{sharee} (remote)" : "{sharee} (remote)",
+    "{sharee} (email)" : "{sharee} (email)",
+    "{sharee} ({type}, {owner})" : "{sharee} ({type}, {owner})",
+    "Share" : "Share",
+    "Share with other people by entering a user or group, a federated cloud ID or an email address." : "Share with other people by entering a user or group, a federated cloud ID or an email address.",
+    "Share with other people by entering a user or group or a federated cloud ID." : "Share with other people by entering a user or group or a federated cloud ID.",
+    "Share with other people by entering a user or group or an email address." : "Share with other people by entering a user or group or an email address.",
+    "Name or email address..." : "Name or email address...",
+    "Name or federated cloud ID..." : "Name or federated cloud ID...",
+    "Name, federated cloud ID or email address..." : "Name, federated cloud ID or email address...",
+    "Name..." : "Name...",
+    "Error" : "Error",
+    "Error removing share" : "Error removing share",
+    "Non-existing tag #{tag}" : "Non-existing tag #{tag}",
+    "restricted" : "restricted",
+    "invisible" : "invisible",
+    "({scope})" : "({scope})",
+    "Delete" : "Delete",
+    "Rename" : "Rename",
+    "Collaborative tags" : "Collaborative tags",
+    "No tags found" : "No tags found",
+    "unknown text" : "unknown text",
+    "Hello world!" : "Hello world!",
+    "sunny" : "sunny",
+    "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}",
+    "Hello {name}" : "Hello {name}",
+    "<strong>These are your search results<script>alert(1)</script></strong>" : "<strong>These are your search results<script>alert(1)</script></strong>",
+    "new" : "new",
+    "_download %n file_::_download %n files_" : ["download %n file","download %n files"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "The update is in progress, leaving this page might interrupt the process in some environments.",
+    "Update to {version}" : "Update to {version}",
+    "An error occurred." : "An error occurred.",
+    "Please reload the page." : "Please reload the page.",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>.",
+    "Continue to Nextcloud" : "Continue to Nextcloud",
+    "_The update was successful. Redirecting you to Nextcloud in %n second._::_The update was successful. Redirecting you to Nextcloud in %n seconds._" : ["The update was successful. Redirecting you to Nextcloud in %n second.","The update was successful. Redirecting you to Nextcloud in %n seconds."],
+    "Searching other places" : "Searching other places",
+    "No search results in other folders for {tag}{filter}{endtag}" : "No search results in other folders for {tag}{filter}{endtag}",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} search result in another folder","{count} search results in other folders"],
+    "Personal" : "Personal",
+    "Users" : "Users",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Help",
+    "Access forbidden" : "Access denied",
+    "File not found" : "File not found",
+    "The specified document has not been found on the server." : "The specified document has not been found on the server.",
+    "You can click here to return to %s." : "You can click here to return to %s.",
+    "Internal Server Error" : "Internal Server Error",
+    "The server encountered an internal error and was unable to complete your request." : "The server encountered an internal error and was unable to complete your request.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.",
+    "More details can be found in the server log." : "More details can be found in the server log.",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Type: %s" : "Type: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "Security warning" : "Security warning",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Username" : "Username",
+    "Storage & database" : "Storage & database",
+    "Data folder" : "Data folder",
+    "Configure the database" : "Configure the database",
+    "Only %s is available." : "Only %s is available.",
+    "Install and activate additional PHP modules to choose other database types." : "Install and activate additional PHP modules to choose other database types.",
+    "For more details check out the documentation." : "For more details check out the documentation.",
+    "Database user" : "Database user",
+    "Database password" : "Database password",
+    "Database name" : "Database name",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Database host",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Please specify the port number along with the host name (e.g., localhost:5432).",
+    "Performance warning" : "Performance warning",
+    "SQLite will be used as database." : "SQLite will be used as database.",
+    "For larger installations we recommend to choose a different database backend." : "For larger installations we recommend to choose a different database backend.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especially when using the desktop client for file syncing, the use of SQLite is discouraged.",
+    "Finish setup" : "Finish setup",
+    "Finishing …" : "Finishing …",
+    "Need help?" : "Need help?",
+    "See the documentation" : "See the documentation",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.",
+    "More apps" : "More apps",
+    "Search" : "Search",
+    "This action requires you to confirm your password:" : "This action requires you to confirm your password:",
+    "Confirm your password" : "Confirm your password",
+    "Server side authentication failed!" : "Server side authentication failed!",
+    "Please contact your administrator." : "Please contact your administrator.",
+    "An internal error occurred." : "An internal error occurred.",
+    "Please try again or contact your administrator." : "Please try again or contact your administrator.",
+    "Username or email" : "Username or email",
+    "Wrong password. Reset it?" : "Wrong password. Reset it?",
+    "Wrong password." : "Wrong password.",
+    "Log in" : "Log in",
+    "Stay logged in" : "Stay logged in",
+    "Alternative Logins" : "Alternative Logins",
+    "You are about to grant \"%s\" access to your %s account." : "You are about to grant \"%s\" access to your %s account.",
+    "App token" : "App token",
+    "Alternative login using app token" : "Alternative login using app token",
+    "Redirecting …" : "Redirecting …",
+    "New password" : "New password",
+    "New Password" : "New Password",
+    "Reset password" : "Reset password",
+    "This Nextcloud instance is currently in single user mode." : "This Nextcloud instance is currently in single user mode.",
+    "This means only administrators can use the instance." : "This means only administrators can use the instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contact your system administrator if this message persists or appeared unexpectedly.",
+    "Thank you for your patience." : "Thank you for your patience.",
+    "Log out" : "Log out",
+    "Two-factor authentication" : "Two-factor authentication",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Enhanced security is enabled for your account. Please authenticate using a second factor.",
+    "Cancel log in" : "Cancel log in",
+    "Use backup code" : "Use backup code",
+    "Error while validating your second factor" : "Error while validating your second factor",
+    "You are accessing the server from an untrusted domain." : "You are accessing the server from an untrusted domain.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
+    "Add \"%s\" as trusted domain" : "Add \"%s\" as a trusted domain",
+    "App update required" : "App update required",
+    "%s will be updated to version %s" : "%s will be updated to version %s",
+    "These apps will be updated:" : "These apps will be updated:",
+    "These incompatible apps will be disabled:" : "These incompatible apps will be disabled:",
+    "The theme %s has been disabled." : "The theme %s has been disabled.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
+    "Start update" : "Start update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:",
+    "Detailed logs" : "Detailed logs",
+    "Update needed" : "Update needed",
+    "Please use the command line updater because you have a big instance with more than 50 users." : "Please use the command line updater because you have a big instance with more than 50 users.",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>.",
+    "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure." : "I know that if I continue doing the update via web UI has the risk, that the request runs into a timeout and could cause data loss, but I have a backup and know how to restore my instance in case of a failure.",
+    "Upgrade via web on my own risk" : "Upgrade via web on my own risk",
+    "This %s instance is currently in maintenance mode, which may take a while." : "This %s instance is currently in maintenance mode, which may take a while.",
+    "This page will refresh itself when the %s instance is available again." : "This page will refresh itself when the %s instance is available again.",
+    "Problem loading page, reloading in 5 seconds" : "Problem loading page, reloading in 5 seconds",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
+    "Ok" : "OK",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.",
+    "Error while unsharing" : "Error whilst unsharing",
+    "can reshare" : "can reshare",
+    "can edit" : "can edit",
+    "can create" : "can create",
+    "can change" : "can change",
+    "can delete" : "can delete",
+    "access control" : "access control",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud",
+    "Share with users or by mail..." : "Share with users or by mail...",
+    "Share with users or remote users..." : "Share with users or remote users...",
+    "Share with users, remote users or by mail..." : "Share with users, remote users or by mail...",
+    "Share with users or groups..." : "Share with users or groups...",
+    "Share with users, groups or by mail..." : "Share with users, groups or by mail...",
+    "Share with users, groups or remote users..." : "Share with users, groups or remote users...",
+    "Share with users, groups, remote users or by mail..." : "Share with users, groups, remote users or by mail...",
+    "Share with users..." : "Share with users...",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Enter new",
+    "Add" : "Add",
+    "Edit tags" : "Edit tags",
+    "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
+    "No tags selected for deletion." : "No tags selected for deletion.",
+    "The update was successful. Redirecting you to Nextcloud now." : "The update was successful. Redirecting you to Nextcloud.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
+    "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
+    "Please use the command line updater because you have a big instance." : "Please use the command line updater because you have a big instance."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
new file mode 100644
index 00000000000..2b14d2798f4
--- /dev/null
+++ b/lib/l10n/en_GB.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Cannot write into \"config\" directory!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "This can usually be fixed by giving the webserver write access to the config directory",
+    "See %s" : "See %s",
+    "This can usually be fixed by giving the webserver write access to the config directory. See %s" : "This can usually be fixed by giving the webserver write access to the config directory. See %s",
+    "The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server." : "The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server.",
+    "Sample configuration detected" : "Sample configuration detected",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php",
+    "%1$s and %2$s" : "%1$s and %2$s",
+    "%1$s, %2$s and %3$s" : "%1$s, %2$s and %3$s",
+    "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s and %4$s",
+    "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s and %5$s",
+    "Enterprise bundle" : "Enterprise bundle",
+    "Groupware bundle" : "Groupware bundle",
+    "Social sharing bundle" : "Social sharing bundle",
+    "PHP %s or higher is required." : "PHP %s or higher is required.",
+    "PHP with a version lower than %s is required." : "PHP with a version lower than %s is required.",
+    "%sbit or higher PHP required." : "%sbit or higher PHP required.",
+    "Following databases are supported: %s" : "Following databases are supported: %s",
+    "The command line tool %s could not be found" : "The command line tool %s could not be found",
+    "The library %s is not available." : "The library %s is not available.",
+    "Library %s with a version higher than %s is required - available version %s." : "Library %s with a version higher than %s is required - available version %s.",
+    "Library %s with a version lower than %s is required - available version %s." : "Library %s with a version lower than %s is required - available version %s.",
+    "Following platforms are supported: %s" : "Following platforms are supported: %s",
+    "Server version %s or higher is required." : "Server version %s or higher is required.",
+    "Server version %s or lower is required." : "Server version %s or lower is required.",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "Avatar image is not square" : "Avatar image is not square",
+    "today" : "today",
+    "yesterday" : "yesterday",
+    "_%n day ago_::_%n days ago_" : ["%n day ago","%n days ago"],
+    "last month" : "last month",
+    "_%n month ago_::_%n months ago_" : ["%n month ago","%n months ago"],
+    "last year" : "last year",
+    "_%n year ago_::_%n years ago_" : ["%n year ago","%n years ago"],
+    "_%n hour ago_::_%n hours ago_" : ["%n hour ago","%n hours ago"],
+    "_%n minute ago_::_%n minutes ago_" : ["%n minute ago","%n minutes ago"],
+    "seconds ago" : "seconds ago",
+    "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.",
+    "File name is a reserved word" : "File name is a reserved word",
+    "File name contains at least one invalid character" : "File name contains at least one invalid character",
+    "File name is too long" : "File name is too long",
+    "Dot files are not allowed" : "Dot files are not allowed",
+    "Empty filename is not allowed" : "Empty filename is not allowed",
+    "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" cannot be installed because appinfo file cannot be read.",
+    "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "App \"%s\" cannot be installed. It is not compatible with this version of the server.",
+    "This is an automatically sent email, please do not reply." : "This is an automatically sent email, please do not reply.",
+    "Help" : "Help",
+    "Apps" : "Apps",
+    "Personal" : "Personal",
+    "Log out" : "Log out",
+    "Users" : "Users",
+    "Admin" : "Admin",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Basic settings" : "Basic settings",
+    "Sharing" : "Sharing",
+    "Security" : "Security",
+    "Encryption" : "Encryption",
+    "Additional settings" : "Additional settings",
+    "Tips & tricks" : "Tips & tricks",
+    "%s enter the database username and name." : "%s enter the database username and name.",
+    "%s enter the database username." : "%s enter the database username.",
+    "%s enter the database name." : "%s enter the database name.",
+    "%s you may not use dots in the database name" : "%s you may not use dots in the database name",
+    "Oracle connection could not be established" : "Oracle connection could not be established",
+    "Oracle username and/or password not valid" : "Oracle username and/or password not valid",
+    "DB Error: \"%s\"" : "DB Error: \"%s\"",
+    "Offending command was: \"%s\"" : "Offending command was: \"%s\"",
+    "You need to enter details of an existing account." : "You need to enter details of an existing account.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Offending command was: \"%s\", name: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL username and/or password not valid",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
+    "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir setting has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged.",
+    "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.",
+    "Set an admin username." : "Set an admin username.",
+    "Set an admin password." : "Set an admin password.",
+    "Can't create or write into the data directory %s" : "Can't create or write into the data directory %s",
+    "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID",
+    "Sharing %s failed, because the backend does not allow shares from type %i" : "Sharing %s failed, because the backend does not allow shares from type %i",
+    "Sharing %s failed, because the file does not exist" : "Sharing %s failed, because the file does not exist",
+    "You are not allowed to share %s" : "You are not allowed to share %s",
+    "Sharing %s failed, because you can not share with yourself" : "Sharing %s failed, because you can not share with yourself",
+    "Sharing %s failed, because the user %s does not exist" : "Sharing %s failed, because the user %s does not exist",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of",
+    "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s",
+    "Sharing %s failed, because the group %s does not exist" : "Sharing %s failed, because the group %s does not exist",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Sharing %s failed, because %s is not a member of the group %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "You need to provide a password to create a public link, only protected links are allowed",
+    "Sharing %s failed, because sharing with links is not allowed" : "Sharing %s failed, because sharing with links is not allowed",
+    "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",
+    "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.",
+    "Share type %s is not valid for %s" : "Share type %s is not valid for %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting permissions for %s failed, because the permissions exceed permissions granted to %s",
+    "Setting permissions for %s failed, because the item was not found" : "Setting permissions for %s failed, because the item was not found",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Cannot set expiry date. Shares cannot expire later than %s after they have been shared",
+    "Cannot set expiration date. Expiration date is in the past" : "Cannot set expiry date. Expiry date is in the past",
+    "Cannot clear expiration date. Shares are required to have an expiration date." : "Cannot clear expiration date. Shares are required to have an expiration date.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Sharing backend %s not found",
+    "Sharing backend for %s not found" : "Sharing backend for %s not found",
+    "Sharing failed, because the user %s is the original sharer" : "Sharing failed, because the user %s is the original sharer",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Sharing %s failed, because the permissions exceed permissions granted to %s",
+    "Sharing %s failed, because resharing is not allowed" : "Sharing %s failed, because resharing is not allowed",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sharing %s failed, because the sharing backend for %s could not find its source",
+    "Sharing %s failed, because the file could not be found in the file cache" : "Sharing %s failed, because the file could not be found in the file cache",
+    "Cannot increase permissions of %s" : "Cannot increase permissions of %s",
+    "Files can't be shared with delete permissions" : "Files can't be shared with delete permissions",
+    "Files can't be shared with create permissions" : "Files can't be shared with create permissions",
+    "Expiration date is in the past" : "Expiration date is in the past",
+    "Cannot set expiration date more than %s days in the future" : "Cannot set expiration date more than %s days in the future",
+    "Could not find category \"%s\"" : "Could not find category \"%s\"",
+    "Sunday" : "Sunday",
+    "Monday" : "Monday",
+    "Tuesday" : "Tuesday",
+    "Wednesday" : "Wednesday",
+    "Thursday" : "Thursday",
+    "Friday" : "Friday",
+    "Saturday" : "Saturday",
+    "Sun." : "Sun.",
+    "Mon." : "Mon.",
+    "Tue." : "Tue.",
+    "Wed." : "Wed.",
+    "Thu." : "Thu.",
+    "Fri." : "Fri.",
+    "Sat." : "Sat.",
+    "Su" : "Su",
+    "Mo" : "Mo",
+    "Tu" : "Tu",
+    "We" : "We",
+    "Th" : "Th",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
+    "January" : "January",
+    "February" : "February",
+    "March" : "March",
+    "April" : "April",
+    "May" : "May",
+    "June" : "June",
+    "July" : "July",
+    "August" : "August",
+    "September" : "September",
+    "October" : "October",
+    "November" : "November",
+    "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "May.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
+    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"",
+    "A valid username must be provided" : "A valid username must be provided",
+    "Username contains whitespace at the beginning or at the end" : "Username contains whitespace at the beginning or at the end",
+    "Username must not consist of dots only" : "Username must not consist of dots only",
+    "A valid password must be provided" : "A valid password must be provided",
+    "The username is already being used" : "The username is already being used",
+    "User disabled" : "User disabled",
+    "Login canceled by app" : "Login cancelled by app",
+    "No app name specified" : "No app name specified",
+    "App '%s' could not be installed!" : "App '%s' could not be installed!",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s",
+    "a safe home for all your data" : "a safe home for all your data",
+    "File is currently busy, please try again later" : "File is currently busy, please try again later",
+    "Can't read file" : "Can't read file",
+    "Application is not enabled" : "Application is not enabled",
+    "Authentication error" : "Authentication error",
+    "Token expired. Please reload page." : "Token expired. Please reload page.",
+    "Unknown user" : "Unknown user",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "No database drivers (sqlite, mysql, or postgresql) installed.",
+    "Cannot write into \"config\" directory" : "Cannot write into \"config\" directory",
+    "Cannot write into \"apps\" directory" : "Cannot write into \"apps\" directory",
+    "This can usually be fixed by giving the webserver write access to the apps directory or disabling the appstore in the config file. See %s" : "This can usually be fixed by giving the webserver write access to the apps directory or disabling the appstore in the config file. See %s",
+    "Cannot create \"data\" directory" : "Cannot create \"data\" directory",
+    "This can usually be fixed by giving the webserver write access to the root directory. See %s" : "This can usually be fixed by giving the webserver write access to the root directory. See %s",
+    "Permissions can usually be fixed by giving the webserver write access to the root directory. See %s." : "Permissions can usually be fixed by giving the webserver write access to the root directory. See %s.",
+    "Setting locale to %s failed" : "Setting locale to %s failed",
+    "Please install one of these locales on your system and restart your webserver." : "Please install one of these locales on your system and restart your webserver.",
+    "Please ask your server administrator to install the module." : "Please ask your server administrator to install the module.",
+    "PHP module %s not installed." : "PHP module %s not installed.",
+    "PHP setting \"%s\" is not set to \"%s\"." : "PHP setting \"%s\" is not set to \"%s\".",
+    "Adjusting this setting in php.ini will make Nextcloud run again" : "Adjusting this setting in php.ini will allow Nextcloud to run",
+    "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini",
+    "libxml2 2.7.0 is at least required. Currently %s is installed." : "libxml2 2.7.0 is at least required. Currently %s is installed.",
+    "To fix this issue update your libxml2 version and restart your web server." : "To fix this issue update your libxml2 version and restart your web server.",
+    "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?",
+    "Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 required",
+    "Please upgrade your database version" : "Please upgrade your database version",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
+    "Your data directory is readable by other users" : "Your data directory is readable by other users",
+    "Your data directory must be an absolute path" : "Your data directory must be an absolute path",
+    "Check the value of \"datadirectory\" in your configuration" : "Check the value of \"datadirectory\" in your configuration",
+    "Your data directory is invalid" : "Your data directory is invalid",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Please check that the data directory contains a file \".ocdata\" in its root.",
+    "Could not obtain lock type %d on \"%s\"." : "Could not obtain lock type %d on \"%s\".",
+    "Storage unauthorized. %s" : "Storage unauthorised. %s",
+    "Storage incomplete configuration. %s" : "Storage incomplete configuration. %s",
+    "Storage connection error. %s" : "Storage connection error. %s",
+    "Storage is temporarily not available" : "Storage is temporarily not available",
+    "Storage connection timeout. %s" : "Storage connection timeout. %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "This can usually be fixed by %sgiving the webserver write access to the config directory%s.",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator.",
+    "Server settings" : "Server settings",
+    "You need to enter either an existing account or the administrator." : "You need to enter either an existing account or the administrator.",
+    "%s shared »%s« with you" : "%s shared \"%s\" with you",
+    "%s via %s" : "%s via %s",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.",
+    "Cannot create \"data\" directory (%s)" : "Cannot create \"data\" directory (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.",
+    "Data directory (%s) is readable by other users" : "Data directory (%s) is readable by other users",
+    "Data directory (%s) must be an absolute path" : "Data directory (%s) must be an absolute path",
+    "Data directory (%s) is invalid" : "Data directory (%s) is invalid"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
new file mode 100644
index 00000000000..f6a4742c68d
--- /dev/null
+++ b/lib/l10n/en_GB.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Cannot write into \"config\" directory!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "This can usually be fixed by giving the webserver write access to the config directory",
+    "See %s" : "See %s",
+    "This can usually be fixed by giving the webserver write access to the config directory. See %s" : "This can usually be fixed by giving the webserver write access to the config directory. See %s",
+    "The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server." : "The files of the app %$1s were not replaced correctly. Make sure it is a version compatible with the server.",
+    "Sample configuration detected" : "Sample configuration detected",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php",
+    "%1$s and %2$s" : "%1$s and %2$s",
+    "%1$s, %2$s and %3$s" : "%1$s, %2$s and %3$s",
+    "%1$s, %2$s, %3$s and %4$s" : "%1$s, %2$s, %3$s and %4$s",
+    "%1$s, %2$s, %3$s, %4$s and %5$s" : "%1$s, %2$s, %3$s, %4$s and %5$s",
+    "Enterprise bundle" : "Enterprise bundle",
+    "Groupware bundle" : "Groupware bundle",
+    "Social sharing bundle" : "Social sharing bundle",
+    "PHP %s or higher is required." : "PHP %s or higher is required.",
+    "PHP with a version lower than %s is required." : "PHP with a version lower than %s is required.",
+    "%sbit or higher PHP required." : "%sbit or higher PHP required.",
+    "Following databases are supported: %s" : "Following databases are supported: %s",
+    "The command line tool %s could not be found" : "The command line tool %s could not be found",
+    "The library %s is not available." : "The library %s is not available.",
+    "Library %s with a version higher than %s is required - available version %s." : "Library %s with a version higher than %s is required - available version %s.",
+    "Library %s with a version lower than %s is required - available version %s." : "Library %s with a version lower than %s is required - available version %s.",
+    "Following platforms are supported: %s" : "Following platforms are supported: %s",
+    "Server version %s or higher is required." : "Server version %s or higher is required.",
+    "Server version %s or lower is required." : "Server version %s or lower is required.",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "Avatar image is not square" : "Avatar image is not square",
+    "today" : "today",
+    "yesterday" : "yesterday",
+    "_%n day ago_::_%n days ago_" : ["%n day ago","%n days ago"],
+    "last month" : "last month",
+    "_%n month ago_::_%n months ago_" : ["%n month ago","%n months ago"],
+    "last year" : "last year",
+    "_%n year ago_::_%n years ago_" : ["%n year ago","%n years ago"],
+    "_%n hour ago_::_%n hours ago_" : ["%n hour ago","%n hours ago"],
+    "_%n minute ago_::_%n minutes ago_" : ["%n minute ago","%n minutes ago"],
+    "seconds ago" : "seconds ago",
+    "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module with ID: %s does not exist. Please enable it in your apps settings or contact your administrator.",
+    "File name is a reserved word" : "File name is a reserved word",
+    "File name contains at least one invalid character" : "File name contains at least one invalid character",
+    "File name is too long" : "File name is too long",
+    "Dot files are not allowed" : "Dot files are not allowed",
+    "Empty filename is not allowed" : "Empty filename is not allowed",
+    "App \"%s\" cannot be installed because appinfo file cannot be read." : "App \"%s\" cannot be installed because appinfo file cannot be read.",
+    "App \"%s\" cannot be installed because it is not compatible with this version of the server." : "App \"%s\" cannot be installed. It is not compatible with this version of the server.",
+    "This is an automatically sent email, please do not reply." : "This is an automatically sent email, please do not reply.",
+    "Help" : "Help",
+    "Apps" : "Apps",
+    "Personal" : "Personal",
+    "Log out" : "Log out",
+    "Users" : "Users",
+    "Admin" : "Admin",
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Basic settings" : "Basic settings",
+    "Sharing" : "Sharing",
+    "Security" : "Security",
+    "Encryption" : "Encryption",
+    "Additional settings" : "Additional settings",
+    "Tips & tricks" : "Tips & tricks",
+    "%s enter the database username and name." : "%s enter the database username and name.",
+    "%s enter the database username." : "%s enter the database username.",
+    "%s enter the database name." : "%s enter the database name.",
+    "%s you may not use dots in the database name" : "%s you may not use dots in the database name",
+    "Oracle connection could not be established" : "Oracle connection could not be established",
+    "Oracle username and/or password not valid" : "Oracle username and/or password not valid",
+    "DB Error: \"%s\"" : "DB Error: \"%s\"",
+    "Offending command was: \"%s\"" : "Offending command was: \"%s\"",
+    "You need to enter details of an existing account." : "You need to enter details of an existing account.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Offending command was: \"%s\", name: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL username and/or password not valid",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
+    "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir setting has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged.",
+    "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.",
+    "Set an admin username." : "Set an admin username.",
+    "Set an admin password." : "Set an admin password.",
+    "Can't create or write into the data directory %s" : "Can't create or write into the data directory %s",
+    "Invalid Federated Cloud ID" : "Invalid Federated Cloud ID",
+    "Sharing %s failed, because the backend does not allow shares from type %i" : "Sharing %s failed, because the backend does not allow shares from type %i",
+    "Sharing %s failed, because the file does not exist" : "Sharing %s failed, because the file does not exist",
+    "You are not allowed to share %s" : "You are not allowed to share %s",
+    "Sharing %s failed, because you can not share with yourself" : "Sharing %s failed, because you can not share with yourself",
+    "Sharing %s failed, because the user %s does not exist" : "Sharing %s failed, because the user %s does not exist",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of",
+    "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Sharing %s failed, because this item is already shared with user %s",
+    "Sharing %s failed, because the group %s does not exist" : "Sharing %s failed, because the group %s does not exist",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Sharing %s failed, because %s is not a member of the group %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "You need to provide a password to create a public link, only protected links are allowed",
+    "Sharing %s failed, because sharing with links is not allowed" : "Sharing %s failed, because sharing with links is not allowed",
+    "Not allowed to create a federated share with the same user" : "Not allowed to create a federated share with the same user",
+    "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.",
+    "Share type %s is not valid for %s" : "Share type %s is not valid for %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting permissions for %s failed, because the permissions exceed permissions granted to %s",
+    "Setting permissions for %s failed, because the item was not found" : "Setting permissions for %s failed, because the item was not found",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Cannot set expiry date. Shares cannot expire later than %s after they have been shared",
+    "Cannot set expiration date. Expiration date is in the past" : "Cannot set expiry date. Expiry date is in the past",
+    "Cannot clear expiration date. Shares are required to have an expiration date." : "Cannot clear expiration date. Shares are required to have an expiration date.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Sharing backend %s not found",
+    "Sharing backend for %s not found" : "Sharing backend for %s not found",
+    "Sharing failed, because the user %s is the original sharer" : "Sharing failed, because the user %s is the original sharer",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Sharing %s failed, because the permissions exceed permissions granted to %s",
+    "Sharing %s failed, because resharing is not allowed" : "Sharing %s failed, because resharing is not allowed",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sharing %s failed, because the sharing backend for %s could not find its source",
+    "Sharing %s failed, because the file could not be found in the file cache" : "Sharing %s failed, because the file could not be found in the file cache",
+    "Cannot increase permissions of %s" : "Cannot increase permissions of %s",
+    "Files can't be shared with delete permissions" : "Files can't be shared with delete permissions",
+    "Files can't be shared with create permissions" : "Files can't be shared with create permissions",
+    "Expiration date is in the past" : "Expiration date is in the past",
+    "Cannot set expiration date more than %s days in the future" : "Cannot set expiration date more than %s days in the future",
+    "Could not find category \"%s\"" : "Could not find category \"%s\"",
+    "Sunday" : "Sunday",
+    "Monday" : "Monday",
+    "Tuesday" : "Tuesday",
+    "Wednesday" : "Wednesday",
+    "Thursday" : "Thursday",
+    "Friday" : "Friday",
+    "Saturday" : "Saturday",
+    "Sun." : "Sun.",
+    "Mon." : "Mon.",
+    "Tue." : "Tue.",
+    "Wed." : "Wed.",
+    "Thu." : "Thu.",
+    "Fri." : "Fri.",
+    "Sat." : "Sat.",
+    "Su" : "Su",
+    "Mo" : "Mo",
+    "Tu" : "Tu",
+    "We" : "We",
+    "Th" : "Th",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
+    "January" : "January",
+    "February" : "February",
+    "March" : "March",
+    "April" : "April",
+    "May" : "May",
+    "June" : "June",
+    "July" : "July",
+    "August" : "August",
+    "September" : "September",
+    "October" : "October",
+    "November" : "November",
+    "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "May.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
+    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-'\"",
+    "A valid username must be provided" : "A valid username must be provided",
+    "Username contains whitespace at the beginning or at the end" : "Username contains whitespace at the beginning or at the end",
+    "Username must not consist of dots only" : "Username must not consist of dots only",
+    "A valid password must be provided" : "A valid password must be provided",
+    "The username is already being used" : "The username is already being used",
+    "User disabled" : "User disabled",
+    "Login canceled by app" : "Login cancelled by app",
+    "No app name specified" : "No app name specified",
+    "App '%s' could not be installed!" : "App '%s' could not be installed!",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s",
+    "a safe home for all your data" : "a safe home for all your data",
+    "File is currently busy, please try again later" : "File is currently busy, please try again later",
+    "Can't read file" : "Can't read file",
+    "Application is not enabled" : "Application is not enabled",
+    "Authentication error" : "Authentication error",
+    "Token expired. Please reload page." : "Token expired. Please reload page.",
+    "Unknown user" : "Unknown user",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "No database drivers (sqlite, mysql, or postgresql) installed.",
+    "Cannot write into \"config\" directory" : "Cannot write into \"config\" directory",
+    "Cannot write into \"apps\" directory" : "Cannot write into \"apps\" directory",
+    "This can usually be fixed by giving the webserver write access to the apps directory or disabling the appstore in the config file. See %s" : "This can usually be fixed by giving the webserver write access to the apps directory or disabling the appstore in the config file. See %s",
+    "Cannot create \"data\" directory" : "Cannot create \"data\" directory",
+    "This can usually be fixed by giving the webserver write access to the root directory. See %s" : "This can usually be fixed by giving the webserver write access to the root directory. See %s",
+    "Permissions can usually be fixed by giving the webserver write access to the root directory. See %s." : "Permissions can usually be fixed by giving the webserver write access to the root directory. See %s.",
+    "Setting locale to %s failed" : "Setting locale to %s failed",
+    "Please install one of these locales on your system and restart your webserver." : "Please install one of these locales on your system and restart your webserver.",
+    "Please ask your server administrator to install the module." : "Please ask your server administrator to install the module.",
+    "PHP module %s not installed." : "PHP module %s not installed.",
+    "PHP setting \"%s\" is not set to \"%s\"." : "PHP setting \"%s\" is not set to \"%s\".",
+    "Adjusting this setting in php.ini will make Nextcloud run again" : "Adjusting this setting in php.ini will allow Nextcloud to run",
+    "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini",
+    "libxml2 2.7.0 is at least required. Currently %s is installed." : "libxml2 2.7.0 is at least required. Currently %s is installed.",
+    "To fix this issue update your libxml2 version and restart your web server." : "To fix this issue update your libxml2 version and restart your web server.",
+    "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?",
+    "Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 required",
+    "Please upgrade your database version" : "Please upgrade your database version",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
+    "Your data directory is readable by other users" : "Your data directory is readable by other users",
+    "Your data directory must be an absolute path" : "Your data directory must be an absolute path",
+    "Check the value of \"datadirectory\" in your configuration" : "Check the value of \"datadirectory\" in your configuration",
+    "Your data directory is invalid" : "Your data directory is invalid",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Please check that the data directory contains a file \".ocdata\" in its root.",
+    "Could not obtain lock type %d on \"%s\"." : "Could not obtain lock type %d on \"%s\".",
+    "Storage unauthorized. %s" : "Storage unauthorised. %s",
+    "Storage incomplete configuration. %s" : "Storage incomplete configuration. %s",
+    "Storage connection error. %s" : "Storage connection error. %s",
+    "Storage is temporarily not available" : "Storage is temporarily not available",
+    "Storage connection timeout. %s" : "Storage connection timeout. %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "This can usually be fixed by %sgiving the webserver write access to the config directory%s.",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator.",
+    "Server settings" : "Server settings",
+    "You need to enter either an existing account or the administrator." : "You need to enter either an existing account or the administrator.",
+    "%s shared »%s« with you" : "%s shared \"%s\" with you",
+    "%s via %s" : "%s via %s",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.",
+    "Cannot create \"data\" directory (%s)" : "Cannot create \"data\" directory (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>." : "This can usually be fixed by <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">giving the webserver write access to the root directory</a>.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.",
+    "Data directory (%s) is readable by other users" : "Data directory (%s) is readable by other users",
+    "Data directory (%s) must be an absolute path" : "Data directory (%s) must be an absolute path",
+    "Data directory (%s) is invalid" : "Data directory (%s) is invalid"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index d6baa004e04..19603a07415 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -110,7 +110,7 @@ OC.L10N.register(
     "Updated" : "Aktualisiert",
     "Removing …" : "Entferne ...",
     "Error while removing app" : "Fehler beim Entfernen der App",
-    "Remove" : "Entferne",
+    "Remove" : "Entfernen",
     "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, muss aber aktualisiert werden. Du wirst in 5 Sekunden zu Aktualisierungsseite weitergeleitet",
     "App update" : "App Aktualisierung",
     "Approved" : "Geprüft",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 32c634e0b3f..cc69fdab245 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -108,7 +108,7 @@
     "Updated" : "Aktualisiert",
     "Removing …" : "Entferne ...",
     "Error while removing app" : "Fehler beim Entfernen der App",
-    "Remove" : "Entferne",
+    "Remove" : "Entfernen",
     "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Die App wurde aktiviert, muss aber aktualisiert werden. Du wirst in 5 Sekunden zu Aktualisierungsseite weitergeleitet",
     "App update" : "App Aktualisierung",
     "Approved" : "Geprüft",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 582d8a27986..ba269550554 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -1,12 +1,28 @@
 OC.L10N.register(
     "settings",
     {
+    "{actor} changed your password" : "{actor} changed your password",
+    "You changed your password" : "You changed your password",
+    "Your password was reset by an administrator" : "Your password was reset by an administrator",
+    "{actor} changed your email address" : "{actor} changed your email address",
+    "You changed your email address" : "You changed your email address",
+    "Your email address was changed by an administrator" : "Your email address was changed by an administrator",
+    "Security" : "Security",
+    "You successfully logged in using two-factor authentication (%1$s)" : "You successfully logged in using two-factor authentication (%1$s)",
+    "A login attempt using two-factor authentication failed (%1$s)" : "A login attempt using two-factor authentication failed (%1$s)",
+    "Your <strong>password</strong> or <strong>email</strong> was modified" : "Your <strong>password</strong> or <strong>email</strong> was modified",
+    "Your apps" : "Your apps",
+    "Enabled apps" : "Enabled apps",
+    "Disabled apps" : "Disabled apps",
+    "App bundles" : "App bundles",
     "Wrong password" : "Incorrect password",
     "Saved" : "Saved",
     "No user supplied" : "No user supplied",
     "Unable to change password" : "Unable to change password",
     "Authentication error" : "Authentication error",
+    "Please provide an admin recovery password; otherwise, all user data will be lost." : "Please provide an admin recovery password; otherwise, all user data will be lost.",
     "Wrong admin recovery password. Please check the password and try again." : "Incorrect admin recovery password. Please check the password and try again.",
+    "Backend doesn't support password change, but the user's encryption key was updated." : "Backend doesn't support password change, but the user's encryption key was updated.",
     "installing and updating apps via the app store or Federated Cloud Sharing" : "installing and updating apps via the app store or Federated Cloud Sharing",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.",
@@ -15,25 +31,61 @@ OC.L10N.register(
     "Group already exists." : "Group already exists.",
     "Unable to add group." : "Unable to add group.",
     "Unable to delete group." : "Unable to delete group.",
+    "Invalid SMTP password." : "Invalid SMTP password.",
+    "Well done, %s!" : "Well done, %s!",
+    "If you received this email, the email configuration seems to be correct." : "If you received this email, the email configuration seems to be correct.",
+    "Email setting test" : "Email setting test",
+    "Email could not be sent. Check your mail server log" : "Email could not be sent. Check your mail server log",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "A problem occurred while sending the email. Please revise your settings. (Error: %s)",
     "You need to set your user email before being able to send test emails." : "You need to set your user email before being able to send test emails.",
     "Invalid request" : "Invalid request",
     "Invalid mail address" : "Invalid mail address",
+    "No valid group selected" : "No valid group selected",
     "A user with that name already exists." : "A user with that name already exists.",
+    "To send a password link to the user an email address is required." : "To send a password link to the user an email address is required.",
     "Unable to create user." : "Unable to create user.",
     "Unable to delete user." : "Unable to delete user.",
+    "Error while enabling user." : "Error while enabling user.",
+    "Error while disabling user." : "Error while disabling user.",
+    "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):",
+    "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):",
+    "Settings saved" : "Settings saved",
     "Unable to change full name" : "Unable to change full name",
+    "Unable to change email address" : "Unable to change email address",
     "Your full name has been changed." : "Your full name has been changed.",
     "Forbidden" : "Forbidden",
     "Invalid user" : "Invalid user",
     "Unable to change mail address" : "Unable to change mail address",
     "Email saved" : "Email saved",
+    "%1$s changed your password on %2$s." : "%1$s changed your password on %2$s.",
+    "Your password on %s was changed." : "Your password on %s was changed.",
+    "Your password on %s was reset by an administrator." : "Your password on %s was reset by an administrator.",
+    "Password changed for %s" : "Password changed for %s",
+    "If you did not request this, please contact an administrator." : "If you did not request this, please contact an administrator.",
+    "Password for %1$s changed on %2$s" : "Password for %1$s changed on %2$s",
+    "%1$s changed your email address on %2$s." : "%1$s changed your email address on %2$s.",
+    "Your email address on %s was changed." : "Your email address on %s was changed.",
+    "Your email address on %s was changed by an administrator." : "Your email address on %s was changed by an administrator.",
+    "Email address changed for %s" : "Email address changed for %s",
+    "The new email address is %s" : "The new email address is %s",
+    "Email address for %1$s changed on %2$s" : "Email address for %1$s changed on %2$s",
+    "Welcome aboard" : "Welcome aboard",
+    "Welcome aboard %s" : "Welcome aboard %s",
+    "You have now an %s account, you can add, protect, and share your data." : "You have now an %s account, you can add, protect, and share your data.",
+    "Your username is: %s" : "Your username is: %s",
+    "Set your password" : "Set your password",
+    "Go to %s" : "Go to %s",
+    "Install Client" : "Install Client",
     "Your %s account was created" : "Your %s account was created",
+    "Password confirmation is required" : "Password confirmation is required",
     "Couldn't remove app." : "Couldn't remove app.",
     "Couldn't update app." : "Couldn't update app.",
+    "Are you really sure you want add {domain} as trusted domain?" : "Are you really sure you want add {domain} as trusted domain?",
     "Add trusted domain" : "Add trusted domain",
     "Migration in progress. Please wait until the migration is finished" : "Migration in progress. Please wait until the migration is finished",
     "Migration started …" : "Migration started …",
+    "Not saved" : "Not saved",
+    "Sending…" : "Sending…",
     "Email sent" : "Email sent",
     "Official" : "Official",
     "All" : "All",
@@ -44,9 +96,11 @@ OC.L10N.register(
     "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Official apps are developed by the community. They offer additional functionality and are ready for production use.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install at your own risk.",
+    "Disabling app …" : "Disabling app …",
     "Error while disabling app" : "Error whilst disabling app",
     "Disable" : "Disable",
     "Enable" : "Enable",
+    "Enabling app …" : "Enabling app …",
     "Error while enabling app" : "Error whilst enabling app",
     "Error: this app cannot be enabled because it makes the server unstable" : "Error: this app cannot be enabled because it makes the server unstable",
     "Error: could not disable broken app" : "Error: could not disable broken app",
@@ -54,18 +108,51 @@ OC.L10N.register(
     "Updating...." : "Updating....",
     "Error while updating app" : "Error whilst updating app",
     "Updated" : "Updated",
+    "Removing …" : "Removing …",
+    "Error while removing app" : "Error while removing app",
+    "Remove" : "Remove",
     "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds.",
     "App update" : "App update",
     "Approved" : "Approved",
     "Experimental" : "Experimental",
     "No apps found for {query}" : "No apps found for {query}",
+    "Enable all" : "Enable all",
+    "Allow filesystem access" : "Allow filesystem access",
     "Disconnect" : "Disconnect",
+    "Revoke" : "Revoke",
+    "Internet Explorer" : "Internet Explorer",
+    "Edge" : "Edge",
+    "Firefox" : "Firefox",
+    "Google Chrome" : "Google Chrome",
+    "Safari" : "Safari",
+    "Google Chrome for Android" : "Google Chrome for Android",
+    "iPhone iOS" : "iPhone iOS",
+    "iPad iOS" : "iPad iOS",
+    "iOS Client" : "iOS Client",
+    "Android Client" : "Android Client",
+    "Sync client - {os}" : "Sync client - {os}",
+    "This session" : "This session",
+    "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.",
     "Error while loading browser sessions and device tokens" : "Error while loading browser sessions and device tokens",
     "Error while creating device token" : "Error while creating device token",
     "Error while deleting the token" : "Error while deleting the token",
     "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.",
     "Valid until {date}" : "Valid until {date}",
     "Delete" : "Delete",
+    "Local" : "Local",
+    "Private" : "Private",
+    "Only visible to local users" : "Only visible to local users",
+    "Only visible to you" : "Only visible to you",
+    "Contacts" : "Contacts",
+    "Visible to local users and to trusted servers" : "Visible to local users and to trusted servers",
+    "Public" : "Public",
+    "Will be synced to a global and public address book" : "Will be synced to a global and public address book",
+    "Verify" : "Verify",
+    "Verifying …" : "Verifying …",
     "Select a profile picture" : "Select a profile picture",
     "Very weak password" : "Very weak password",
     "Weak password" : "Weak password",
@@ -80,14 +167,23 @@ OC.L10N.register(
     "undo" : "undo",
     "never" : "never",
     "deleted {userName}" : "deleted {userName}",
+    "No user found for <strong>{pattern}</strong>" : "No user found for <strong>{pattern}</strong>",
+    "Unable to add user to group {group}" : "Unable to add user to group {group}",
+    "Unable to remove user from group {group}" : "Unable to remove user from group {group}",
+    "Add group" : "Add group",
     "Invalid quota value \"{val}\"" : "Invalid quota value \"{val}\"",
+    "no group" : "no group",
+    "Password successfully changed" : "Password successfully changed",
     "Changing the password will result in data loss, because data recovery is not available for this user" : "Changing the password will result in data loss, because data recovery is not available for this user",
+    "Could not change the users email" : "Could not change the users email",
+    "Error while changing status of {user}" : "Error while changing status of {user}",
     "A valid username must be provided" : "A valid username must be provided",
     "Error creating user: {message}" : "Error creating user: {message}",
     "A valid password must be provided" : "A valid password must be provided",
     "A valid email must be provided" : "A valid email must be provided",
     "__language_name__" : "English (British English)",
     "Unlimited" : "Unlimited",
+    "Verifying" : "Verifying",
     "Personal info" : "Personal info",
     "Sessions" : "Sessions",
     "App passwords" : "App passwords",
@@ -96,8 +192,11 @@ OC.L10N.register(
     "Login" : "Login",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "Email server" : "Email server",
     "Open documentation" : "Open documentation",
+    "It is important to set up this server to be able to send emails, like for password reset and notifications." : "It is important to set up this server to be able to send emails, like for password reset and notifications.",
     "Send mode" : "Send mode",
     "Encryption" : "Encryption",
     "From address" : "From address",
@@ -113,6 +212,7 @@ OC.L10N.register(
     "Test email settings" : "Test email settings",
     "Send email" : "Send email",
     "Server-side encryption" : "Server-side encryption",
+    "Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed." : "Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed.",
     "Enable server-side encryption" : "Enable server-side encryption",
     "Please read carefully before activating server-side encryption: " : "Please read carefully before activating server-side encryption: ",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.",
@@ -127,26 +227,40 @@ OC.L10N.register(
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.",
     "Start migration" : "Start migration",
     "Security & setup warnings" : "Security & setup warnings",
+    "It's important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information." : "It's important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
+    "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version.",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with MIME type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with MIME type detection.",
     "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information.",
     "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
     "This means that there might be problems with certain characters in file names." : "This means that there might be problems with certain characters in file names.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:",
+    "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"%s\">log</a>." : "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"%s\">log</a>.",
     "All checks passed." : "All checks passed.",
+    "Background jobs" : "Background jobs",
+    "Last job ran %s." : "Last job ran %s.",
+    "Last job execution ran %s. Something seems wrong." : "Last job execution ran %s. Something seems wrong.",
+    "Background job didn’t run yet!" : "Background job didn’t run yet!",
+    "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information.",
     "Execute one task with each page loaded" : "Execute one task with each page loaded",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
+    "Use system cron service to call the cron.php file every 15 minutes." : "Use system cron service to call the cron.php file every 15 minutes.",
+    "The cron.php needs to be executed by the system user \"%s\"." : "The cron.php needs to be executed by the system user \"%s\".",
+    "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details.",
     "Version" : "Version",
     "Sharing" : "Sharing",
+    "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "As admin you can fine-tune the sharing behavior. Please see the documentation for more information.",
     "Allow apps to use the Share API" : "Allow apps to use the Share API",
     "Allow users to share via link" : "Allow users to share via link",
     "Allow public uploads" : "Allow public uploads",
+    "Always ask for a password" : "Always ask for a password",
     "Enforce password protection" : "Enforce password protection",
     "Set default expiration date" : "Set default expiry date",
     "Expire after " : "Expire after ",
@@ -158,15 +272,23 @@ OC.L10N.register(
     "Exclude groups from sharing" : "Exclude groups from sharing",
     "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered.",
+    "Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)" : "Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)",
+    "This text will be shown on the public link upload page when the file list is hidden." : "This text will be shown on the public link upload page when the file list is hidden.",
     "Tips & tricks" : "Tips & tricks",
+    "There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information." : "There are a lot of features and config switches available to optimally customise and use this instance. Here are some pointers for more information.",
+    "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend.",
+    "This is particularly recommended when using the desktop client for file synchronisation." : "This is particularly recommended when using the desktop client for file synchronisation.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>.",
     "How to do backups" : "How to do backups",
     "Advanced monitoring" : "Advanced monitoring",
     "Performance tuning" : "Performance tuning",
     "Improving the config.php" : "Improving the config.php",
     "Theming" : "Theming",
+    "Check the security of your Nextcloud over our security scan" : "Check the security of your Nextcloud over our security scan",
     "Hardening and security guidance" : "Hardening and security guidance",
     "Developer documentation" : "Developer documentation",
+    "View in store" : "View in store",
+    "Limit to groups" : "Limit to groups",
     "This app has an update available." : "This app has an update available.",
     "by %s" : "by %s",
     "%s-licensed" : "%s-licensed",
@@ -190,8 +312,10 @@ OC.L10N.register(
     "Administrator documentation" : "Administrator documentation",
     "Online documentation" : "Online documentation",
     "Forum" : "Forum",
+    "Getting help" : "Getting help",
     "Commercial support" : "Commercial support",
     "You are using <strong>%s</strong> of <strong>%s</strong>" : "You are using <strong>%s</strong> of <strong>%s</strong>",
+    "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)",
     "Profile picture" : "Profile picture",
     "Upload new" : "Upload new",
     "Select from Files" : "Select from Files",
@@ -205,6 +329,16 @@ OC.L10N.register(
     "Email" : "Email",
     "Your email address" : "Your email address",
     "No email address set" : "No email address set",
+    "For password reset and notifications" : "For password reset and notifications",
+    "Phone number" : "Phone number",
+    "Your phone number" : "Your phone number",
+    "Address" : "Address",
+    "Your postal address" : "Your postal address",
+    "Website" : "Website",
+    "It can take up to 24 hours before the account is displayed as verified." : "It can take up to 24 hours before the account is displayed as verified.",
+    "Link https://…" : "Link https://…",
+    "Twitter" : "Twitter",
+    "Twitter handle @…" : "Twitter handle @…",
     "You are member of the following groups:" : "You are member of the following groups:",
     "Password" : "Password",
     "Current password" : "Current password",
@@ -216,26 +350,48 @@ OC.L10N.register(
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
     "iOS app" : "iOS app",
+    "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!" : "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!",
     "Show First Run Wizard again" : "Show First Run Wizard again",
+    "Web, desktop and mobile clients currently logged in to your account." : "Web, desktop and mobile clients currently logged in to your account.",
+    "Device" : "Device",
+    "Last activity" : "Last activity",
+    "Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too." : "Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.",
     "Name" : "Name",
     "App name" : "App name",
     "Create new app password" : "Create new app password",
     "Use the credentials below to configure your app or device." : "Use the credentials below to configure your app or device.",
+    "For security reasons this password will only be shown once." : "For security reasons this password will only be shown once.",
     "Username" : "Username",
     "Done" : "Done",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.",
+    "Follow us on Google+!" : "Follow us on Google+!",
+    "Like our facebook page!" : "Like our facebook page!",
+    "Follow us on Twitter!" : "Follow us on Twitter!",
+    "Check out our blog!" : "Check out our blog!",
+    "Subscribe to our newsletter!" : "Subscribe to our newsletter!",
+    "Settings" : "Settings",
     "Show storage location" : "Show storage location",
     "Show user backend" : "Show user backend",
+    "Show last login" : "Show last login",
     "Show email address" : "Show email address",
     "Send email to new user" : "Send email to new user",
+    "When the password of a new user is left empty, an activation email with a link to set the password is sent." : "When the password of a new user is left empty, an activation email with a link to set the password is sent.",
     "E-Mail" : "E-Mail",
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
+    "Group name" : "Group name",
     "Everyone" : "Everyone",
     "Admins" : "Admins",
+    "Disabled" : "Disabled",
+    "Default quota" : "Default quota",
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
     "Other" : "Other",
+    "Group admin for" : "Group admin for",
     "Quota" : "Quota",
+    "Storage location" : "Storage location",
+    "User backend" : "User backend",
+    "Last login" : "Last login",
     "change full name" : "change full name",
     "set new password" : "set new password",
     "change email address" : "change email address",
@@ -259,8 +415,17 @@ OC.L10N.register(
     "Last cron job execution: %s. Something seems wrong." : "Last cron job execution: %s. Something seems wrong.",
     "Cron was not executed yet!" : "Cron was not executed yet!",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
+    "Uninstall app" : "Uninstall app",
+    "Hey there,<br><br>just letting you know that you now have a %s account.<br><br>Your username: <strong>%s</strong><br>Access it: <strong><a href=\"%s\">%s</a></strong><br><br>" : "Hey there,<br><br>just letting you know that you now have a %s account.<br><br>Your username: <strong>%s</strong><br>Access it: <strong><a href=\"%s\">%s</a></strong><br><br>",
     "Cheers!" : "Cheers!",
+    "Hey there,\n\njust letting you know that you now have a %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hey there,\n\njust letting you know that you now have a %s account.\n\nYour username: %s\nAccess it: %s\n\n",
     "For password recovery and notifications" : "For password recovery and notifications",
+    "Your website" : "Your website",
+    "Your Twitter handle" : "Your Twitter handle",
+    "Passcodes that give an app or device permissions to access your account." : "Passcodes that give an app or device permissions to access your account.",
+    "Follow us on Google Plus!" : "Follow us on Google Plus!",
+    "Subscribe to our twitter channel!" : "Subscribe to our twitter channel!",
+    "Subscribe to our news feed!" : "Subscribe to our news feed!",
     "Show last log in" : "Show last log in"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index f1a9db32c00..f0dfe3e228d 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -1,10 +1,26 @@
 { "translations": {
+    "{actor} changed your password" : "{actor} changed your password",
+    "You changed your password" : "You changed your password",
+    "Your password was reset by an administrator" : "Your password was reset by an administrator",
+    "{actor} changed your email address" : "{actor} changed your email address",
+    "You changed your email address" : "You changed your email address",
+    "Your email address was changed by an administrator" : "Your email address was changed by an administrator",
+    "Security" : "Security",
+    "You successfully logged in using two-factor authentication (%1$s)" : "You successfully logged in using two-factor authentication (%1$s)",
+    "A login attempt using two-factor authentication failed (%1$s)" : "A login attempt using two-factor authentication failed (%1$s)",
+    "Your <strong>password</strong> or <strong>email</strong> was modified" : "Your <strong>password</strong> or <strong>email</strong> was modified",
+    "Your apps" : "Your apps",
+    "Enabled apps" : "Enabled apps",
+    "Disabled apps" : "Disabled apps",
+    "App bundles" : "App bundles",
     "Wrong password" : "Incorrect password",
     "Saved" : "Saved",
     "No user supplied" : "No user supplied",
     "Unable to change password" : "Unable to change password",
     "Authentication error" : "Authentication error",
+    "Please provide an admin recovery password; otherwise, all user data will be lost." : "Please provide an admin recovery password; otherwise, all user data will be lost.",
     "Wrong admin recovery password. Please check the password and try again." : "Incorrect admin recovery password. Please check the password and try again.",
+    "Backend doesn't support password change, but the user's encryption key was updated." : "Backend doesn't support password change, but the user's encryption key was updated.",
     "installing and updating apps via the app store or Federated Cloud Sharing" : "installing and updating apps via the app store or Federated Cloud Sharing",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.",
@@ -13,25 +29,61 @@
     "Group already exists." : "Group already exists.",
     "Unable to add group." : "Unable to add group.",
     "Unable to delete group." : "Unable to delete group.",
+    "Invalid SMTP password." : "Invalid SMTP password.",
+    "Well done, %s!" : "Well done, %s!",
+    "If you received this email, the email configuration seems to be correct." : "If you received this email, the email configuration seems to be correct.",
+    "Email setting test" : "Email setting test",
+    "Email could not be sent. Check your mail server log" : "Email could not be sent. Check your mail server log",
     "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "A problem occurred while sending the email. Please revise your settings. (Error: %s)",
     "You need to set your user email before being able to send test emails." : "You need to set your user email before being able to send test emails.",
     "Invalid request" : "Invalid request",
     "Invalid mail address" : "Invalid mail address",
+    "No valid group selected" : "No valid group selected",
     "A user with that name already exists." : "A user with that name already exists.",
+    "To send a password link to the user an email address is required." : "To send a password link to the user an email address is required.",
     "Unable to create user." : "Unable to create user.",
     "Unable to delete user." : "Unable to delete user.",
+    "Error while enabling user." : "Error while enabling user.",
+    "Error while disabling user." : "Error while disabling user.",
+    "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):" : "In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):",
+    "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):" : "In order to verify your Website, store the following content in your web-root at '.well-known/CloudIdVerificationCode.txt' (please make sure that the complete text is in one line):",
+    "Settings saved" : "Settings saved",
     "Unable to change full name" : "Unable to change full name",
+    "Unable to change email address" : "Unable to change email address",
     "Your full name has been changed." : "Your full name has been changed.",
     "Forbidden" : "Forbidden",
     "Invalid user" : "Invalid user",
     "Unable to change mail address" : "Unable to change mail address",
     "Email saved" : "Email saved",
+    "%1$s changed your password on %2$s." : "%1$s changed your password on %2$s.",
+    "Your password on %s was changed." : "Your password on %s was changed.",
+    "Your password on %s was reset by an administrator." : "Your password on %s was reset by an administrator.",
+    "Password changed for %s" : "Password changed for %s",
+    "If you did not request this, please contact an administrator." : "If you did not request this, please contact an administrator.",
+    "Password for %1$s changed on %2$s" : "Password for %1$s changed on %2$s",
+    "%1$s changed your email address on %2$s." : "%1$s changed your email address on %2$s.",
+    "Your email address on %s was changed." : "Your email address on %s was changed.",
+    "Your email address on %s was changed by an administrator." : "Your email address on %s was changed by an administrator.",
+    "Email address changed for %s" : "Email address changed for %s",
+    "The new email address is %s" : "The new email address is %s",
+    "Email address for %1$s changed on %2$s" : "Email address for %1$s changed on %2$s",
+    "Welcome aboard" : "Welcome aboard",
+    "Welcome aboard %s" : "Welcome aboard %s",
+    "You have now an %s account, you can add, protect, and share your data." : "You have now an %s account, you can add, protect, and share your data.",
+    "Your username is: %s" : "Your username is: %s",
+    "Set your password" : "Set your password",
+    "Go to %s" : "Go to %s",
+    "Install Client" : "Install Client",
     "Your %s account was created" : "Your %s account was created",
+    "Password confirmation is required" : "Password confirmation is required",
     "Couldn't remove app." : "Couldn't remove app.",
     "Couldn't update app." : "Couldn't update app.",
+    "Are you really sure you want add {domain} as trusted domain?" : "Are you really sure you want add {domain} as trusted domain?",
     "Add trusted domain" : "Add trusted domain",
     "Migration in progress. Please wait until the migration is finished" : "Migration in progress. Please wait until the migration is finished",
     "Migration started …" : "Migration started …",
+    "Not saved" : "Not saved",
+    "Sending…" : "Sending…",
     "Email sent" : "Email sent",
     "Official" : "Official",
     "All" : "All",
@@ -42,9 +94,11 @@
     "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "Official apps are developed by the community. They offer additional functionality and are ready for production use.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.",
     "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "This app is not checked for security issues and is new or known to be unstable. Install at your own risk.",
+    "Disabling app …" : "Disabling app …",
     "Error while disabling app" : "Error whilst disabling app",
     "Disable" : "Disable",
     "Enable" : "Enable",
+    "Enabling app …" : "Enabling app …",
     "Error while enabling app" : "Error whilst enabling app",
     "Error: this app cannot be enabled because it makes the server unstable" : "Error: this app cannot be enabled because it makes the server unstable",
     "Error: could not disable broken app" : "Error: could not disable broken app",
@@ -52,18 +106,51 @@
     "Updating...." : "Updating....",
     "Error while updating app" : "Error whilst updating app",
     "Updated" : "Updated",
+    "Removing …" : "Removing …",
+    "Error while removing app" : "Error while removing app",
+    "Remove" : "Remove",
     "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds.",
     "App update" : "App update",
     "Approved" : "Approved",
     "Experimental" : "Experimental",
     "No apps found for {query}" : "No apps found for {query}",
+    "Enable all" : "Enable all",
+    "Allow filesystem access" : "Allow filesystem access",
     "Disconnect" : "Disconnect",
+    "Revoke" : "Revoke",
+    "Internet Explorer" : "Internet Explorer",
+    "Edge" : "Edge",
+    "Firefox" : "Firefox",
+    "Google Chrome" : "Google Chrome",
+    "Safari" : "Safari",
+    "Google Chrome for Android" : "Google Chrome for Android",
+    "iPhone iOS" : "iPhone iOS",
+    "iPad iOS" : "iPad iOS",
+    "iOS Client" : "iOS Client",
+    "Android Client" : "Android Client",
+    "Sync client - {os}" : "Sync client - {os}",
+    "This session" : "This session",
+    "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.",
     "Error while loading browser sessions and device tokens" : "Error while loading browser sessions and device tokens",
     "Error while creating device token" : "Error while creating device token",
     "Error while deleting the token" : "Error while deleting the token",
     "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.",
     "Valid until {date}" : "Valid until {date}",
     "Delete" : "Delete",
+    "Local" : "Local",
+    "Private" : "Private",
+    "Only visible to local users" : "Only visible to local users",
+    "Only visible to you" : "Only visible to you",
+    "Contacts" : "Contacts",
+    "Visible to local users and to trusted servers" : "Visible to local users and to trusted servers",
+    "Public" : "Public",
+    "Will be synced to a global and public address book" : "Will be synced to a global and public address book",
+    "Verify" : "Verify",
+    "Verifying …" : "Verifying …",
     "Select a profile picture" : "Select a profile picture",
     "Very weak password" : "Very weak password",
     "Weak password" : "Weak password",
@@ -78,14 +165,23 @@
     "undo" : "undo",
     "never" : "never",
     "deleted {userName}" : "deleted {userName}",
+    "No user found for <strong>{pattern}</strong>" : "No user found for <strong>{pattern}</strong>",
+    "Unable to add user to group {group}" : "Unable to add user to group {group}",
+    "Unable to remove user from group {group}" : "Unable to remove user from group {group}",
+    "Add group" : "Add group",
     "Invalid quota value \"{val}\"" : "Invalid quota value \"{val}\"",
+    "no group" : "no group",
+    "Password successfully changed" : "Password successfully changed",
     "Changing the password will result in data loss, because data recovery is not available for this user" : "Changing the password will result in data loss, because data recovery is not available for this user",
+    "Could not change the users email" : "Could not change the users email",
+    "Error while changing status of {user}" : "Error while changing status of {user}",
     "A valid username must be provided" : "A valid username must be provided",
     "Error creating user: {message}" : "Error creating user: {message}",
     "A valid password must be provided" : "A valid password must be provided",
     "A valid email must be provided" : "A valid email must be provided",
     "__language_name__" : "English (British English)",
     "Unlimited" : "Unlimited",
+    "Verifying" : "Verifying",
     "Personal info" : "Personal info",
     "Sessions" : "Sessions",
     "App passwords" : "App passwords",
@@ -94,8 +190,11 @@
     "Login" : "Login",
     "Plain" : "Plain",
     "NT LAN Manager" : "NT LAN Manager",
+    "SSL/TLS" : "SSL/TLS",
+    "STARTTLS" : "STARTTLS",
     "Email server" : "Email server",
     "Open documentation" : "Open documentation",
+    "It is important to set up this server to be able to send emails, like for password reset and notifications." : "It is important to set up this server to be able to send emails, like for password reset and notifications.",
     "Send mode" : "Send mode",
     "Encryption" : "Encryption",
     "From address" : "From address",
@@ -111,6 +210,7 @@
     "Test email settings" : "Test email settings",
     "Send email" : "Send email",
     "Server-side encryption" : "Server-side encryption",
+    "Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed." : "Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed.",
     "Enable server-side encryption" : "Enable server-side encryption",
     "Please read carefully before activating server-side encryption: " : "Please read carefully before activating server-side encryption: ",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.",
@@ -125,26 +225,40 @@
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one.",
     "Start migration" : "Start migration",
     "Security & setup warnings" : "Security & setup warnings",
+    "It's important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information." : "It's important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
     "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
+    "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel." : "Your database does not run with \"READ COMMITTED\" transaction isolation level. This can cause problems when multiple actions are executed in parallel.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version." : "%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version.",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with MIME type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with MIME type detection.",
     "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information." : "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a> for more information.",
     "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
     "This means that there might be problems with certain characters in file names." : "This means that there might be problems with certain characters in file names.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:",
+    "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"%s\">log</a>." : "Please double check the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"%s\">log</a>.",
     "All checks passed." : "All checks passed.",
+    "Background jobs" : "Background jobs",
+    "Last job ran %s." : "Last job ran %s.",
+    "Last job execution ran %s. Something seems wrong." : "Last job execution ran %s. Something seems wrong.",
+    "Background job didn’t run yet!" : "Background job didn’t run yet!",
+    "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information.",
     "Execute one task with each page loaded" : "Execute one task with each page loaded",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
+    "Use system cron service to call the cron.php file every 15 minutes." : "Use system cron service to call the cron.php file every 15 minutes.",
+    "The cron.php needs to be executed by the system user \"%s\"." : "The cron.php needs to be executed by the system user \"%s\".",
+    "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details." : "To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details.",
     "Version" : "Version",
     "Sharing" : "Sharing",
+    "As admin you can fine-tune the sharing behavior. Please see the documentation for more information." : "As admin you can fine-tune the sharing behavior. Please see the documentation for more information.",
     "Allow apps to use the Share API" : "Allow apps to use the Share API",
     "Allow users to share via link" : "Allow users to share via link",
     "Allow public uploads" : "Allow public uploads",
+    "Always ask for a password" : "Always ask for a password",
     "Enforce password protection" : "Enforce password protection",
     "Set default expiration date" : "Set default expiry date",
     "Expire after " : "Expire after ",
@@ -156,15 +270,23 @@
     "Exclude groups from sharing" : "Exclude groups from sharing",
     "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
     "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered.",
+    "Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)" : "Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)",
+    "This text will be shown on the public link upload page when the file list is hidden." : "This text will be shown on the public link upload page when the file list is hidden.",
     "Tips & tricks" : "Tips & tricks",
+    "There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information." : "There are a lot of features and config switches available to optimally customise and use this instance. Here are some pointers for more information.",
+    "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend." : "SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend.",
+    "This is particularly recommended when using the desktop client for file synchronisation." : "This is particularly recommended when using the desktop client for file synchronisation.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>." : "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation ↗</a>.",
     "How to do backups" : "How to do backups",
     "Advanced monitoring" : "Advanced monitoring",
     "Performance tuning" : "Performance tuning",
     "Improving the config.php" : "Improving the config.php",
     "Theming" : "Theming",
+    "Check the security of your Nextcloud over our security scan" : "Check the security of your Nextcloud over our security scan",
     "Hardening and security guidance" : "Hardening and security guidance",
     "Developer documentation" : "Developer documentation",
+    "View in store" : "View in store",
+    "Limit to groups" : "Limit to groups",
     "This app has an update available." : "This app has an update available.",
     "by %s" : "by %s",
     "%s-licensed" : "%s-licensed",
@@ -188,8 +310,10 @@
     "Administrator documentation" : "Administrator documentation",
     "Online documentation" : "Online documentation",
     "Forum" : "Forum",
+    "Getting help" : "Getting help",
     "Commercial support" : "Commercial support",
     "You are using <strong>%s</strong> of <strong>%s</strong>" : "You are using <strong>%s</strong> of <strong>%s</strong>",
+    "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)",
     "Profile picture" : "Profile picture",
     "Upload new" : "Upload new",
     "Select from Files" : "Select from Files",
@@ -203,6 +327,16 @@
     "Email" : "Email",
     "Your email address" : "Your email address",
     "No email address set" : "No email address set",
+    "For password reset and notifications" : "For password reset and notifications",
+    "Phone number" : "Phone number",
+    "Your phone number" : "Your phone number",
+    "Address" : "Address",
+    "Your postal address" : "Your postal address",
+    "Website" : "Website",
+    "It can take up to 24 hours before the account is displayed as verified." : "It can take up to 24 hours before the account is displayed as verified.",
+    "Link https://…" : "Link https://…",
+    "Twitter" : "Twitter",
+    "Twitter handle @…" : "Twitter handle @…",
     "You are member of the following groups:" : "You are member of the following groups:",
     "Password" : "Password",
     "Current password" : "Current password",
@@ -214,26 +348,48 @@
     "Desktop client" : "Desktop client",
     "Android app" : "Android app",
     "iOS app" : "iOS app",
+    "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!" : "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!",
     "Show First Run Wizard again" : "Show First Run Wizard again",
+    "Web, desktop and mobile clients currently logged in to your account." : "Web, desktop and mobile clients currently logged in to your account.",
+    "Device" : "Device",
+    "Last activity" : "Last activity",
+    "Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too." : "Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.",
     "Name" : "Name",
     "App name" : "App name",
     "Create new app password" : "Create new app password",
     "Use the credentials below to configure your app or device." : "Use the credentials below to configure your app or device.",
+    "For security reasons this password will only be shown once." : "For security reasons this password will only be shown once.",
     "Username" : "Username",
     "Done" : "Done",
+    "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}." : "Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.",
+    "Follow us on Google+!" : "Follow us on Google+!",
+    "Like our facebook page!" : "Like our facebook page!",
+    "Follow us on Twitter!" : "Follow us on Twitter!",
+    "Check out our blog!" : "Check out our blog!",
+    "Subscribe to our newsletter!" : "Subscribe to our newsletter!",
+    "Settings" : "Settings",
     "Show storage location" : "Show storage location",
     "Show user backend" : "Show user backend",
+    "Show last login" : "Show last login",
     "Show email address" : "Show email address",
     "Send email to new user" : "Send email to new user",
+    "When the password of a new user is left empty, an activation email with a link to set the password is sent." : "When the password of a new user is left empty, an activation email with a link to set the password is sent.",
     "E-Mail" : "E-Mail",
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
+    "Group name" : "Group name",
     "Everyone" : "Everyone",
     "Admins" : "Admins",
+    "Disabled" : "Disabled",
+    "Default quota" : "Default quota",
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
     "Other" : "Other",
+    "Group admin for" : "Group admin for",
     "Quota" : "Quota",
+    "Storage location" : "Storage location",
+    "User backend" : "User backend",
+    "Last login" : "Last login",
     "change full name" : "change full name",
     "set new password" : "set new password",
     "change email address" : "change email address",
@@ -257,8 +413,17 @@
     "Last cron job execution: %s. Something seems wrong." : "Last cron job execution: %s. Something seems wrong.",
     "Cron was not executed yet!" : "Cron was not executed yet!",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
+    "Uninstall app" : "Uninstall app",
+    "Hey there,<br><br>just letting you know that you now have a %s account.<br><br>Your username: <strong>%s</strong><br>Access it: <strong><a href=\"%s\">%s</a></strong><br><br>" : "Hey there,<br><br>just letting you know that you now have a %s account.<br><br>Your username: <strong>%s</strong><br>Access it: <strong><a href=\"%s\">%s</a></strong><br><br>",
     "Cheers!" : "Cheers!",
+    "Hey there,\n\njust letting you know that you now have a %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hey there,\n\njust letting you know that you now have a %s account.\n\nYour username: %s\nAccess it: %s\n\n",
     "For password recovery and notifications" : "For password recovery and notifications",
+    "Your website" : "Your website",
+    "Your Twitter handle" : "Your Twitter handle",
+    "Passcodes that give an app or device permissions to access your account." : "Passcodes that give an app or device permissions to access your account.",
+    "Follow us on Google Plus!" : "Follow us on Google Plus!",
+    "Subscribe to our twitter channel!" : "Subscribe to our twitter channel!",
+    "Subscribe to our news feed!" : "Subscribe to our news feed!",
     "Show last log in" : "Show last log in"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/nb.js b/settings/l10n/nb.js
index d94ad803f5c..a57460e2e67 100644
--- a/settings/l10n/nb.js
+++ b/settings/l10n/nb.js
@@ -42,7 +42,7 @@ OC.L10N.register(
     "Invalid mail address" : "Ugyldig e-postadresse",
     "No valid group selected" : "Ingen gyldig gruppe valgt",
     "A user with that name already exists." : "Det finnes allerede en bruker med det navnet.",
-    "To send a password link to the user an email address is required." : "Krever epost for å sende link til bruker.",
+    "To send a password link to the user an email address is required." : "E-postadresse kreves for å sende passsord-lenke til bruker.",
     "Unable to create user." : "Kan ikke opprette bruker.",
     "Unable to delete user." : "Kan ikke slette bruker.",
     "Error while enabling user." : "Feil ved påslag av brukerkonto.",
@@ -327,7 +327,7 @@ OC.L10N.register(
     "Email" : "E-post",
     "Your email address" : "Din e-postadresse",
     "No email address set" : "E-postadresse ikke satt",
-    "For password reset and notifications" : "For å nullstille passord og melinger.",
+    "For password reset and notifications" : "For å nullstille passord og varsler",
     "Phone number" : "Telefonnummer",
     "Your phone number" : "Ditt telefonnummer",
     "Address" : "Adresse",
diff --git a/settings/l10n/nb.json b/settings/l10n/nb.json
index 5b6b6811a9e..79b2579f71c 100644
--- a/settings/l10n/nb.json
+++ b/settings/l10n/nb.json
@@ -40,7 +40,7 @@
     "Invalid mail address" : "Ugyldig e-postadresse",
     "No valid group selected" : "Ingen gyldig gruppe valgt",
     "A user with that name already exists." : "Det finnes allerede en bruker med det navnet.",
-    "To send a password link to the user an email address is required." : "Krever epost for å sende link til bruker.",
+    "To send a password link to the user an email address is required." : "E-postadresse kreves for å sende passsord-lenke til bruker.",
     "Unable to create user." : "Kan ikke opprette bruker.",
     "Unable to delete user." : "Kan ikke slette bruker.",
     "Error while enabling user." : "Feil ved påslag av brukerkonto.",
@@ -325,7 +325,7 @@
     "Email" : "E-post",
     "Your email address" : "Din e-postadresse",
     "No email address set" : "E-postadresse ikke satt",
-    "For password reset and notifications" : "For å nullstille passord og melinger.",
+    "For password reset and notifications" : "For å nullstille passord og varsler",
     "Phone number" : "Telefonnummer",
     "Your phone number" : "Ditt telefonnummer",
     "Address" : "Adresse",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 0b4ce13e8ef..3c26c5097ab 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -326,7 +326,7 @@ OC.L10N.register(
     "Choose as profile picture" : "Выбрать в качестве картинки профиля",
     "Full name" : "Полное имя",
     "No display name set" : "Отображаемое имя не указано",
-    "Email" : "Почта",
+    "Email" : "Email",
     "Your email address" : "Ваш адрес электронной почты",
     "No email address set" : "Адрес не указан",
     "For password reset and notifications" : "Для сброса пароля и уведомлений",
@@ -351,7 +351,7 @@ OC.L10N.register(
     "Android app" : "Android приложение",
     "iOS app" : "iOS приложение",
     "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!" : "Если хотите поддержать проект - {contributeopen}присоединяйтесь к разработке{linkclose} или {contributeopen}расскажите о нем другим{linkclose}!",
-    "Show First Run Wizard again" : "Показать помощник настройки снова",
+    "Show First Run Wizard again" : "Повторно показать мастера первого запуска",
     "Web, desktop and mobile clients currently logged in to your account." : "Веб, настольные и мобильные клиенты, которые в настоящий момент авторизованы вашей учётной записью.",
     "Device" : "Устройство",
     "Last activity" : "Последние действия",
@@ -376,7 +376,7 @@ OC.L10N.register(
     "Show email address" : "Показывать адрес электронной почты",
     "Send email to new user" : "Отправлять письмо новому пользователю",
     "When the password of a new user is left empty, an activation email with a link to set the password is sent." : "Если поле пароля нового пользователя оставить пустым, то пользователю будет отправлено эл.письмо, содержащее ссылку на страницу установки пароля.",
-    "E-Mail" : "Почта",
+    "E-Mail" : "Email",
     "Create" : "Создать",
     "Admin Recovery Password" : "Пароль административного восстановления",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index e0b55109706..abb9a1c2a1a 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -324,7 +324,7 @@
     "Choose as profile picture" : "Выбрать в качестве картинки профиля",
     "Full name" : "Полное имя",
     "No display name set" : "Отображаемое имя не указано",
-    "Email" : "Почта",
+    "Email" : "Email",
     "Your email address" : "Ваш адрес электронной почты",
     "No email address set" : "Адрес не указан",
     "For password reset and notifications" : "Для сброса пароля и уведомлений",
@@ -349,7 +349,7 @@
     "Android app" : "Android приложение",
     "iOS app" : "iOS приложение",
     "If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!" : "Если хотите поддержать проект - {contributeopen}присоединяйтесь к разработке{linkclose} или {contributeopen}расскажите о нем другим{linkclose}!",
-    "Show First Run Wizard again" : "Показать помощник настройки снова",
+    "Show First Run Wizard again" : "Повторно показать мастера первого запуска",
     "Web, desktop and mobile clients currently logged in to your account." : "Веб, настольные и мобильные клиенты, которые в настоящий момент авторизованы вашей учётной записью.",
     "Device" : "Устройство",
     "Last activity" : "Последние действия",
@@ -374,7 +374,7 @@
     "Show email address" : "Показывать адрес электронной почты",
     "Send email to new user" : "Отправлять письмо новому пользователю",
     "When the password of a new user is left empty, an activation email with a link to set the password is sent." : "Если поле пароля нового пользователя оставить пустым, то пользователю будет отправлено эл.письмо, содержащее ссылку на страницу установки пароля.",
-    "E-Mail" : "Почта",
+    "E-Mail" : "Email",
     "Create" : "Создать",
     "Admin Recovery Password" : "Пароль административного восстановления",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",