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

i18n/en.json

@@ -2357,15 +2357,15 @@
   },
   {
     "id": "api.templates.user_access_token_body.info",
-    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
   {
     "id": "api.templates.user_access_token_body.title",
-    "translation": "User access token added to your account"
+    "translation": "Personal access token added to your account"
   },
   {
     "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] User access token added to your account"
+    "translation": "[{{ .SiteName }}] Personal access token added to your account"
   },
   {
     "id": "api.templates.username_change_body.info",
@@ -2689,7 +2689,7 @@
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML is not configured or supported on this server."
+    "translation": "SAML 2.0 is not configured or supported on this server."
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
@@ -2725,7 +2725,7 @@
   },
   {
     "id": "api.user.send_user_access_token.error",
-    "translation": "Failed to send user access token added email successfully"
+    "translation": "Failed to send personal access token added email successfully"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
@@ -3921,7 +3921,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML is not configured or supported on this server."
+    "translation": "SAML 2.0 is not configured or supported on this server."
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",

webapp/components/admin_console/admin_sidebar.jsx

@@ -125,7 +125,7 @@ export default class AdminSidebar extends React.Component {
                         title={
                             <FormattedMessage
                                 id='admin.sidebar.saml'
-                                defaultMessage='SAML'
+                                defaultMessage='SAML 2.0'
                             />
                         }
                     />

webapp/components/admin_console/saml_settings.jsx

@@ -144,7 +144,7 @@ export default class SamlSettings extends AdminSettings {
         return (
             <FormattedMessage
                 id='admin.authentication.saml'
-                defaultMessage='SAML'
+                defaultMessage='SAML 2.0'
             />
         );
     }
@@ -318,13 +318,13 @@ export default class SamlSettings extends AdminSettings {
                     label={
                         <FormattedMessage
                             id='admin.saml.enableTitle'
-                            defaultMessage='Enable Login With SAML:'
+                            defaultMessage='Enable Login With SAML 2.0:'
                         />
                     }
                     helpText={
                         <FormattedHTMLMessage
                             id='admin.saml.enableDescription'
-                            defaultMessage='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.'
+                            defaultMessage='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.'
                         />
                     }
                     value={this.state.enable}

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.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:",
+  "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",