diff options
author | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
commit | 179a355b2cd3dc489a54cc27fd717f67373d0b1e (patch) | |
tree | f87a5586086635d4cbd18771b442ee771f79e441 /settings/l10n/en_GB.json | |
parent | 8e002b61554308cb4d50570f715303a82136f0fa (diff) | |
parent | 2d2d2267f7f38ca29e7b87f40fae62261614b0d1 (diff) | |
download | nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.tar.gz nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.zip |
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
Diffstat (limited to 'settings/l10n/en_GB.json')
-rw-r--r-- | settings/l10n/en_GB.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index ef3a53fcf5b..ead39f0dd18 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -277,6 +277,7 @@ "An app password is a passcode that gives an app or device permissions to access your %s account." : "An app password is a passcode that gives an app or device permissions to access your %s account.", "App name" : "App name", "Create new app password" : "Create new app password", + "Username" : "Username", "Done" : "Done", "Get the apps to sync your files" : "Get the apps to sync your files", "Desktop client" : "Desktop client", @@ -290,7 +291,6 @@ "Show user backend" : "Show user backend", "Send email to new user" : "Send email to new user", "Show email address" : "Show email address", - "Username" : "Username", "E-Mail" : "E-Mail", "Create" : "Create", "Admin Recovery Password" : "Admin Recovery Password", |