summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorYusuke Nemoto <kaakaa@users.noreply.github.com>2017-01-09 23:52:49 +0900
committerJoram Wilander <jwawilander@gmail.com>2017-01-09 09:52:49 -0500
commit37109e5a4fe00496e2f95104c95e183a3e24dcf7 (patch)
tree9becf29f4c5ef474f1b55eedd319389b7230a5ce /webapp
parente82bcea0d06b2173ed286f394ee33a393469eeaf (diff)
downloadchat-37109e5a4fe00496e2f95104c95e183a3e24dcf7.tar.gz
chat-37109e5a4fe00496e2f95104c95e183a3e24dcf7.tar.bz2
chat-37109e5a4fe00496e2f95104c95e183a3e24dcf7.zip
fix typo and missing message (#5008)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/i18n/en.json30
1 files changed, 16 insertions, 14 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 66a58e0c5..d3d9e0051 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -251,15 +251,16 @@
"admin.email.mhpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target='_blank'>Mattermost iOS app</a> from iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target='_blank'>Mattermost Android app</a> from Google Play. Learn more about <a href=\"http://docs.mattermost.com/deployment/push.html#hosted-push-notifications-service-hpns\" target='_blank'>HPNS</a>.",
"admin.email.mtpns": "Use iOS and Android apps on iTunes and Google Play with TPNS",
"admin.email.mtpnsHelp": "Download <a href=\"https://itunes.apple.com/us/app/mattermost/id984966508?mt=8\" target='_blank'>Mattermost iOS app</a> from iTunes. Download <a href=\"https://play.google.com/store/apps/details?id=com.mattermost.mattermost&hl=en\" target='_blank'>Mattermost Android app</a> from Google Play. Learn more about <a href=\"http://docs.mattermost.com/deployment/push.html#test-push-notifications-service-tpns\" target='_blank'>TPNS</a>.",
- "admin.email.nofificationOrganizationExample": "Ex. \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
+ "admin.email.nofificationOrganizationExample": "E.g.: \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
"admin.email.notificationDisplayDescription": "Display name on email account used when sending notification emails from Mattermost.",
- "admin.email.notificationDisplayExample": "Ex: \"Mattermost Notification\", \"System\", \"No-Reply\"",
+ "admin.email.notificationDisplayExample": "E.g.: \"Mattermost Notification\", \"System\", \"No-Reply\"",
"admin.email.notificationDisplayTitle": "Notification Display Name:",
"admin.email.notificationEmailDescription": "Email address displayed on email account used when sending notification emails from Mattermost.",
- "admin.email.notificationEmailExample": "Ex: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
+ "admin.email.notificationEmailExample": "E.g.: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"",
"admin.email.notificationEmailTitle": "Notification From Address:",
"admin.email.notificationOrganization": "Notification Footer Mailing Address:",
"admin.email.notificationOrganizationDescription": "Organization name and address displayed on email notifications from Mattermost, such as \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\". If the field is left empty, the organization name and address will not be displayed.",
+ "admin.email.notificationOrganizationExample": "E.g.: \"© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA\"",
"admin.email.notificationsDescription": "Typically set to true in production. When true, Mattermost attempts to send email notifications. Developers may set this field to false to skip email setup for faster development.<br />Setting this to true removes the Preview Mode banner (requires logging out and logging back in after setting is changed).",
"admin.email.notificationsTitle": "Enable Email Notifications: ",
"admin.email.passwordSaltDescription": "32-character salt added to signing of password reset emails. Randomly generated on install. Click \"Regenerate\" to create new salt.",
@@ -278,16 +279,16 @@
"admin.email.requireVerificationTitle": "Require Email Verification: ",
"admin.email.selfPush": "Manually enter Push Notification Service location",
"admin.email.smtpPasswordDescription": " Obtain this credential from administrator setting up your email server.",
- "admin.email.smtpPasswordExample": "Ex: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
+ "admin.email.smtpPasswordExample": "E.g.: \"yourpassword\", \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
"admin.email.smtpPasswordTitle": "SMTP Server Password:",
"admin.email.smtpPortDescription": "Port of SMTP email server.",
- "admin.email.smtpPortExample": "Ex: \"25\", \"465\", \"587\"",
+ "admin.email.smtpPortExample": "E.g.: \"25\", \"465\", \"587\"",
"admin.email.smtpPortTitle": "SMTP Server Port:",
"admin.email.smtpServerDescription": "Location of SMTP email server.",
- "admin.email.smtpServerExample": "Ex: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
+ "admin.email.smtpServerExample": "E.g.: \"smtp.yourcompany.com\", \"email-smtp.us-east-1.amazonaws.com\"",
"admin.email.smtpServerTitle": "SMTP Server:",
"admin.email.smtpUsernameDescription": " Obtain this credential from administrator setting up your email server.",
- "admin.email.smtpUsernameExample": "Ex: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
+ "admin.email.smtpUsernameExample": "E.g.: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"",
"admin.email.smtpUsernameTitle": "SMTP Server Username:",
"admin.email.testing": "Testing...",
"admin.false": "false",
@@ -363,6 +364,7 @@
"admin.image.amazonS3BucketExample": "E.g.: \"mattermost-media\"",
"admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
"admin.image.amazonS3EndpointDescription": "Hostname of your S3 Compatible Storage provider. Defaults to `s3.amazonaws.com`.",
+ "admin.image.amazonS3EndpointExample": "E.g.: \"s3.amazonaws.com\"",
"admin.image.amazonS3EndpointTitle": "Amazon S3 Endpoint:",
"admin.image.amazonS3IdDescription": "Obtain this credential from your Amazon EC2 administrator.",
"admin.image.amazonS3IdExample": "E.g.: \"AKIADTOVBGERKLCBV\"",
@@ -467,7 +469,7 @@
"admin.ldap.testSuccess": "AD/LDAP Test Successful",
"admin.ldap.uernameAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
"admin.ldap.userFilterDisc": "(Optional) Enter an AD/LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
- "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
+ "admin.ldap.userFilterEx": "E.g.: \"(objectClass=user)\"",
"admin.ldap.userFilterTitle": "User Filter:",
"admin.ldap.usernameAttrEx": "E.g.: \"sAMAccountName\"",
"admin.ldap.usernameAttrTitle": "Username Attribute:",
@@ -513,7 +515,7 @@
"admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> to learn more about configuring performance monitoring for Mattermost.",
"admin.metrics.enableTitle": "Enable Performance Monitoring:",
"admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.",
- "admin.metrics.listenAddressEx": "Ex \":8067\"",
+ "admin.metrics.listenAddressEx": "E.g.: \":8067\"",
"admin.metrics.listenAddressTitle": "Listen Address:",
"admin.mfa.bannerDesc": "Multi-factor authentication is only available for accounts with LDAP and email login methods. If there are users on your system with other login methods, it is recommended you set up multi-factor authentication directly with the SSO or SAML provider.",
"admin.mfa.cluster": "High",
@@ -564,7 +566,7 @@
"admin.rate.enableLimiterTitle": "Enable Rate Limiting: ",
"admin.rate.httpHeaderDescription": "When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring NGINX set to \"X-Real-IP\", when configuring AmazonELB set to \"X-Forwarded-For\").",
"admin.rate.httpHeaderExample": "E.g.: \"X-Real-IP\", \"X-Forwarded-For\"",
- "admin.rate.httpHeaderTitle": "Vary rate limit by HTTP header",
+ "admin.rate.httpHeaderTitle": "Vary rate limit by HTTP header:",
"admin.rate.maxBurst": "Maximum Burst Size:",
"admin.rate.maxBurstDescription": "Maximum number of requests allowed beyond the per second query limit.",
"admin.rate.maxBurstExample": "E.g.: \"100\"",
@@ -831,10 +833,10 @@
"admin.team.dirDesc": "When true, teams that are configured to show in team directory will show on main page inplace of creating a new team.",
"admin.team.dirTitle": "Enable Team Directory: ",
"admin.team.maxChannelsDescription": "Maximum total number of channels per team, including both active and deleted channels.",
- "admin.team.maxChannelsExample": "Ex \"100\"",
+ "admin.team.maxChannelsExample": "E.g.: \"100\"",
"admin.team.maxChannelsTitle": "Max Channels Per Team:",
"admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.",
- "admin.team.maxNotificationsPerChannelExample": "Ex \"1000\"",
+ "admin.team.maxNotificationsPerChannelExample": "E.g.: \"1000\"",
"admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:",
"admin.team.maxUsersDescription": "Maximum total number of users per team, including both active and inactive users.",
"admin.team.maxUsersExample": "E.g.: \"25\"",
@@ -901,13 +903,13 @@
"admin.webrtc.gatewayWebsocketUrlTitle": "Gateway WebSocket URL:",
"admin.webrtc.stunUriDescription": "Enter your STUN URI as stun:<your-stun-url>:<port>. STUN is a standardized network protocol to allow an end host to assist devices to access its public IP address if it is located behind a NAT.",
"admin.webrtc.stunUriExample": "E.g.: \"stun:webrtc.mattermost.com:5349\"",
- "admin.webrtc.stunUriTitle": "STUN URI",
+ "admin.webrtc.stunUriTitle": "STUN URI:",
"admin.webrtc.turnSharedKeyDescription": "Enter your TURN Server Shared Key. This is used to created dynamic passwords to establish the connection. Each password is valid for a short period of time.",
"admin.webrtc.turnSharedKeyExample": "E.g.: \"bXdkOWQxc3d0Ynk3emY5ZmsxZ3NtazRjaWg=\"",
"admin.webrtc.turnSharedKeyTitle": "TURN Shared Key:",
"admin.webrtc.turnUriDescription": "Enter your TURN URI as turn:<your-turn-url>:<port>. TURN is a standardized network protocol to allow an end host to assist devices to establish a connection by using a relay public IP address if it is located behind a symmetric NAT.",
"admin.webrtc.turnUriExample": "E.g.: \"turn:webrtc.mattermost.com:5349\"",
- "admin.webrtc.turnUriTitle": "TURN URI",
+ "admin.webrtc.turnUriTitle": "TURN URI:",
"admin.webrtc.turnUsernameDescription": "Enter your TURN Server Username.",
"admin.webrtc.turnUsernameExample": "E.g.: \"myusername\"",
"admin.webrtc.turnUsernameTitle": "TURN Username:",