diff options
| author | Jason Blais <jason@spinpunch.com> | 2017-08-18 15:02:06 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-08-18 12:02:06 -0700 |
| commit | 26ec8ffc3edc01fde2189f3465112c88fee5435b (patch) | |
| tree | 53908e19b579931d0307cbf5df567636b8438f9e /webapp/i18n | |
| parent | f40f41ed536edb76c9873c0cdd5dc8685b0f950f (diff) | |
| download | chat-26ec8ffc3edc01fde2189f3465112c88fee5435b.tar.gz chat-26ec8ffc3edc01fde2189f3465112c88fee5435b.tar.bz2 chat-26ec8ffc3edc01fde2189f3465112c88fee5435b.zip | |
Rename SAML in the System Console to SAML 2.0 + access token string fixes (#7182)
* Update en.json
* Update en.json
* Update admin_sidebar.jsx
* Update saml_settings.jsx
Diffstat (limited to 'webapp/i18n')
| -rwxr-xr-x | webapp/i18n/en.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 00593e38d..3e07518c5 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -146,7 +146,7 @@ "admin.authentication.gitlab": "GitLab", "admin.authentication.ldap": "AD/LDAP", "admin.authentication.oauth": "OAuth 2.0", - "admin.authentication.saml": "SAML", + "admin.authentication.saml": "SAML 2.0", "admin.banner.heading": "Note:", "admin.cluster.enableDescription": "When true, Mattermost will run in High Availability mode. Please see <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>documentation</a> to learn more about configuring High Availability for Mattermost.", "admin.cluster.enableTitle": "Enable High Availability Mode:", @@ -719,8 +719,8 @@ "admin.saml.emailAttrDesc": "The attribute in the SAML Assertion that will be used to populate the email addresses of users in Mattermost.", "admin.saml.emailAttrEx": "E.g.: \"Email\" or \"PrimaryEmail\"", "admin.saml.emailAttrTitle": "Email Attribute:", - "admin.saml.enableDescription": "When true, Mattermost allows login using SAML. Please see <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> to learn more about configuring SAML for Mattermost.", - "admin.saml.enableTitle": "Enable Login With SAML:", + "admin.saml.enableDescription": "When true, Mattermost allows login using SAML 2.0. Please see <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> to learn more about configuring SAML for Mattermost.", + "admin.saml.enableTitle": "Enable Login With SAML 2.0:", "admin.saml.encryptDescription": "When false, Mattermost will not decrypt SAML Assertions encrypted with your Service Provider Public Certificate. Not recommended for production environments. For testing only.", "admin.saml.encryptTitle": "Enable Encryption:", "admin.saml.firstnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the first name of users in Mattermost.", @@ -895,7 +895,7 @@ "admin.sidebar.push": "Mobile Push", "admin.sidebar.rateLimiting": "Rate Limiting", "admin.sidebar.reports": "REPORTING", - "admin.sidebar.saml": "SAML", + "admin.sidebar.saml": "SAML 2.0", "admin.sidebar.security": "Security", "admin.sidebar.sessions": "Sessions", "admin.sidebar.settings": "SETTINGS", |