summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/login_settings.jsx
diff options
context:
space:
mode:
authorit33 <it33@users.noreply.github.com>2016-06-27 08:10:02 -0400
committerChristopher Speller <crspeller@gmail.com>2016-06-27 08:10:02 -0400
commit3ec92b8c60c8884f2e093dd77ab6f4760affe25f (patch)
tree40e30169c14b93d9f560e8be5c619ce3d078b10a /webapp/components/admin_console/login_settings.jsx
parent5c70635bcd60f9082e7f69e27e7d45dcb4143c1b (diff)
downloadchat-3ec92b8c60c8884f2e093dd77ab6f4760affe25f.tar.gz
chat-3ec92b8c60c8884f2e093dd77ab6f4760affe25f.tar.bz2
chat-3ec92b8c60c8884f2e093dd77ab6f4760affe25f.zip
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
Diffstat (limited to 'webapp/components/admin_console/login_settings.jsx')
-rw-r--r--webapp/components/admin_console/login_settings.jsx4
1 files changed, 2 insertions, 2 deletions
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
+}