summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json10
1 files changed, 5 insertions, 5 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index a90d2949a..45afbd184 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -413,6 +413,7 @@
"admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost.",
"admin.ldap.lastnameAttrEx": "Ex \"sn\"",
"admin.ldap.lastnameAttrTitle": "Last Name Attribute:",
+ "admin.ldap.ldap_test_button": "AD/LDAP Test",
"admin.ldap.loginNameDesc": "The placeholder text that appears in the login field on the login page. Defaults to \"AD/LDAP Username\".",
"admin.ldap.loginNameEx": "Ex \"AD/LDAP Username\"",
"admin.ldap.loginNameTitle": "Login Field Name:",
@@ -440,9 +441,8 @@
"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.testSuccess": "AD/LDAP Test Successful",
"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)\"",
@@ -463,10 +463,10 @@
"admin.license.uploading": "Uploading License...",
"admin.log.consoleDescription": "Typically set to false in production. Developers may set this field to true to output log messages to console based on the console level option. If true, server writes messages to the standard output stream (stdout).",
"admin.log.consoleTitle": "Output logs to console: ",
- "admin.log.enableWebhookDebugging": "Enable Webhook Debugging:",
- "admin.log.enableWebhookDebuggingDescription": "You can set this to false to disable the debug logging of all incoming webhook request bodies.",
"admin.log.enableDiagnostics": "Enable Diagnostics and Error Reporting:",
"admin.log.enableDiagnosticsDescription": "Enable this feature to improve the quality and performance of Mattermost by sending error reporting and diagnostic information to Mattermost, Inc. Read our <a href=\"https://about.mattermost.com/default-privacy-policy/\" target=\"_blank\">privacy policy</a> to learn more.",
+ "admin.log.enableWebhookDebugging": "Enable Webhook Debugging:",
+ "admin.log.enableWebhookDebuggingDescription": "You can set this to false to disable the debug logging of all incoming webhook request bodies.",
"admin.log.fileDescription": "Typically set to true in production. When true, log files are written to the log file specified in file location field below.",
"admin.log.fileLevelDescription": "This setting determines the level of detail at which log events are written to the log file. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialization. DEBUG: Prints high detail for developers working on debugging issues.",
"admin.log.fileLevelTitle": "File Log Level:",
@@ -1349,7 +1349,6 @@
"installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
"installed_outgoing_webhooks.unknown_channel": "A Private Webhook",
"integrations.add": "Add",
- "integrations.successful": "Setup Successful",
"integrations.command.description": "Slash commands send events to external integrations",
"integrations.command.title": "Slash Command",
"integrations.done": "Done",
@@ -1360,6 +1359,7 @@
"integrations.oauthApps.title": "OAuth 2.0 Applications",
"integrations.outgoingWebhook.description": "Outgoing webhooks allow external integrations to receive and respond to messages",
"integrations.outgoingWebhook.title": "Outgoing Webhook",
+ "integrations.successful": "Setup Successful",
"intro_messages.DM": "This is the start of your direct message history with {teammate}.<br />Direct messages and files shared here are not shown to people outside this area.",
"intro_messages.anyMember": " Any member can join and read this channel.",
"intro_messages.beginning": "Beginning of {name}",