Merge pull request #2181 from mattermost/plt-1707

PLT-1707 Added help text to sso switching and removed redundant divs
Этот коммит содержится в:
Christopher Speller
2016-02-17 22:25:30 -05:00
родитель 3ef0f5ad37 e3ab89e1c4
Коммит 344f2d2d98
4 изменённых файлов: 119 добавлений и 117 удалений

Просмотреть файл

@@ -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"
}
}