diff options
Diffstat (limited to 'webapp/i18n/en.json')
| -rwxr-xr-x | webapp/i18n/en.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 4a0f41a25..9f0980175 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -142,7 +142,7 @@ "admin.advance.metrics": "Performance Monitoring", "admin.audits.reload": "Reload User Activity Logs", "admin.audits.title": "User Activity Logs", - "admin.authentication.email": "Email Auth", + "admin.authentication.email": "Email Authentication", "admin.authentication.gitlab": "GitLab", "admin.authentication.ldap": "AD/LDAP", "admin.authentication.oauth": "OAuth 2.0", @@ -259,9 +259,9 @@ "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target='_blank'>Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target='_blank'>Privacy Policy</a>.", "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.", "admin.email.allowEmailSignInTitle": "Enable sign-in with email: ", - "admin.email.allowSignupDescription": "When true, Mattermost allows team creation and account signup using email and password. This value should be false only when you want to limit signup to a single sign-on service like OAuth or AD/LDAP.", + "admin.email.allowSignupDescription": "When true, Mattermost allows account creation using email and password. This value should be false only when you want to limit sign up to a single sign-on service like AD/LDAP, SAML or GitLab.", "admin.email.allowSignupTitle": "Enable account creation with email: ", - "admin.email.allowUsernameSignInDescription": "When true, Mattermost allows users to sign in using their username and password. This setting is typically only used when email verification is disabled.", + "admin.email.allowUsernameSignInDescription": "When true, users with email login can sign in using their username and password. This setting does not affect AD/LDAP login.", "admin.email.allowUsernameSignInTitle": "Enable sign-in with username: ", "admin.email.connectionSecurityTest": "Test Connection", "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target='_blank'>Enterprise App Store</a>.", |