summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorYusuke Nemoto <kaakaa@users.noreply.github.com>2017-04-13 06:23:10 +0900
committerCorey Hulen <corey@hulen.com>2017-04-12 14:23:10 -0700
commitd405cff905eb316b21a8988750254d0e1cf35e3c (patch)
treea29e3c827d3261d6ad77e8ab9d16c7b3ce6e6b1e /webapp
parent8072bb6f577023dc7967b5e49874f4c3b2c192c1 (diff)
downloadchat-d405cff905eb316b21a8988750254d0e1cf35e3c.tar.gz
chat-d405cff905eb316b21a8988750254d0e1cf35e3c.tar.bz2
chat-d405cff905eb316b21a8988750254d0e1cf35e3c.zip
fix message ids and add missing messages (#6069)
Diffstat (limited to 'webapp')
-rwxr-xr-xwebapp/i18n/en.json7
1 files changed, 5 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index eb8017df7..b32696277 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -166,6 +166,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:",
@@ -393,6 +394,7 @@
"admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"",
"admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
"admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.",
+ "admin.image.amazonS3SSLExample": "E.g.: \"true\"",
"admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:",
"admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
"admin.image.amazonS3SecretExample": "E.g.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
@@ -696,7 +698,7 @@
"admin.service.corsTitle": "Enable cross-origin requests from:",
"admin.service.developerDesc": "When true, JavaScript errors are shown in a purple 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",
@@ -778,6 +780,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",
@@ -1136,7 +1139,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})",