Major update to System Console labelling (#3398)

22 files changed, 151 insertions, 142 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
+}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index ec6357ce8..e85135990 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -91,11 +91,11 @@
   "admin.banner.heading": "Note:",
   "admin.compliance.directoryDescription": "Directory to which compliance reports are written. If blank, will be set to ./data/.",
   "admin.compliance.directoryExample": "Ex \"./data/\"",
-  "admin.compliance.directoryTitle": "Compliance Directory Location:",
+  "admin.compliance.directoryTitle": "Compliance Report Directory:",
   "admin.compliance.enableDailyDesc": "When true, Mattermost will generate a daily compliance report.",
   "admin.compliance.enableDailyTitle": "Enable Daily Report:",
   "admin.compliance.enableDesc": "When true, Mattermost allows compliance reporting",
-  "admin.compliance.enableTitle": "Enable Compliance:",
+  "admin.compliance.enableTitle": "Enable Compliance Reporting:",
   "admin.compliance.false": "false",
   "admin.compliance.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>Compliance is an enterprise feature. Your current license does not support Compliance. Click <a href=\"http://mattermost.com\" target=\"_blank\">here</a> for information and pricing on enterprise licenses.</p>",
   "admin.compliance.save": "Save",
@@ -144,11 +144,11 @@
   "admin.developer.title": "Developer Settings",
   "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Privacy Policy</a>.",
   "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.",
-  "admin.email.allowEmailSignInTitle": "Allow Sign In With Email: ",
+  "admin.email.allowEmailSignInTitle": "Enable sign-in with email: ",
   "admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password.  This value should be false only when you want to limit signup to a single-sign-on service like OAuth or LDAP.",
-  "admin.email.allowSignupTitle": "Allow Sign Up With Email: ",
+  "admin.email.allowSignupTitle": "Enable account creation with email: ",
   "admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password.  This setting is typically only used when email verification is disabled.",
-  "admin.email.allowUsernameSignInTitle": "Allow Sign In With Username: ",
+  "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ",
   "admin.email.connectionSecurityTest": "Test Connection",
   "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.",
   "admin.email.emailFail": "Connection unsuccessful: {error}",
@@ -157,7 +157,7 @@
   "admin.email.genericPushNotification": "Send generic description with user and channel names",
   "admin.email.inviteSaltDescription": "32-character salt added to signing of email invites. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.email.inviteSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
-  "admin.email.inviteSaltTitle": "Invite Salt:",
+  "admin.email.inviteSaltTitle": "Email Invite Salt:",
   "admin.email.mhpns": "Use encrypted, production-quality HPNS connection to iOS and Android apps",
   "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",
@@ -168,11 +168,11 @@
   "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.notificationEmailTitle": "Notification Email Address:",
-  "admin.email.notificationOrganization": "Notification Footer Address",
+  "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.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.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.",
   "admin.email.passwordSaltExample": "Ex \"bjlSR4QqkXFBr7TP4oDzlfZmcNuH9Yo\"",
   "admin.email.passwordSaltTitle": "Password Reset Salt:",
@@ -184,22 +184,22 @@
   "admin.email.pushServerDesc": "Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use http://push-test.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.",
   "admin.email.pushServerEx": "E.g.: \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "Push Notification Server:",
-  "admin.email.pushTitle": "Send Push Notifications: ",
+  "admin.email.pushTitle": "Enable Push Notifications: ",
   "admin.email.requireVerificationDescription": "Typically set to true in production. When true, Mattermost requires email verification after account creation prior to allowing login. Developers may set this field to false so skip sending verification emails for faster development.",
   "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.smtpPasswordTitle": "SMTP Password:",
+  "admin.email.smtpPasswordTitle": "SMTP Server Password:",
   "admin.email.smtpPortDescription": "Port of SMTP email server.",
   "admin.email.smtpPortExample": "Ex: \"25\", \"465\"",
-  "admin.email.smtpPortTitle": "SMTP Port:",
+  "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.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.smtpUsernameTitle": "SMTP Username:",
+  "admin.email.smtpUsernameTitle": "SMTP Server Username:",
   "admin.email.testing": "Testing...",
   "admin.false": "false",
   "admin.files.images": "Images",
@@ -222,17 +222,17 @@
   "admin.general.privacy": "Privacy",
   "admin.general.usersAndTeams": "Users and Teams",
   "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.",
-  "admin.gitlab.EnableHtmlDesc": "<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>",
+  "admin.gitlab.EnableHtmlDesc": "<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>",
   "admin.gitlab.authDescription": "Enter https://<your-gitlab-url>/oauth/authorize (example https://example.com:3000/oauth/authorize).   Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
   "admin.gitlab.authExample": "Ex \"https://<your-gitlab-url>/oauth/authorize\"",
   "admin.gitlab.authTitle": "Auth Endpoint:",
   "admin.gitlab.clientIdDescription": "Obtain this value via the instructions above for logging into GitLab",
   "admin.gitlab.clientIdExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientIdTitle": "Id:",
+  "admin.gitlab.clientIdTitle": "Application ID:",
   "admin.gitlab.clientSecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
-  "admin.gitlab.clientSecretTitle": "Secret:",
+  "admin.gitlab.clientSecretTitle": "Application Secret Key:",
   "admin.gitlab.enableDescription": "When true, Mattermost allows team creation and account signup using GitLab OAuth.",
-  "admin.gitlab.enableTitle": "Enable Sign Up With GitLab: ",
+  "admin.gitlab.enableTitle": "Enable authentication with GitLab: ",
   "admin.gitlab.settingsTitle": "GitLab Settings",
   "admin.gitlab.tokenDescription": "Enter https://<your-gitlab-url>/oauth/token.   Make sure you use HTTP or HTTPS in your URL depending on your server configuration.",
   "admin.gitlab.tokenExample": "Ex \"https://<your-gitlab-url>/oauth/token\"",
@@ -245,42 +245,43 @@
   "admin.image.amazonS3BucketTitle": "Amazon S3 Bucket:",
   "admin.image.amazonS3IdDescription": "Obtain this credential from your Amazon EC2 administrator.",
   "admin.image.amazonS3IdExample": "Ex \"AKIADTOVBGERKLCBV\"",
-  "admin.image.amazonS3IdTitle": "Amazon S3 Access Key Id:",
+  "admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:",
   "admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.",
   "admin.image.amazonS3RegionExample": "Ex \"us-east-1\"",
   "admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
   "admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
   "admin.image.amazonS3SecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
   "admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
-  "admin.image.localDescription": "Directory to which image files are written. If blank, will be set to ./data/.",
+  "admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
   "admin.image.localExample": "Ex \"./data/\"",
-  "admin.image.localTitle": "Local Directory Location:",
+  "admin.image.localTitle": "Local Storage Directory:",
   "admin.image.previewHeightDescription": "Maximum height of preview image (\"0\": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.",
   "admin.image.previewHeightExample": "Ex \"0\"",
-  "admin.image.previewHeightTitle": "Preview Height:",
+  "admin.image.previewHeightTitle": "Image Preview Height:",
   "admin.image.previewWidthDescription": "Maximum width of preview image. Updating this value changes how preview images render in future, but does not change images created in the past.",
   "admin.image.previewWidthExample": "Ex \"1024\"",
-  "admin.image.previewWidthTitle": "Preview Width:",
+  "admin.image.previewWidthTitle": "Profile Picture Width:",
   "admin.image.profileHeightDescription": "Height of profile picture.",
   "admin.image.profileHeightExample": "Ex \"0\"",
-  "admin.image.profileHeightTitle": "Profile Height:",
+  "admin.image.profileHeightTitle": "Profile Picture Height:",
   "admin.image.profileWidthDescription": "Width of profile picture.",
   "admin.image.profileWidthExample": "Ex \"1024\"",
-  "admin.image.profileWidthTitle": "Profile Width:",
+  "admin.image.profileWidthTitle": "Image Preview Width:",
   "admin.image.publicLinkDescription": "32-character salt added to signing of public image links. Randomly generated on install. Click \"Regenerate\" to create new salt.",
   "admin.image.publicLinkExample": "Ex \"gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6\"",
   "admin.image.publicLinkTitle": "Public Link Salt:",
   "admin.image.shareDescription": "Allow users to share public links to files and images.",
-  "admin.image.shareTitle": "Share Public File Link: ",
+  "admin.image.shareTitle": "Enable Public File Links: ",
   "admin.image.storeAmazonS3": "Amazon S3",
   "admin.image.storeLocal": "Local File System",
-  "admin.image.storeTitle": "Store Files In:",
+  "admin.image.storeTitle": "File Storage System:",
+  "admin.image.storeDescription": "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.",
   "admin.image.thumbHeightDescription": "Height of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
   "admin.image.thumbHeightExample": "Ex \"100\"",
-  "admin.image.thumbHeightTitle": "Thumbnail Height:",
+  "admin.image.thumbHeightTitle": "Attachment Thumbnail Height:",
   "admin.image.thumbWidthDescription": "Width of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
   "admin.image.thumbWidthExample": "Ex \"120\"",
-  "admin.image.thumbWidthTitle": "Thumbnail Width:",
+  "admin.image.thumbWidthTitle": "Attachment Thumbnail Width:",
   "admin.integrations.external": "External Services",
   "admin.integrations.webhook": "Webhooks and Commands",
   "admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the LDAP tree.",
@@ -294,19 +295,19 @@
   "admin.ldap.emailAttrEx": "Ex \"mail\" or \"userPrincipalName\"",
   "admin.ldap.emailAttrTitle": "Email Attribute:",
   "admin.ldap.enableDesc": "When true, Mattermost allows login using LDAP",
-  "admin.ldap.enableTitle": "Enable Login With LDAP:",
+  "admin.ldap.enableTitle": "Enable sign-in with LDAP:",
   "admin.ldap.firstnameAttrDesc": "The attribute in the LDAP server that will be used to populate the first name of users in Mattermost.",
   "admin.ldap.firstnameAttrEx": "Ex \"givenName\"",
   "admin.ldap.firstnameAttrTitle": "First Name Attribute",
-  "admin.ldap.idAttrDesc": "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.",
+  "admin.ldap.idAttrDesc": "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.",
   "admin.ldap.idAttrEx": "Ex \"sAMAccountName\"",
-  "admin.ldap.idAttrTitle": "Id Attribute: ",
+  "admin.ldap.idAttrTitle": "ID Attribute: ",
   "admin.ldap.lastnameAttrDesc": "The attribute in the LDAP server that will be used to populate the last name of users in Mattermost.",
   "admin.ldap.lastnameAttrEx": "Ex \"sn\"",
   "admin.ldap.lastnameAttrTitle": "Last Name Attribute:",
   "admin.ldap.loginNameDesc": "The placeholder text that appears in the login field on the login page. Defaults to \"LDAP Username\".",
   "admin.ldap.loginNameEx": "Ex \"LDAP Username\"",
-  "admin.ldap.loginNameTitle": "Login Field Name:",
+  "admin.ldap.loginNameTitle": "Sign-in Field Default Text:",
   "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.",
   "admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
   "admin.ldap.nicknameAttrTitle": "Nickname Attribute:",
@@ -326,7 +327,7 @@
   "admin.ldap.skipCertificateVerification": "Skip Certificate Verification",
   "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.",
   "admin.ldap.syncIntervalHelpText": "LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour. Changing this will require a server restart before taking effect.",
-  "admin.ldap.syncIntervalTitle": "Synchronization Interval (In Minutes)",
+  "admin.ldap.syncIntervalTitle": "Synchronization Interval (minutes)",
   "admin.ldap.uernameAttrDesc": "The attribute in the 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": "Optionally enter an 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)\"",
@@ -346,13 +347,13 @@
   "admin.license.uploadDesc": "Upload a license key for Mattermost Enterprise Edition to upgrade this server. <a href=\"http://mattermost.com\" target=\"_blank\">Visit us online</a> to learn more about the benefits of Enterprise Edition or to purchase a key.",
   "admin.license.uploading": "Uploading License...",
   "admin.log.consoleDescription": "Typically set to false in production. Developers may set this field to true to output log messages to console based on the console level option.  If true, server writes messages to the standard output stream (stdout).",
-  "admin.log.consoleTitle": "Log To The Console: ",
+  "admin.log.consoleTitle": "Output logs to console: ",
   "admin.log.enableWebhookDebugging": "Enable Webhook Debugging:",
   "admin.log.enableWebhookDebuggingDescription": "You can set this to false to disable the debug logging of all incoming webhook request bodies.",
   "admin.log.fileDescription": "Typically set to true in production.  When true, log files are written to the log file specified in file location field below.",
   "admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
   "admin.log.fileLevelTitle": "File Log Level:",
-  "admin.log.fileTitle": "Log To File: ",
+  "admin.log.fileTitle": "Output logs to file: ",
   "admin.log.formatDateLong": "Date (2006/01/02)",
   "admin.log.formatDateShort": "Date (01/02/06)",
   "admin.log.formatDescription": "Format of log message output. If blank will be set to \"[%D %T] [%L] %M\", where:",
@@ -361,12 +362,12 @@
   "admin.log.formatPlaceholder": "Enter your file format",
   "admin.log.formatSource": "Source",
   "admin.log.formatTime": "Time (15:04:05 MST)",
-  "admin.log.formatTitle": "File Format:",
+  "admin.log.formatTitle": "File Log Format:",
   "admin.log.levelDescription": "This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
   "admin.log.levelTitle": "Console Log Level:",
   "admin.log.locationDescription": "File to which log files are written. If blank, will be set to ./logs/mattermost, which writes logs to mattermost.log. Log rotation is enabled and every 10,000 lines of log information is written to new files stored in the same directory, for example mattermost.2015-09-23.001, mattermost.2015-09-23.002, and so forth.",
   "admin.log.locationPlaceholder": "Enter your file location",
-  "admin.log.locationTitle": "File Location:",
+  "admin.log.locationTitle": "File Log Directory:",
   "admin.log.logSettings": "Log Settings",
   "admin.logs.reload": "Reload",
   "admin.logs.title": "Server Logs",
@@ -382,20 +383,20 @@
   "admin.privacy.showFullNameDescription": "When false, hides full name of users from other users, including team owners and team administrators. Username is shown in place of full name.",
   "admin.privacy.showFullNameTitle": "Show Full Name: ",
   "admin.rate.enableLimiterDescription": "When true, APIs are throttled at rates specified below.",
-  "admin.rate.enableLimiterTitle": "Enable Rate Limiter: ",
+  "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": "Ex \"X-Real-IP\", \"X-Forwarded-For\"",
-  "admin.rate.httpHeaderTitle": "Vary By HTTP Header:",
-  "admin.rate.memoryDescription": "Maximum number of users sessions connected to the system as determined by \"Vary By Remote Address\" and \"Vary By Header\" settings below.",
+  "admin.rate.httpHeaderTitle": "Vary rate limit by HTTP header",
+  "admin.rate.memoryDescription": "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\" settings below.",
   "admin.rate.memoryExample": "Ex \"10000\"",
   "admin.rate.memoryTitle": "Memory Store Size:",
   "admin.rate.noteDescription": "Changing properties in this section will require a server restart before taking effect.",
   "admin.rate.noteTitle": "Note:",
   "admin.rate.queriesDescription": "Throttles API at this number of requests per second.",
   "admin.rate.queriesExample": "Ex \"10\"",
-  "admin.rate.queriesTitle": "Number Of Queries Per Second:",
+  "admin.rate.queriesTitle": "Maximum Queries per Second:",
   "admin.rate.remoteDescription": "When true, rate limit API access by IP address.",
-  "admin.rate.remoteTitle": "Vary By Remote Address: ",
+  "admin.rate.remoteTitle": "Vary rate limit by remote address: ",
   "admin.rate.title": "Rate Limit Settings",
   "admin.recycle.button": "Recycle Database Connections",
   "admin.recycle.loading": " Recycling...",
@@ -426,46 +427,46 @@
   "admin.service.attemptExample": "Ex \"10\"",
   "admin.service.attemptTitle": "Maximum Login Attempts:",
   "admin.service.cmdsDesc": "When true, user created slash commands will be allowed.",
-  "admin.service.cmdsTitle": "Enable Slash Commands: ",
+  "admin.service.cmdsTitle": "Enable Custom Slash Commands: ",
   "admin.service.corsDescription": "Enable HTTP Cross origin request from a specific domain. Use \"*\" if you want to allow CORS from any domain or leave it blank to disable it.",
   "admin.service.corsEx": "http://example.com",
-  "admin.service.corsTitle": "Allow Cross-origin Requests from:",
-  "admin.service.developerDesc": "(Developer Option) When true, extra information around errors will be displayed in the UI.",
+  "admin.service.corsTitle": "Enable cross-origin requests from:",
+  "admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
   "admin.service.developerTitle": "Enable Developer Mode: ",
   "admin.service.googleDescription": "Set this key to enable embedding of YouTube video previews based on hyperlinks appearing in messages or comments. Instructions to obtain a key available at <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target=\"_blank\">https://www.youtube.com/watch?v=Im69kzhpR3I</a>. Leaving the field blank disables the automatic generation of YouTube video previews from links.",
   "admin.service.googleExample": "Ex \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
-  "admin.service.googleTitle": "Google Developer Key:",
+  "admin.service.googleTitle": "Google API Key:",
   "admin.service.iconDescription": "When true, webhooks and slash commands will be allowed to change the icon they post with. Note, combined with allowing username overriding, this could open users up to phishing attacks.",
-  "admin.service.iconTitle": "Enable Overriding Icon from Webhooks and Slash Commands: ",
+  "admin.service.iconTitle": "Enable webhooks and slash commands to override profile picture icons:",
   "admin.service.insecureTlsDesc": "When true, any outgoing HTTPS requests will accept unverified, self-signed certificates. For example, outgoing webhooks to a server with a self-signed TLS certificate, using any domain, will be allowed. Note that this makes these connections susceptible to man-in-the-middle attacks.",
   "admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
-  "admin.service.integrationAdmin": "Enable Integrations for Admin Only: ",
+  "admin.service.integrationAdmin": "Restrict creating integrations to Team and System Admins: ",
   "admin.service.integrationAdminDesc": "When true, user created integrations can only be created by admins.",
   "admin.service.listenAddress": "Listen Address:",
   "admin.service.listenDescription": "The address to which to bind and listen. Entering \":8065\" will bind to all interfaces or you can choose one like \"127.0.0.1:8065\".  Changing this will require a server restart before taking effect.",
   "admin.service.listenExample": "Ex \":8065\"",
   "admin.service.mfaDesc": "When true, users will be given the option to add multi-factor authentication to their account. They will need a smartphone and an authenticator app such as Google Authenticator.",
   "admin.service.mfaTitle": "Enable Multi-factor Authentication:",
-  "admin.service.mobileSessionDays": "Session Length for Mobile Device in Days:",
-  "admin.service.mobileSessionDaysDesc": "The native mobile session will expire after the number of days specified and will require a user to login again.",
+  "admin.service.mobileSessionDays": "Session length for mobile apps (days):",
+  "admin.service.mobileSessionDaysDesc": "Mobile sessions will expire after the number of days specified and will require users to sign in again.",
   "admin.service.outWebhooksDesc": "When true, outgoing webhooks will be allowed.",
   "admin.service.outWebhooksTitle": "Enable Outgoing Webhooks: ",
   "admin.service.overrideDescription": "When true, webhooks and slash commands will be allowed to change the username they are posting as. Note, combined with allowing icon overriding, this could open users up to phishing attacks.",
-  "admin.service.overrideTitle": "Enable Overriding Usernames from Webhooks and Slash Commands: ",
+  "admin.service.overrideTitle": "Enable webhooks and slash commands to override usernames:",
   "admin.service.securityDesc": "When true, System Administrators are notified by email if a relevant security fix alert has been announced in the last 12 hours. Requires email to be enabled.",
   "admin.service.securityTitle": "Enable Security Alerts: ",
   "admin.service.segmentDescription": "Segment.com is an online service that can be optionally used to track detailed system statistics. You can obtain a key by signing-up for a free account at Segment.com.",
   "admin.service.segmentExample": "Ex \"g3fgGOXJAQ43QV7rAh6iwQCkV4cA1Gs\"",
-  "admin.service.segmentTitle": "Segment Developer Key:",
-  "admin.service.sessionCache": "Session Cache in Minutes:",
+  "admin.service.segmentTitle": "Segment Write Key:",
+  "admin.service.sessionCache": "Session Cache (minutes):",
   "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.",
   "admin.service.sessionDaysEx": "Ex \"30\"",
-  "admin.service.ssoSessionDays": "Session Length for SSO in Days:",
-  "admin.service.ssoSessionDaysDesc": "The SSO session will expire after the number of days specified and will require a user to login again.",
-  "admin.service.testingDescription": "(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.",
-  "admin.service.testingTitle": "Enable Testing: ",
-  "admin.service.webSessionDays": "Session Length for Web in Days:",
-  "admin.service.webSessionDaysDesc": "The web session will expire after the number of days specified and will require a user to login again.",
+  "admin.service.ssoSessionDays": "Session length for GitLab SSO authentication (days):",
+  "admin.service.ssoSessionDaysDesc": "GitLab single-sign-on sessions will expire after the number of days specified and will require users to sign in again.",
+  "admin.service.testingDescription": "When true, /loadtest slash command is enabled to load test accounts, data and text formatting. Changing this requires a server restart before taking effect.",
+  "admin.service.testingTitle": "Enable Testing Commands: ",
+  "admin.service.webSessionDays": "Session length for email and LDAP authentication (days):",
+  "admin.service.webSessionDaysDesc": "Email or LDAP sessions will expire after the number of days specified and will require users to sign in again.",
   "admin.service.webhooksDescription": "When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag.",
   "admin.service.webhooksTitle": "Enable Incoming Webhooks: ",
   "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
@@ -501,20 +502,20 @@
   "admin.sidebar.publicLinks": "Public Links",
   "admin.sidebar.push": "Mobile Push",
   "admin.sidebar.rateLimiting": "Rate Limiting",
-  "admin.sidebar.reports": "SITE REPORTS",
+  "admin.sidebar.reports": "REPORTING",
   "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.security": "Security",
   "admin.sidebar.sessions": "Sessions",
   "admin.sidebar.settings": "SETTINGS",
   "admin.sidebar.signUp": "Sign Up",
   "admin.sidebar.sign_up": "Sign Up",
-  "admin.sidebar.statistics": "Statistics",
+  "admin.sidebar.statistics": "Team Statistics",
   "admin.sidebar.storage": "Storage",
   "admin.sidebar.support": "Legal and Support",
   "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "Users",
   "admin.sidebar.usersAndTeams": "Users and Teams",
-  "admin.sidebar.view_statistics": "View Statistics",
+  "admin.sidebar.view_statistics": "Site Statistics",
   "admin.sidebar.webhooks": "Webhooks and Commands",
   "admin.sidebarHeader.systemConsole": "System Console",
   "admin.sql.dataSource": "Data Source:",
@@ -537,7 +538,7 @@
   "admin.support.aboutDesc": "Link to About page for more information on your Mattermost deployment, for example its purpose and audience within your organization. Defaults to Mattermost information page.",
   "admin.support.aboutTitle": "About link:",
   "admin.support.emailHelp": "Email address displayed on email notifications and during tutorial for end users to ask support questions.",
-  "admin.support.emailTitle": "Support email:",
+  "admin.support.emailTitle": "Support Email:",
   "admin.support.helpDesc": "Link to help documentation from team site main menu. Typically not changed unless your organization chooses to create custom documentation.",
   "admin.support.helpTitle": "Help link:",
   "admin.support.noteDescription": "If linking to an external site, URLs should begin with http:// or https://.",
@@ -571,7 +572,7 @@
   "admin.team.restrictExample": "Ex \"corp.mattermost.com, mattermost.org\"",
   "admin.team.restrictNameDesc": "When true, You cannot create a team name with reserved words like www, admin, support, test, channel, etc",
   "admin.team.restrictNameTitle": "Restrict Team Names: ",
-  "admin.team.restrictTitle": "Restrict Creation To Domains:",
+  "admin.team.restrictTitle": "Restrict account creation to specified email domains:",
   "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
   "admin.team.restrict_direct_message_team": "Any member of the team",
   "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
@@ -584,7 +585,7 @@
   "admin.team.uploaded": "Uploaded!",
   "admin.team.uploading": "Uploading..",
   "admin.team.userCreationDescription": "When false, the ability to create accounts is disabled. The create account button displays error when pressed.",
-  "admin.team.userCreationTitle": "Enable User Creation: ",
+  "admin.team.userCreationTitle": "Enable Account Creation: ",
   "admin.team_analytics.activeUsers": "Active Users With Posts",
   "admin.team_analytics.totalPosts": "Total Posts",
   "admin.true": "true",