summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorYusuke Nemoto <kaakaa@users.noreply.github.com>2017-03-31 00:20:55 +0900
committerCorey Hulen <corey@hulen.com>2017-03-30 08:20:55 -0700
commit9a9729f22fea7275637eafb4046900c9f372ec56 (patch)
treef108efde89e72488a79ccb7209398ae9be6f02c2 /webapp/i18n
parent29e6db5713c57d7bb46d7aea38b1001b9e8a1212 (diff)
downloadchat-9a9729f22fea7275637eafb4046900c9f372ec56.tar.gz
chat-9a9729f22fea7275637eafb4046900c9f372ec56.tar.bz2
chat-9a9729f22fea7275637eafb4046900c9f372ec56.zip
fix typo and missing messages (#5902)
Diffstat (limited to 'webapp/i18n')
-rwxr-xr-xwebapp/i18n/en.json8
1 files changed, 6 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index b15e99bec..bd6c2f979 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -165,6 +165,7 @@
"admin.cluster.status_table.status": "Status",
"admin.cluster.status_table.url": "Inter-Node URL",
"admin.cluster.status_table.version": "Version",
+ "admin.cluster.unknown": "unknown",
"admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.",
"admin.compliance.directoryExample": "E.g.: \"./data/\"",
"admin.compliance.directoryTitle": "Compliance Report Directory:",
@@ -387,6 +388,7 @@
"admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.",
"admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"",
"admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
+ "admin.image.amazonS3SSLExample": "E.g.: \"true\"",
"admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.",
"admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:",
"admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
@@ -691,7 +693,7 @@
"admin.service.corsTitle": "Enable cross-origin requests from:",
"admin.service.developerDesc": "When true, JavaScript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
"admin.service.developerTitle": "Enable Developer Mode: ",
- "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
+ "admin.service.enforceMfaTitle": "Enforce Multi-factor Authentication:",
"admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
"admin.service.forward80To443": "Forward port 80 to 443:",
"admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
@@ -773,6 +775,7 @@
"admin.sidebar.login": "Login",
"admin.sidebar.logs": "Logs",
"admin.sidebar.metrics": "Performance Monitoring",
+ "admin.sidebar.mfa": "MFA",
"admin.sidebar.nativeAppLinks": "Mattermost App Links",
"admin.sidebar.notifications": "Notifications",
"admin.sidebar.oauth": "OAuth 2.0",
@@ -1134,7 +1137,7 @@
"channel_modal.publicChannel2": "Create a new public channel anyone can join. ",
"channel_modal.purpose": "Purpose",
"channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
- "channel_notification.push": "Send mobile push notifications",
+ "channel_notifications.push": "Send mobile push notifications",
"channel_notifications.allActivity": "For all activity",
"channel_notifications.allUnread": "For all unread messages",
"channel_notifications.globalDefault": "Global default ({notifyLevel})",
@@ -1605,6 +1608,7 @@
"login.or": "or",
"login.password": "Password",
"login.passwordChanged": " Password updated successfully",
+ "login.placeholderOr": " or ",
"login.session_expired": " Your session has expired. Please login again.",
"login.signIn": "Sign in",
"login.signInLoading": "Signing in...",