diff options
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r-- | webapp/i18n/en.json | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index b66b079e7..7914fd1c7 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -39,8 +39,8 @@ "add_command.displayName": "Display Name", "add_command.header": "Add Slash Command", "add_command.iconUrl": "Response Icon", - "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png", "add_command.iconUrl.help": "Choose a profile picture override for the post responses to this slash command. Enter the URL of a .png or .jpg file at least 128 pixels by 128 pixels.", + "add_command.iconUrl.placeholder": "https://www.example.com/myicon.png", "add_command.method": "Request Method", "add_command.method.get": "GET", "add_command.method.help": "The type of command request issued to the Request URL.", @@ -50,13 +50,13 @@ "add_command.trigger.help2": "Reserved: /echo, /join, /logout, /me, /shrug", "add_command.trigger.placeholder": "Command trigger e.g. \"hello\" not including the slash", "add_command.triggerRequired": "A trigger word is required", - "add_command.username": "Response Username", - "add_command.username.help": "Choose a username override for responses for this slash command. Usernames can consist of up to 22 characters consisting of lowercase letters, numbers and they symbols \"-\", \"_\", and \".\" .", - "add_command.username.placeholder": "Username", "add_command.url": "Request URL", "add_command.url.help": "The callback URL to receive the HTTP POST or GET event request when the slash command is run.", "add_command.url.placeholder": "Must start with http:// or https://", "add_command.urlRequired": "A request URL is required", + "add_command.username": "Response Username", + "add_command.username.help": "Choose a username override for responses for this slash command. Usernames can consist of up to 22 characters consisting of lowercase letters, numbers and they symbols \"-\", \"_\", and \".\" .", + "add_command.username.placeholder": "Username", "add_incoming_webhook.cancel": "Cancel", "add_incoming_webhook.channel": "Channel", "add_incoming_webhook.channelRequired": "A valid channel is required", @@ -64,9 +64,9 @@ "add_incoming_webhook.header": "Add Incoming Webhook", "add_incoming_webhook.name": "Name", "add_incoming_webhook.save": "Save", - "add_integration.header": "Add Integration", "add_integration.command.description": "Create slash commands to send events to external integrations and receive a response.", "add_integration.command.title": "Slash Command", + "add_integration.header": "Add Integration", "add_integration.incomingWebhook.description": "Create webhook URLs for use in external integrations.", "add_integration.incomingWebhook.title": "Incoming Webhook", "add_integration.outgoingWebhook.description": "Create webhooks to send new message events to an external integration.", @@ -289,6 +289,9 @@ "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.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", @@ -620,7 +623,7 @@ "backstage_navbar.backToMattermost": "Back to {siteName}", "backstage_sidebar.integrations": "Integrations", "backstage_sidebar.integrations.add": "Add Integration", - "backstage_sidebar.integrations.add.command": "Outgoing Webhook", + "backstage_sidebar.integrations.add.command": "Slash Command", "backstage_sidebar.integrations.add.incomingWebhook": "Incoming Webhook", "backstage_sidebar.integrations.add.outgoingWebhook": "Outgoing Webhook", "backstage_sidebar.integrations.installed": "Installed Integrations", @@ -847,11 +850,11 @@ "get_team_invite_link_modal.title": "Team Invite Link", "installed_integrations.add": "Add Integration", "installed_integrations.allFilter": "All ({count})", + "installed_integrations.commandType": "(Slash Command)", + "installed_integrations.commandsFilter": "Slash Commands ({count})", "installed_integrations.creation": "Created by {creator} on {createAt, date, full}", "installed_integrations.delete": "Delete", "installed_integrations.header": "Installed Integrations", - "installed_integrations.commandType": "(Slash Command)", - "installed_integrations.commandsFilter": "Slash Commands ({count})", "installed_integrations.incomingWebhookType": "(Incoming Webhook)", "installed_integrations.incomingWebhooksFilter": "Incoming Webhooks ({count})", "installed_integrations.outgoingWebhookType": "(Outgoing Webhook)", @@ -1420,4 +1423,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 |