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.json28
1 files changed, 14 insertions, 14 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index d18ce059a..37e2a645e 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -313,20 +313,20 @@
"admin.general.policy.permissionsAll": "All team members",
"admin.general.policy.permissionsAllChannel": "All channel members",
"admin.general.policy.permissionsSystemAdmin": "System Admins",
- "admin.general.policy.restrictPublicChannelCreationTitle": "Enable public channel creation for:",
- "admin.general.policy.restrictPublicChannelCreationDescription": "Set policy on who can create public channels.",
- "admin.general.policy.restrictPublicChannelManagementTitle": "Enable public channel renaming for:",
- "admin.general.policy.restrictPublicChannelManagementDescription": "Set policy on who can rename and set the header or purpose for public channels.",
- "admin.general.policy.restrictPublicChannelDeletionTitle": "Enable public channel deletion for:",
- "admin.general.policy.restrictPublicChannelDeletionDescription": "Set policy on who can delete public channels. Deleted channels can be recovered from the database using a {commandLineToolLink}.",
- "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "command line tool",
- "admin.general.policy.restrictPrivateChannelCreationTitle": "Enable private group creation for:",
"admin.general.policy.restrictPrivateChannelCreationDescription": "Set policy on who can create private groups.",
- "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group renaming for:",
- "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can rename and set the header or purpose for private groups.",
- "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private group deletion for:",
- "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private groups. Deleted groups can be recovered from the database using a {commandLineToolLink}.",
+ "admin.general.policy.restrictPrivateChannelCreationTitle": "Enable private group creation for:",
"admin.general.policy.restrictPrivateChannelDeletionCommandLineToolLink": "command line tool",
+ "admin.general.policy.restrictPrivateChannelDeletionDescription": "Set policy on who can delete private groups. Deleted groups can be recovered from the database using a {commandLineToolLink}.",
+ "admin.general.policy.restrictPrivateChannelDeletionTitle": "Enable private group deletion for:",
+ "admin.general.policy.restrictPrivateChannelManagementDescription": "Set policy on who can rename and set the header or purpose for private groups.",
+ "admin.general.policy.restrictPrivateChannelManagementTitle": "Enable private group renaming for:",
+ "admin.general.policy.restrictPublicChannelCreationDescription": "Set policy on who can create public channels.",
+ "admin.general.policy.restrictPublicChannelCreationTitle": "Enable public channel creation for:",
+ "admin.general.policy.restrictPublicChannelDeletionCommandLineToolLink": "command line tool",
+ "admin.general.policy.restrictPublicChannelDeletionDescription": "Set policy on who can delete public channels. Deleted channels can be recovered from the database using a {commandLineToolLink}.",
+ "admin.general.policy.restrictPublicChannelDeletionTitle": "Enable public channel deletion for:",
+ "admin.general.policy.restrictPublicChannelManagementDescription": "Set policy on who can rename and set the header or purpose for public channels.",
+ "admin.general.policy.restrictPublicChannelManagementTitle": "Enable public channel renaming for:",
"admin.general.policy.teamInviteDescription": "Set policy on who can invite others to a team using <b>Invite New Member</b> to invite new users by email, or the <b>Get Team Invite Link</b> options from the Main Menu. If <b>Get Team Invite Link</b> is used to share a link, you can expire the invite code from <b>Team Settings</b> > <b>Invite Code</b> after the desired users join the team.",
"admin.general.policy.teamInviteTitle": "Enable sending team invites from:",
"admin.general.privacy": "Privacy",
@@ -599,7 +599,7 @@
"admin.saml.assertionConsumerServiceURLDesc": "Enter https://<your-mattermost-url>/login/sso/saml. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. This field is also known as the Assertion Consumer Service URL.",
"admin.saml.assertionConsumerServiceURLEx": "E.g.: \"https://<your-mattermost-url>/login/sso/saml\"",
"admin.saml.assertionConsumerServiceURLTitle": "Service Provider Login URL:",
- "admin.saml.bannerDesc": "If a user attribute changes on the SAML server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from a SAML Identity Provider. Remote logout with SAML servers is considered in a future release.",
+ "admin.saml.bannerDesc": "User attributes in SAML server, including user deactivation or removal, are updated in Mattermost during user login. Learn more at: <a href=\"https://docs.mattermost.com/deployment/sso-saml.html\">https://docs.mattermost.com/deployment/sso-saml.html</a>",
"admin.saml.emailAttrDesc": "The attribute in the SAML Assertion that will be used to populate the email addresses of users in Mattermost.",
"admin.saml.emailAttrEx": "E.g.: \"Email\" or \"PrimaryEmail\"",
"admin.saml.emailAttrTitle": "Email Attribute:",
@@ -924,13 +924,13 @@
"analytics.chart.loading": "Loading...",
"analytics.chart.meaningful": "Not enough data for a meaningful representation.",
"analytics.system.activeUsers": "Active Users With Posts",
- "analytics.system.skippedIntensiveQueries": "Some statistics have been omitted because they put too much load on the system to calculate. See <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a> for more details.",
"analytics.system.channelTypes": "Channel Types",
"analytics.system.expiredBanner": "The Enterprise license expired on {date}. You have 15 days from this date to renew the license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
"analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact <a href='mailto:commercial@mattermost.com'>commercial@mattermost.com</a>.",
"analytics.system.postTypes": "Posts, Files and Hashtags",
"analytics.system.privateGroups": "Private Groups",
"analytics.system.publicChannels": "Public Channels",
+ "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: <a href='https://docs.mattermost.com/administration/statistics.html' target='_blank'>https://docs.mattermost.com/administration/statistics.html</a>",
"analytics.system.textPosts": "Posts with Text-only",
"analytics.system.title": "System Statistics",
"analytics.system.totalChannels": "Total Channels",