Adding TLS options to LDAP

1 files changed, 11 insertions, 9 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 7914fd1c7..12671284a 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -124,14 +124,14 @@
   "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.connectionSecurityNone": "None",
-  "admin.email.connectionSecurityNoneDescription": "Mattermost will send email over an unsecure connection.",
-  "admin.email.connectionSecurityStart": "STARTTLS",
-  "admin.email.connectionSecurityStartDescription": "Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.",
-  "admin.email.connectionSecurityTest": "Test Connection",
-  "admin.email.connectionSecurityTitle": "Connection Security:",
-  "admin.email.connectionSecurityTls": "TLS (Recommended)",
-  "admin.email.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your email server.",
+  "admin.connectionSecurityNone": "None",
+  "admin.connectionSecurityNoneDescription": "Mattermost will connect over an unsecure connection.",
+  "admin.connectionSecurityStart": "STARTTLS",
+  "admin.connectionSecurityStartDescription": "Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.",
+  "admin.connectionSecurityTest": "Test Connection",
+  "admin.connectionSecurityTitle": "Connection Security:",
+  "admin.connectionSecurityTls": "TLS",
+  "admin.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your server.",
   "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.",
@@ -279,6 +279,8 @@
   "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.",
@@ -1423,4 +1425,4 @@
   "web.footer.terms": "Terms",
   "web.header.back": "Back",
   "web.root.singup_info": "All team communication in one place, searchable and accessible anywhere"
-}
\ No newline at end of file
+}