Major update to System Console labelling (#3398)

21 files changed, 85 insertions, 77 deletions

diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx
index b045ec5f4..69a464f9c 100644
--- a/webapp/components/admin_console/admin_sidebar.jsx
+++ b/webapp/components/admin_console/admin_sidebar.jsx
@@ -279,7 +279,7 @@ export default class AdminSidebar extends React.Component {
                             title={
                                 <FormattedMessage
                                     id='admin.sidebar.reports'
-                                    defaultMessage='SITE REPORTS'
+                                    defaultMessage='REPORTING'
                                 />
                             }
                         >
@@ -288,7 +288,7 @@ export default class AdminSidebar extends React.Component {
                                 title={
                                     <FormattedMessage
                                         id='admin.sidebar.view_statistics'
-                                        defaultMessage='View Statistics'
+                                        defaultMessage='Site Statistics'
                                     />
                                 }
                             />
diff --git a/webapp/components/admin_console/admin_sidebar_team.jsx b/webapp/components/admin_console/admin_sidebar_team.jsx
index 2b85c712c..b1df92491 100644
--- a/webapp/components/admin_console/admin_sidebar_team.jsx
+++ b/webapp/components/admin_console/admin_sidebar_team.jsx
@@ -77,7 +77,7 @@ export default class AdminSidebarTeam extends React.Component {
                     title={
                         <FormattedMessage
                             id='admin.sidebar.statistics'
-                            defaultMessage='- Statistics'
+                            defaultMessage='- Team Statistics'
                         />
                     }
                 />
diff --git a/webapp/components/admin_console/compliance_settings.jsx b/webapp/components/admin_console/compliance_settings.jsx
index d31759150..8e42f492e 100644
--- a/webapp/components/admin_console/compliance_settings.jsx
+++ b/webapp/components/admin_console/compliance_settings.jsx
@@ -70,7 +70,7 @@ export default class ComplianceSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.compliance.enableTitle'
-                            defaultMessage='Enable Compliance:'
+                            defaultMessage='Enable Compliance Reporting:'
                         />
                     }
                     helpText={
@@ -88,7 +88,7 @@ export default class ComplianceSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.compliance.directoryTitle'
-                            defaultMessage='Compliance Directory Location:'
+                            defaultMessage='Compliance Report Directory:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.sql.maxOpenExample', 'Ex "10"')}
@@ -123,4 +123,4 @@ export default class ComplianceSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/admin_console/connection_settings.jsx b/webapp/components/admin_console/connection_settings.jsx
index 21563cb07..81fbb9343 100644
--- a/webapp/components/admin_console/connection_settings.jsx
+++ b/webapp/components/admin_console/connection_settings.jsx
@@ -51,7 +51,7 @@ export default class ConnectionSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.corsTitle'
-                            defaultMessage='Allow Cross-origin Requests from:'
+                            defaultMessage='Enable cross-origin requests from:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.service.corsEx', 'http://example.com')}
@@ -84,4 +84,4 @@ export default class ConnectionSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/admin_console/developer_settings.jsx b/webapp/components/admin_console/developer_settings.jsx
index 9b153ed26..7b261e07b 100644
--- a/webapp/components/admin_console/developer_settings.jsx
+++ b/webapp/components/admin_console/developer_settings.jsx
@@ -48,13 +48,13 @@ export default class DeveloperSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.testingTitle'
-                            defaultMessage='Enable Testing: '
+                            defaultMessage='Enable Testing Commands: '
                         />
                     }
                     helpText={
                         <FormattedMessage
                             id='admin.service.testingDescription'
-                            defaultMessage='(Developer Option) When true, /loadtest slash command is enabled to load test accounts and test data. Changing this will require a server restart before taking effect.'
+                            defaultMessage='When true, /loadtest slash command is enabled to load test accounts, data and text formatting. Changing this requires a server restart before taking effect.'
                         />
                     }
                     value={this.state.enableTesting}
@@ -71,7 +71,7 @@ export default class DeveloperSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.service.developerDesc'
-                            defaultMessage='(Developer Option) When true, extra information around errors will be displayed in the UI.'
+                            defaultMessage='When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. '
                         />
                     }
                     value={this.state.enableDeveloper}
@@ -80,4 +80,4 @@ export default class DeveloperSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/admin_console/email_authentication_settings.jsx b/webapp/components/admin_console/email_authentication_settings.jsx
index a49062eb6..60150da17 100644
--- a/webapp/components/admin_console/email_authentication_settings.jsx
+++ b/webapp/components/admin_console/email_authentication_settings.jsx
@@ -50,7 +50,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.allowSignupTitle'
-                            defaultMessage='Allow Sign Up With Email: '
+                            defaultMessage='Enable account creation with email: '
                         />
                     }
                     helpText={
@@ -67,7 +67,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.allowEmailSignInTitle'
-                            defaultMessage='Allow Sign In With Email: '
+                            defaultMessage='Enable sign-in with email: '
                         />
                     }
                     helpText={
@@ -84,7 +84,7 @@ export default class EmailAuthenticationSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.allowUsernameSignInTitle'
-                            defaultMessage='Allow Sign In With Username: '
+                            defaultMessage='Enable sign-in with username: '
                         />
                     }
                     helpText={
@@ -99,4 +99,4 @@ export default class EmailAuthenticationSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
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
+}
diff --git a/webapp/components/admin_console/external_service_settings.jsx b/webapp/components/admin_console/external_service_settings.jsx
index 4894e5749..ab8601858 100644
--- a/webapp/components/admin_console/external_service_settings.jsx
+++ b/webapp/components/admin_console/external_service_settings.jsx
@@ -50,7 +50,7 @@ export default class ExternalServiceSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.segmentTitle'
-                            defaultMessage='Segment Developer Key:'
+                            defaultMessage='Segment Write Key:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.service.segmentExample', 'Ex "g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs"')}
@@ -68,7 +68,7 @@ export default class ExternalServiceSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.googleTitle'
-                            defaultMessage='Google Developer Key:'
+                            defaultMessage='Google API Key:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.service.googleExample', 'Ex "7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV"')}
diff --git a/webapp/components/admin_console/gitlab_settings.jsx b/webapp/components/admin_console/gitlab_settings.jsx
index 48be597ca..e175e8580 100644
--- a/webapp/components/admin_console/gitlab_settings.jsx
+++ b/webapp/components/admin_console/gitlab_settings.jsx
@@ -59,7 +59,7 @@ export default class GitLabSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.gitlab.enableTitle'
-                            defaultMessage='Enable Sign Up With GitLab: '
+                            defaultMessage='Enable authentication with GitLab: '
                         />
                     }
                     helpText={
@@ -71,7 +71,7 @@ export default class GitLabSettings extends AdminSettings {
                             <br/>
                             <FormattedHTMLMessage
                                 id='admin.gitlab.EnableHtmlDesc'
-                                defaultMessage='<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". </li><li>Then use "Secret" and "Id" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>'
+                                defaultMessage='<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs "<your-mattermost-url>/login/gitlab/complete" (example: http://localhost:8065/login/gitlab/complete) and "<your-mattermost-url>/signup/gitlab/complete". </li><li>Then use "Application Secret Key" and "Application ID" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>'
                             />
                         </div>
                     }
@@ -83,7 +83,7 @@ export default class GitLabSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.gitlab.clientIdTitle'
-                            defaultMessage='Id:'
+                            defaultMessage='Application ID:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.gitlab.clientIdExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
@@ -102,7 +102,7 @@ export default class GitLabSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.gitlab.clientSecretTitle'
-                            defaultMessage='Secret:'
+                            defaultMessage='Application Secret Key:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.gitlab.clientSecretExample', 'Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"')}
diff --git a/webapp/components/admin_console/image_settings.jsx b/webapp/components/admin_console/image_settings.jsx
index 42595a863..48a212db1 100644
--- a/webapp/components/admin_console/image_settings.jsx
+++ b/webapp/components/admin_console/image_settings.jsx
@@ -58,7 +58,7 @@ export default class ImageSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.thumbWidthTitle'
-                            defaultMessage='Thumbnail Width:'
+                            defaultMessage='Attachment Thumbnail Width:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.image.thumbWidthExample', 'Ex "120"')}
@@ -76,7 +76,7 @@ export default class ImageSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.thumbHeightTitle'
-                            defaultMessage='Thumbnail Height:'
+                            defaultMessage='Attachment Thumbnail Height:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.image.thumbHeightExample', 'Ex "100"')}
@@ -94,7 +94,7 @@ export default class ImageSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.profileWidthTitle'
-                            defaultMessage='Profile Width:'
+                            defaultMessage='Profile Picture Width:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.image.profileWidthExample', 'Ex "1024"')}
@@ -112,7 +112,7 @@ export default class ImageSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.profileHeightTitle'
-                            defaultMessage='Profile Height:'
+                            defaultMessage='Profile Picture Height:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.image.profileHeightExample', 'Ex "0"')}
@@ -130,7 +130,7 @@ export default class ImageSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.previewWidthTitle'
-                            defaultMessage='Preview Width:'
+                            defaultMessage='Image Preview Width:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.image.previewWidthExample', 'Ex "1024"')}
@@ -148,7 +148,7 @@ export default class ImageSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.previewHeightTitle'
-                            defaultMessage='Preview Height:'
+                            defaultMessage='Image Preview Height:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.image.previewHeightExample', 'Ex "0"')}
@@ -164,4 +164,4 @@ export default class ImageSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx
index 53b3d23e6..26d076f54 100644
--- a/webapp/components/admin_console/ldap_settings.jsx
+++ b/webapp/components/admin_console/ldap_settings.jsx
@@ -91,7 +91,7 @@ export default class LdapSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.ldap.enableTitle'
-                            defaultMessage='Enable Login With LDAP:'
+                            defaultMessage='Enable sign-in with LDAP:'
                         />
                     }
                     helpText={
@@ -320,14 +320,14 @@ export default class LdapSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.ldap.idAttrTitle'
-                            defaultMessage='Id Attribute: '
+                            defaultMessage='ID Attribute: '
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.ldap.idAttrEx', 'Ex "sAMAccountName"')}
                     helpText={
                         <FormattedMessage
                             id='admin.ldap.idAttrDesc'
-                            defaultMessage='The attribute in the LDAP server that will be used as a unique identifier in Mattermost. It should be an LDAP attribute with a value that does not change, such as username or uid. If a user’s Id Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the "LDAP Username" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.'
+                            defaultMessage='The attribute in the LDAP server that will be used as a unique identifier in Mattermost. It should be an LDAP attribute with a value that does not change, such as username or uid. If a user’s ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the "LDAP Username" field on the sign in page. Normally this attribute is the same as the “Username Attribute” field above. If your team typically uses domain\\username to sign in to other services with LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.'
                         />
                     }
                     value={this.state.idAttribute}
@@ -339,7 +339,7 @@ export default class LdapSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.ldap.syncIntervalTitle'
-                            defaultMessage='Synchronization Interval (In Minutes)'
+                            defaultMessage='Synchronization Interval (minutes)'
                         />
                     }
                     helpText={
@@ -412,7 +412,7 @@ export default class LdapSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.ldap.loginNameTitle'
-                            defaultMessage='Login Field Name:'
+                            defaultMessage='Sign-in Field Default Text:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'Ex "LDAP Username"')}
diff --git a/webapp/components/admin_console/legal_and_support_settings.jsx b/webapp/components/admin_console/legal_and_support_settings.jsx
index 318ce5446..33494b36f 100644
--- a/webapp/components/admin_console/legal_and_support_settings.jsx
+++ b/webapp/components/admin_console/legal_and_support_settings.jsx
@@ -141,7 +141,7 @@ export default class LegalAndSupportSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.support.emailTitle'
-                            defaultMessage='Support email:'
+                            defaultMessage='Support Email:'
                         />
                     }
                     helpText={
diff --git a/webapp/components/admin_console/log_settings.jsx b/webapp/components/admin_console/log_settings.jsx
index 238040b71..57b2a6353 100644
--- a/webapp/components/admin_console/log_settings.jsx
+++ b/webapp/components/admin_console/log_settings.jsx
@@ -68,7 +68,7 @@ export default class LogSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.log.consoleTitle'
-                            defaultMessage='Log To The Console: '
+                            defaultMessage='Output logs to console: '
                         />
                     }
                     helpText={
@@ -104,7 +104,7 @@ export default class LogSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.log.fileTitle'
-                            defaultMessage='Log To File: '
+                            defaultMessage='Output logs to file: '
                         />
                     }
                     helpText={
@@ -140,7 +140,7 @@ export default class LogSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.log.locationTitle'
-                            defaultMessage='File Location:'
+                            defaultMessage='File Log Directory:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.log.locationPlaceholder', 'Enter your file location')}
@@ -159,7 +159,7 @@ export default class LogSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.log.formatTitle'
-                            defaultMessage='File Format:'
+                            defaultMessage='File Log Format:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.log.formatPlaceholder', 'Enter your file format')}
@@ -254,4 +254,4 @@ export default class LogSettings extends AdminSettings {
             </div>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/admin_console/public_link_settings.jsx b/webapp/components/admin_console/public_link_settings.jsx
index 823eba05a..705deb5cd 100644
--- a/webapp/components/admin_console/public_link_settings.jsx
+++ b/webapp/components/admin_console/public_link_settings.jsx
@@ -49,7 +49,7 @@ export default class PublicLinkSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.shareTitle'
-                            defaultMessage='Share Public File Link: '
+                            defaultMessage='Enable Public File Links: '
                         />
                     }
                     helpText={
diff --git a/webapp/components/admin_console/push_settings.jsx b/webapp/components/admin_console/push_settings.jsx
index 660c23e97..e5d6c7197 100644
--- a/webapp/components/admin_console/push_settings.jsx
+++ b/webapp/components/admin_console/push_settings.jsx
@@ -184,7 +184,7 @@ export default class PushSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.pushTitle'
-                            defaultMessage='Send Push Notifications: '
+                            defaultMessage='Enable Push Notifications: '
                         />
                     }
                     value={this.state.pushNotificationServerType}
@@ -232,4 +232,4 @@ export default class PushSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/admin_console/rate_settings.jsx b/webapp/components/admin_console/rate_settings.jsx
index 60818aaf9..b65ba0ac3 100644
--- a/webapp/components/admin_console/rate_settings.jsx
+++ b/webapp/components/admin_console/rate_settings.jsx
@@ -65,7 +65,7 @@ export default class RateSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.rate.enableLimiterTitle'
-                            defaultMessage='Enable Rate Limiter: '
+                            defaultMessage='Enable Rate Limiting: '
                         />
                     }
                     helpText={
@@ -82,7 +82,7 @@ export default class RateSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.rate.queriesTitle'
-                            defaultMessage='Number Of Queries Per Second:'
+                            defaultMessage='Maximum Queries per Second:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.rate.queriesExample', 'Ex "10"')}
@@ -108,7 +108,7 @@ export default class RateSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.rate.memoryDescription'
-                            defaultMessage='Maximum number of users sessions connected to the system as determined by "Vary By Remote Address" and "Vary By Header" settings below.'
+                            defaultMessage='Maximum number of users sessions connected to the system as determined by "Vary rate limit by remote address" and "Vary rate limit by HTTP header".'
                         />
                     }
                     value={this.state.memoryStoreSize}
@@ -120,7 +120,7 @@ export default class RateSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.rate.remoteTitle'
-                            defaultMessage='Vary By Remote Address: '
+                            defaultMessage='Vary rate limit by remote address: '
                         />
                     }
                     helpText={
@@ -138,7 +138,7 @@ export default class RateSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.rate.httpHeaderTitle'
-                            defaultMessage='Vary By HTTP Header:'
+                            defaultMessage='Vary rate limit by HTTP header:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.rate.httpHeaderExample', 'Ex "X-Real-IP", "X-Forwarded-For"')}
@@ -155,4 +155,4 @@ export default class RateSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/admin_console/session_settings.jsx b/webapp/components/admin_console/session_settings.jsx
index c19d4850b..2463b2dea 100644
--- a/webapp/components/admin_console/session_settings.jsx
+++ b/webapp/components/admin_console/session_settings.jsx
@@ -54,14 +54,14 @@ export default class SessionSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.webSessionDays'
-                            defaultMessage='Session Length for Web in Days:'
+                            defaultMessage='Session length for email and LDAP authentication (days):'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
                     helpText={
                         <FormattedMessage
                             id='admin.service.webSessionDaysDesc'
-                            defaultMessage='The web session will expire after the number of days specified and will require a user to login again.'
+                            defaultMessage='Email or LDAP sessions will expire after the number of days specified and will require users to sign in again.'
                         />
                     }
                     value={this.state.sessionLengthWebInDays}
@@ -72,14 +72,14 @@ export default class SessionSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.mobileSessionDays'
-                            defaultMessage='Session Length for Mobile Device in Days:'
+                            defaultMessage='Session length for mobile apps (days):'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
                     helpText={
                         <FormattedMessage
                             id='admin.service.mobileSessionDaysDesc'
-                            defaultMessage='The native mobile session will expire after the number of days specified and will require a user to login again.'
+                            defaultMessage='Mobile sessions will expire after the number of days specified and will require users to sign in again.'
                         />
                     }
                     value={this.state.sessionLengthMobileInDays}
@@ -90,14 +90,14 @@ export default class SessionSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.ssoSessionDays'
-                            defaultMessage='Session Length for SSO in Days:'
+                            defaultMessage='Session length for GitLab SSO authentication (days):'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
                     helpText={
                         <FormattedMessage
                             id='admin.service.ssoSessionDaysDesc'
-                            defaultMessage='The SSO session will expire after the number of days specified and will require a user to login again.'
+                            defaultMessage='GitLab single-sign-on sessions will expire after the number of days specified and will require users to sign in again.'
                         />
                     }
                     value={this.state.sessionLengthSSOInDays}
@@ -108,7 +108,7 @@ export default class SessionSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.sessionCache'
-                            defaultMessage='Session Cache in Minutes:'
+                            defaultMessage='Session Cache (minutes):'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.service.sessionDaysEx', 'Ex "30"')}
@@ -124,4 +124,4 @@ export default class SessionSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/admin_console/signup_settings.jsx b/webapp/components/admin_console/signup_settings.jsx
index 9f9e18644..ef6707b61 100644
--- a/webapp/components/admin_console/signup_settings.jsx
+++ b/webapp/components/admin_console/signup_settings.jsx
@@ -75,7 +75,7 @@ export default class SignupSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.email.inviteSaltTitle'
-                            defaultMessage='Invite Salt:'
+                            defaultMessage='Email Invite Salt:'
                         />
                     }
                     helpText={
diff --git a/webapp/components/admin_console/storage_settings.jsx b/webapp/components/admin_console/storage_settings.jsx
index 077d75c73..e4efd433c 100644
--- a/webapp/components/admin_console/storage_settings.jsx
+++ b/webapp/components/admin_console/storage_settings.jsx
@@ -87,7 +87,15 @@ export default class StorageSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.storeTitle'
-                            defaultMessage='Store Files In:'
+                            defaultMessage='File Storage System:'
+                        />
+                    }
+                    helpText={
+                        <FormattedMessage
+                            id='admin.image.storeDescription'
+                            defaultMessage='Storage system where files and image attachments are saved.<br /><br />
+                            Selecting "Amazon S3" enables fields to enter your Amazon credentials and bucket details.<br /><br />
+                            Selecting "Local File System" enables the field to specify a local file directory.'
                         />
                     }
                     value={this.state.driverName}
@@ -98,14 +106,14 @@ export default class StorageSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.localTitle'
-                            defaultMessage='Local Directory Location:'
+                            defaultMessage='Local Storage Directory:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.image.localExample', 'Ex "./data/"')}
                     helpText={
                         <FormattedMessage
                             id='admin.image.localDescription'
-                            defaultMessage='Directory to which image files are written. If blank, will be set to ./data/.'
+                            defaultMessage='Directory to which files and images are written. If blank, defaults to ./data/.'
                         />
                     }
                     value={this.state.directory}
@@ -117,7 +125,7 @@ export default class StorageSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.image.amazonS3IdTitle'
-                            defaultMessage='Amazon S3 Access Key Id:'
+                            defaultMessage='Amazon S3 Access Key ID:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.image.amazonS3IdExample', 'Ex "AKIADTOVBGERKLCBV"')}
diff --git a/webapp/components/admin_console/users_and_teams_settings.jsx b/webapp/components/admin_console/users_and_teams_settings.jsx
index b2f8afe1b..5f189708b 100644
--- a/webapp/components/admin_console/users_and_teams_settings.jsx
+++ b/webapp/components/admin_console/users_and_teams_settings.jsx
@@ -63,7 +63,7 @@ export default class UsersAndTeamsSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.team.userCreationTitle'
-                            defaultMessage='Enable User Creation: '
+                            defaultMessage='Enable Account Creation: '
                         />
                     }
                     helpText={
@@ -115,7 +115,7 @@ export default class UsersAndTeamsSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.team.restrictTitle'
-                            defaultMessage='Restrict Creation To Domains:'
+                            defaultMessage='Restrict account creation to specified email domains:'
                         />
                     }
                     placeholder={Utils.localizeMessage('admin.team.restrictExample', 'Ex "corp.mattermost.com, mattermost.org"')}
@@ -169,4 +169,4 @@ export default class UsersAndTeamsSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/admin_console/webhook_settings.jsx b/webapp/components/admin_console/webhook_settings.jsx
index a9ffa8b13..6c2e2d16a 100644
--- a/webapp/components/admin_console/webhook_settings.jsx
+++ b/webapp/components/admin_console/webhook_settings.jsx
@@ -90,7 +90,7 @@ export default class WebhookSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.cmdsTitle'
-                            defaultMessage='Enable Slash Commands: '
+                            defaultMessage='Enable Custom Slash Commands: '
                         />
                     }
                     helpText={
@@ -107,7 +107,7 @@ export default class WebhookSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.integrationAdmin'
-                            defaultMessage='Enable Integrations for Admin Only: '
+                            defaultMessage='Restrict creating integrations to Team and System Admins: '
                         />
                     }
                     helpText={
@@ -124,7 +124,7 @@ export default class WebhookSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.overrideTitle'
-                            defaultMessage='Enable Overriding Usernames from Webhooks and Slash Commands: '
+                            defaultMessage='Enable webhooks and slash commands to override usernames:'
                         />
                     }
                     helpText={
@@ -141,7 +141,7 @@ export default class WebhookSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.service.iconTitle'
-                            defaultMessage='Enable Overriding Icon from Webhooks and Slash Commands: '
+                            defaultMessage='Enable webhooks and slash commands to override profile picture icons:'
                         />
                     }
                     helpText={
@@ -156,4 +156,4 @@ export default class WebhookSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}