diff options
Diffstat (limited to 'webapp/i18n')
| -rwxr-xr-x | webapp/i18n/en.json | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index dd0237769..1bea0e0f5 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -587,7 +587,7 @@ "admin.log.locationPlaceholder": "Enter your file location", "admin.log.locationTitle": "File Log Directory:", "admin.log.logSettings": "Log Settings", - "admin.logs.bannerDesc": "To look up users by User ID, go to Reporting > Users and paste the ID into the search filter.", + "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.", "admin.logs.reload": "Reload", "admin.logs.title": "Server Logs", "admin.manage_roles.additionalRoles": "Select additional permissions for the account. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Read more about roles and permissions</a>.", @@ -805,6 +805,9 @@ "admin.service.iconTitle": "Enable integrations to override profile picture icons:", "admin.service.insecureTlsDesc": "When true, any outgoing HTTPS requests will accept unverified, self-signed certificates. For example, outgoing webhooks to a server with a self-signed TLS certificate, using any domain, will be allowed. Note that this makes these connections susceptible to man-in-the-middle attacks.", "admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ", + "admin.service.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.", + "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ", + "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28", "admin.service.integrationAdmin": "Restrict managing integrations to Admins:", "admin.service.integrationAdminDesc": "When true, webhooks and slash commands can only be created, edited and viewed by Team and System Admins, and OAuth 2.0 applications by System Admins. Integrations are available to all users after they have been created by the Admin.", "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:", @@ -841,7 +844,7 @@ "admin.service.useLetsEncrypt": "Use Let's Encrypt:", "admin.service.useLetsEncryptDescription": "Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.", "admin.service.userAccessTokensDescLabel": "Name: ", - "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens, go to the <strong>System Console > Users</strong> page.", + "admin.service.userAccessTokensDescription": "When true, users can create <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a> for integrations in <strong>Account Settings > Security</strong>. They can be used to authenticate against the API and give full access to the account.<br/><br/>To manage who can create personal access tokens or to search users by token ID, go to the <strong>System Console > Users</strong> page.", "admin.service.userAccessTokensIdLabel": "Token ID: ", "admin.service.userAccessTokensTitle": "Enable Personal Access Tokens: ", "admin.service.webSessionDays": "Session length AD/LDAP and email (days):", @@ -1761,7 +1764,7 @@ "member_list.noUsersAdd": "No users to add.", "members_popover.manageMembers": "Manage Members", "members_popover.msg": "Message", - "members_popover.title": "Members", + "members_popover.title": "Channel Members", "members_popover.viewMembers": "View Members", "mfa.confirm.complete": "<strong>Set up complete!</strong>", "mfa.confirm.okay": "Okay", |