diff options
Diffstat (limited to 'webapp/components')
5 files changed, 9 insertions, 9 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> |