summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 02c5f7365..40acbd97f 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -151,6 +151,7 @@
"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.notificationDisplayDescription": "Display name on email account used when sending notification emails from Mattermost.",
"admin.email.notificationDisplayExample": "Ex: \"Mattermost Notification\", \"System\", \"No-Reply\"",
"admin.email.notificationDisplayTitle": "Notification Display Name:",
@@ -159,7 +160,6 @@
"admin.email.notificationEmailTitle": "Notification Email Address:",
"admin.email.notificationOrganization": "Notification Footer 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.nofificationOrganizationExample": "Ex. \"© 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": "Send Email Notifications: ",
"admin.email.passwordSaltDescription": "32-character salt added to signing of password reset emails. Randomly generated on install. Click \"Re-Generate\" to create new salt.",
@@ -686,8 +686,8 @@
"channel_header.setHeader": "Set {term} Header...",
"channel_header.setPurpose": "Set {term} Purpose...",
"channel_header.viewInfo": "View Info",
- "channel_info.close": "Close",
"channel_info.about": "About",
+ "channel_info.close": "Close",
"channel_info.id": "ID: ",
"channel_info.name": "Name:",
"channel_info.notFound": "No Channel Found",