UI text upgrades (#3375)

* Clarifying auth user join button

* Update team_general_tab.jsx

* Update generated_setting.jsx

* Update public_link_settings.jsx

* Update signup_settings.jsx

* Update login_settings.jsx

* Update team_general_tab.jsx

* Update en.json

* Clarifying help text

* Clarifying help text

6 files changed, 16 insertions, 16 deletions

diff --git a/webapp/components/admin_console/generated_setting.jsx b/webapp/components/admin_console/generated_setting.jsx
index cb12fcd3d..ba6c5924b 100644
--- a/webapp/components/admin_console/generated_setting.jsx
+++ b/webapp/components/admin_console/generated_setting.jsx
@@ -28,7 +28,7 @@ export default class GeneratedSetting extends React.Component {
             regenerateText: (
                 <FormattedMessage
                     id='admin.regenerate'
-                    defaultMessage='Re-Generate'
+                    defaultMessage='Regenerate'
                 />
             )
         };
diff --git a/webapp/components/admin_console/login_settings.jsx b/webapp/components/admin_console/login_settings.jsx
index 1937c20fc..0ac81bc33 100644
--- a/webapp/components/admin_console/login_settings.jsx
+++ b/webapp/components/admin_console/login_settings.jsx
@@ -85,7 +85,7 @@ export default class LoginSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.email.passwordSaltDescription'
-                            defaultMessage='32-character salt added to signing of password reset emails. Randomly generated on install. Click "Re-Generate" to create new salt.'
+                            defaultMessage='32-character salt added to signing of password reset emails. Randomly generated on install. Click "Regenerate" to create new salt.'
                         />
                     }
                     value={this.state.passwordResetSalt}
@@ -120,4 +120,4 @@ export default class LoginSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ 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 97f841c23..823eba05a 100644
--- a/webapp/components/admin_console/public_link_settings.jsx
+++ b/webapp/components/admin_console/public_link_settings.jsx
@@ -72,7 +72,7 @@ export default class PublicLinkSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.image.publicLinkDescription'
-                            defaultMessage='32-character salt added to signing of public image links. Randomly generated on install. Click "Re-Generate" to create new salt.'
+                            defaultMessage='32-character salt added to signing of public image links. Randomly generated on install. Click "Regenerate" to create new salt.'
                         />
                     }
                     value={this.state.publicLinkSalt}
@@ -81,4 +81,4 @@ export default class PublicLinkSettings 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 de7c0f20e..9f9e18644 100644
--- a/webapp/components/admin_console/signup_settings.jsx
+++ b/webapp/components/admin_console/signup_settings.jsx
@@ -81,7 +81,7 @@ export default class SignupSettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.email.inviteSaltDescription'
-                            defaultMessage='32-character salt added to signing of email invites. Randomly generated on install. Click "Re-Generate" to create new salt.'
+                            defaultMessage='32-character salt added to signing of email invites. Randomly generated on install. Click "Regenerate" to create new salt.'
                         />
                     }
                     value={this.state.inviteSalt}
@@ -114,4 +114,4 @@ export default class SignupSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/components/team_general_tab.jsx b/webapp/components/team_general_tab.jsx
index 242e1f15c..2814119c6 100644
--- a/webapp/components/team_general_tab.jsx
+++ b/webapp/components/team_general_tab.jsx
@@ -42,7 +42,7 @@ const holders = defineMessages({
     },
     openInviteTitle: {
         id: 'general_tab.openInviteTitle',
-        defaultMessage: 'Allow anyone to join this team'
+        defaultMessage: 'Allow any user with an account on this server to join this team'
     },
     codeTitle: {
         id: 'general_tab.codeTitle',
@@ -371,7 +371,7 @@ class GeneralTab extends React.Component {
                                 >
                                     <FormattedMessage
                                         id='general_tab.regenerate'
-                                        defaultMessage='Re-Generate'
+                                        defaultMessage='Regenerate'
                                     />
                                 </a>
                             </div>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index fcaf3e9e6..fd35e3fac 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -150,7 +150,7 @@
   "admin.email.emailSuccess": "No errors were reported while sending an email.  Please check your inbox to make sure.",
   "admin.email.fullPushNotification": "Send full message snippet",
   "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 \"Re-Generate\" to create new salt.",
+  "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.mhpns": "Use encrypted, production-quality HPNS connection to iOS and Android apps",
@@ -168,7 +168,7 @@
   "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.passwordSaltDescription": "32-character salt added to signing of password reset emails. Randomly generated on install. Click \"Re-Generate\" to create new salt.",
+  "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:",
   "admin.email.pushContentDesc": "Selecting \"Send generic description with user and channel names\" provides push notifications with generic messages, including names of users and channels but no specific details from the message text.<br /><br />Selecting \"Send full message snippet\" sends excerpts from messages triggering notifications with specifics and may include confidential information sent in messages. If your Push Notification Service is outside your firewall, it is HIGHLY RECOMMENDED this option only be used with an \"https\" protocol to encrypt the connection.",
@@ -257,7 +257,7 @@
   "admin.image.profileWidthDescription": "Width of profile picture.",
   "admin.image.profileWidthExample": "Ex \"1024\"",
   "admin.image.profileWidthTitle": "Profile Width:",
-  "admin.image.publicLinkDescription": "32-character salt added to signing of public image links. Randomly generated on install. Click \"Re-Generate\" to create new salt.",
+  "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.",
@@ -387,7 +387,7 @@
   "admin.recycle.button": "Recycle Database Connections",
   "admin.recycle.loading": " Recycling...",
   "admin.recycle.reloadFail": "Recycling unsuccessful: {error}",
-  "admin.regenerate": "Re-Generate",
+  "admin.regenerate": "Regenerate",
   "admin.reload.button": "Reload Configuration From Disk",
   "admin.reload.loading": " Loading...",
   "admin.reload.reloadFail": "Reloading unsuccessful: {error}",
@@ -517,7 +517,7 @@
   "admin.sql.replicas": "Data Source Replicas:",
   "admin.sql.traceDescription": "(Development Mode) When true, executing SQL statements are written to the log.",
   "admin.sql.traceTitle": "Trace: ",
-  "admin.sql.warning": "Warning: re-generating this salt may cause some columns in the database to return empty results.",
+  "admin.sql.warning": "Warning: regenerating this salt may cause some columns in the database to return empty results.",
   "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.",
@@ -931,8 +931,8 @@
   "general_tab.includeDirTitle": "Include this team in the Team Directory",
   "general_tab.no": "No",
   "general_tab.openInviteDesc": "When allowed, a link to this team will be included on the landing page allowing anyone with an account to join this team.",
-  "general_tab.openInviteTitle": "Allow anyone to join this team",
-  "general_tab.regenerate": "Re-Generate",
+  "general_tab.openInviteTitle": "Allow any user with an account on this server to join this team",
+  "general_tab.regenerate": "Regenerate",
   "general_tab.required": "This field is required",
   "general_tab.teamName": "Team Name",
   "general_tab.teamNameInfo": "Set the name of the team as it appears on your sign-in screen and at the top of the left-hand sidebar.",