diff options
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r-- | webapp/i18n/en.json | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index fd8f44c36..75280c5e6 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -111,12 +111,6 @@ "admin.compliance_table.timestamp": "Timestamp", "admin.compliance_table.type": "Type", "admin.compliance_table.userId": "Requested By", - "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.", - "admin.email.allowEmailSignInTitle": "Allow 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 LDAP.", - "admin.email.allowSignupTitle": "Allow Sign Up 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.allowUsernameSignInTitle": "Allow Sign In With Username: ", "admin.connectionSecurityNone": "None", "admin.connectionSecurityNoneDescription": "Mattermost will connect over an unsecure connection.", "admin.connectionSecurityStart": "STARTTLS", @@ -125,6 +119,12 @@ "admin.connectionSecurityTitle": "Connection Security:", "admin.connectionSecurityTls": "TLS", "admin.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your server.", + "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.", + "admin.email.allowEmailSignInTitle": "Allow 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 LDAP.", + "admin.email.allowSignupTitle": "Allow Sign Up 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.allowUsernameSignInTitle": "Allow Sign In With Username: ", "admin.email.emailFail": "Connection unsuccessful: {error}", "admin.email.emailSettings": "Email Settings", "admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.", @@ -272,21 +272,21 @@ "admin.ldap.queryDesc": "The timeout value for queries to the LDAP server. Increase if you are getting timeout errors caused by a slow LDAP server.", "admin.ldap.queryEx": "Ex \"60\"", "admin.ldap.queryTitle": "Query Timeout (seconds):", - "admin.ldap.skipCertificateVerification": "Skip Vertificate Verification", - "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verificaiton step for TLS or STARTTLS connections. Not recommented for production enviroments where TLS is required. For testing only.", "admin.ldap.save": "Save", "admin.ldap.saving": "Saving Config...", "admin.ldap.serverDesc": "The domain or IP address of LDAP server.", "admin.ldap.serverEx": "Ex \"10.0.0.23\"", "admin.ldap.serverTitle": "LDAP Server:", + "admin.ldap.skipCertificateVerification": "Skip Vertificate Verification", + "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verificaiton step for TLS or STARTTLS connections. Not recommented for production enviroments where TLS is required. For testing only.", "admin.ldap.title": "LDAP Settings", "admin.ldap.true": "true", "admin.ldap.uernameAttrDesc": "The attribute in the LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.", + "admin.ldap.userFilterDisc": "LDAP Filter to use when searching for user objects.", + "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"", + "admin.ldap.userFilterTitle": "User Filter:", "admin.ldap.usernameAttrEx": "Ex \"sAMAccountName\"", "admin.ldap.usernameAttrTitle": "Username Attribute:", - "admin.ldap.userFilterTitle": "User Filter:", - "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"", - "admin.ldap.userFilterDisc": "LDAP Filter to use when searching for user objects.", "admin.licence.keyMigration": "If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href=\"http://mattermost.com\" target=\"_blank\">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.", "admin.license.choose": "Choose File", "admin.license.chooseFile": "Choose File", |