From 3ec92b8c60c8884f2e093dd77ab6f4760affe25f Mon Sep 17 00:00:00 2001
From: it33 <it33@users.noreply.github.com>
Date: Mon, 27 Jun 2016 08:10:02 -0400
Subject: 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
---
 webapp/components/admin_console/login_settings.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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
+}
-- 
cgit v1.2.3-1-g7c22