From d2e93e1bee8bbf18c88bbabd7bf43239c4d23199 Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Tue, 5 Jul 2016 07:26:22 -0400
Subject: Major update to System Console labelling (#3398)

---
 webapp/components/admin_console/email_settings.jsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'webapp/components/admin_console/email_settings.jsx')

diff --git a/webapp/components/admin_console/email_settings.jsx b/webapp/components/admin_console/email_settings.jsx
index 9ab943e4c..85b4e2bd5 100644
--- a/webapp/components/admin_console/email_settings.jsx
+++ b/webapp/components/admin_console/email_settings.jsx
@@ -69,7 +69,7 @@ export default class EmailSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.notificationsTitle'
-                            defaultMessage='Send Email Notifications: '
+                            defaultMessage='Enable Email Notifications: '
                         />
                     }
                     helpText={
@@ -105,7 +105,7 @@ export default class EmailSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.notificationEmailTitle'
-                            defaultMessage='Notification Email Address:'
+                            defaultMessage='Notification From Address:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.email.notificationEmailExample', 'Ex: "mattermost@yourcompany.com", "admin@yourcompany.com"')}
@@ -124,7 +124,7 @@ export default class EmailSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.notificationOrganization'
-                            defaultMessage='Notification Footer Address:'
+                            defaultMessage='Notification Footer Mailing Address:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.email.notificationOrganizationExample', 'Ex: "© ABC Corporation, 565 Knight Way, Palo Alto, California, 94305, USA"')}
@@ -143,7 +143,7 @@ export default class EmailSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.smtpUsernameTitle'
-                            defaultMessage='SMTP Username:'
+                            defaultMessage='SMTP Server Username:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.email.smtpUsernameExample', 'Ex: "admin@yourcompany.com", "AKIADTOVBGERKLCBV"')}
@@ -162,7 +162,7 @@ export default class EmailSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.smtpPasswordTitle'
-                            defaultMessage='SMTP Password:'
+                            defaultMessage='SMTP Server Password:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.email.smtpPasswordExample', 'Ex: "yourpassword", "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
@@ -200,7 +200,7 @@ export default class EmailSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.smtpPortTitle'
-                            defaultMessage='SMTP Port:'
+                            defaultMessage='SMTP Server Port:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.email.smtpPortExample', 'Ex: "25", "465"')}
@@ -243,4 +243,4 @@ export default class EmailSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-1-g7c22