diff options
| author | Jason Blais <jason@spinpunch.com> | 2016-09-08 08:48:12 -0400 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-09-08 09:48:12 -0300 |
| commit | b6ed10a31ecf16f7a0cf594db6b5a10e983e2db9 (patch) | |
| tree | 08b289a5241827df4c6eebf7c23d1e2f2de4d218 /webapp/i18n | |
| parent | ba2e131804cb28c9ae133aaafe24187243f6e2f3 (diff) | |
| download | chat-b6ed10a31ecf16f7a0cf594db6b5a10e983e2db9.tar.gz chat-b6ed10a31ecf16f7a0cf594db6b5a10e983e2db9.tar.bz2 chat-b6ed10a31ecf16f7a0cf594db6b5a10e983e2db9.zip | |
PLT-3766 Change remaining LDAP references to AD/LDAP (#3985)
* Update user.go
* Update en.json
* Update ldap_test_button.jsx
* Update en.json
Diffstat (limited to 'webapp/i18n')
| -rw-r--r-- | webapp/i18n/en.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index e50c709f0..a90d2949a 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -417,7 +417,7 @@ "admin.ldap.loginNameEx": "Ex \"AD/LDAP Username\"", "admin.ldap.loginNameTitle": "Login Field Name:", "admin.ldap.maxPageSizeEx": "Ex \"2000\"", - "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.", + "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the AD/LDAP server at one time. 0 is unlimited.", "admin.ldap.maxPageSizeTitle": "Maximum Page Size:", "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost.", "admin.ldap.nicknameAttrEx": "Ex \"nickname\"", @@ -440,7 +440,9 @@ "admin.ldap.syncNowHelpText": "Initiates an AD/LDAP synchronization immediately.", "admin.ldap.sync_button": "AD/LDAP Synchronize Now", "admin.ldap.testFailure": "AD/LDAP Test Failure: {error}", + "admin.ldap.testSuccess": "AD/LDAP Test Successful", "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.", + "admin.ldap.ldap_test_button": "AD/LDAP Test", "admin.ldap.uernameAttrDesc": "The attribute in the AD/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": "(Optional) Enter an AD/LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).", "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"", |