summaryrefslogtreecommitdiffstats
path: root/settings/l10n/en_GB.js
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-06-26 12:55:05 +0200
committerLukas Reschke <lukas@owncloud.com>2016-06-26 12:55:05 +0200
commit7a9d60d87eb8e4414e5fe05830b088d426ff810d (patch)
tree0fc97a7eacfd071475afd8bc6d4372babacb5740 /settings/l10n/en_GB.js
parent5387b942c44e05b87ba2a0fd54168f5278a31344 (diff)
parent52eab2a61a5d27b64fcd0440b91f854c052933a9 (diff)
downloadnextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.tar.gz
nextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.zip
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
Diffstat (limited to 'settings/l10n/en_GB.js')
-rw-r--r--settings/l10n/en_GB.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 94ddadf854b..4b4194002b0 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -119,7 +119,7 @@ OC.L10N.register(
"Unlimited" : "Unlimited",
"Personal info" : "Personal info",
"Sessions" : "Sessions",
- "Devices" : "Devices",
+ "App passwords" : "App passwords",
"Sync clients" : "Sync clients",
"Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
"Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
@@ -223,6 +223,7 @@ OC.L10N.register(
"Documentation:" : "Documentation:",
"User documentation" : "User documentation",
"Admin documentation" : "Admin documentation",
+ "Visit website" : "Visit website",
"Report a bug" : "Report a bug",
"Show description …" : "Show description …",
"Hide description …" : "Hide description …",
@@ -268,14 +269,17 @@ OC.L10N.register(
"Current password" : "Current password",
"New password" : "New password",
"Change password" : "Change password",
+ "Language" : "Language",
+ "Help translate" : "Help translate",
"These are the web, desktop and mobile clients currently logged in to your ownCloud." : "These are the web, desktop and mobile clients currently logged in to your ownCloud.",
"Browser" : "Browser",
"Most recent activity" : "Most recent activity",
- "You've linked these devices." : "You've linked these devices.",
+ "You've linked these apps." : "You've linked these apps.",
"Name" : "Name",
- "A device password is a passcode that gives an app or device permissions to access your ownCloud account." : "A device password is a passcode that gives an app or device permissions to access your ownCloud account.",
- "Language" : "Language",
- "Help translate" : "Help translate",
+ "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",
+ "Done" : "Done",
"Get the apps to sync your files" : "Get the apps to sync your files",
"Desktop client" : "Desktop client",
"Android app" : "Android app",