diff options
author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-06-11 15:34:43 +0200 |
---|---|---|
committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2016-06-11 15:34:43 +0200 |
commit | 42c66efea5ef512d3a3442112f820168e6499265 (patch) | |
tree | 97ef44632d653656608e71e096fd537bbd609936 /core/l10n/en_GB.js | |
parent | 75f37f550bb7895757325d3f9a3215bcc4471065 (diff) | |
parent | 52a0c939ab8674857bbfe9a9fb0ee7308eee960e (diff) | |
download | nextcloud-server-42c66efea5ef512d3a3442112f820168e6499265.tar.gz nextcloud-server-42c66efea5ef512d3a3442112f820168e6499265.zip |
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
Diffstat (limited to 'core/l10n/en_GB.js')
-rw-r--r-- | core/l10n/en_GB.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js index 6f5859aae3e..76045cf033d 100644 --- a/core/l10n/en_GB.js +++ b/core/l10n/en_GB.js @@ -298,6 +298,7 @@ OC.L10N.register( "Thank you for your patience." : "Thank you for your patience.", "Two-step verification" : "Two-step verification", "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Enhanced security has been enabled for your account. Please authenticate using a second factor.", + "Cancel login" : "Cancel login", "Please authenticate using the selected factor." : "Please authenticate using the selected factor.", "An error occured while verifying the token" : "An error occured while verifying the token", "You are accessing the server from an untrusted domain." : "You are accessing the server from an untrusted domain.", |