diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-17 22:25:30 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-17 22:25:30 -0500 |
| commit | 344f2d2d989c96a470e9f74f447b46df777c3859 (patch) | |
| tree | a28455c25902c594d2ee6e82db3c942e30a48286 /web/static/i18n | |
| parent | 3ef0f5ad37efbbbf6f6907b0b47fb8d8cffbbc6a (diff) | |
| parent | e3ab89e1c47b9228f3a914a994e1244d1e61d93b (diff) | |
| download | chat-344f2d2d989c96a470e9f74f447b46df777c3859.tar.gz chat-344f2d2d989c96a470e9f74f447b46df777c3859.tar.bz2 chat-344f2d2d989c96a470e9f74f447b46df777c3859.zip | |
Merge pull request #2181 from mattermost/plt-1707
PLT-1707 Added help text to sso switching and removed redundant divs
Diffstat (limited to 'web/static/i18n')
| -rw-r--r-- | web/static/i18n/en.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index b086b56e5..ec5ef599c 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -553,6 +553,7 @@ "claim.email_to_sso.pwd": "Password", "claim.email_to_sso.title": "Switch Email/Password Account to {uiType}", "claim.email_to_sso.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO", + "claim.email_to_sso.ssoNote": "You must already have a valid {type} account", "claim.email_to_sso.enterPwd": "Enter the password for your {team} {site} account", "claim.email_to_sso.switchTo": "Switch account to {uiType}", "claim.sso_to_email.enterPwd": "Please enter a password.", @@ -1274,4 +1275,4 @@ "intro_messages.beginning": "Beginning of {name}", "intro_messages.invite": "Invite others to this {type}", "intro_messages.setHeader": "Set a Header" -}
\ No newline at end of file +} |