From d4e88fde217bbb0891317d445ca7c243a63ab268 Mon Sep 17 00:00:00 2001 From: lfbrock Date: Fri, 6 Jan 2017 09:10:27 -0500 Subject: Update MFA help text documentation link (#4975) * Update mfa help text with documentation link * Update en.json --- webapp/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 746a0c634..66a58e0c5 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -675,7 +675,7 @@ "admin.service.developerDesc": "When true, JavaScript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ", "admin.service.developerTitle": "Enable Developer Mode: ", "admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:", - "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.

It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.

Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.", + "admin.service.enforceMfaDesc": "When true, users on the system will be required to set up multi-factor authentication. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.

It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.

Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.", "admin.service.forward80To443": "Forward port 80 to 443:", "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443", "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a Google Developers Tutorial for instructions on how to obtain a key.", -- cgit v1.2.3-1-g7c22 From f6672605e82919798eb23ec45d8e663351af7d97 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 9 Jan 2017 09:26:07 -0500 Subject: Reorganize stats on system statistics page (#5007) --- webapp/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 66a58e0c5..416b268de 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -922,7 +922,7 @@ "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 https://docs.mattermost.com/administration/statistics.html for more details.", + "analytics.system.skippedIntensiveQueries": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: https://docs.mattermost.com/administration/statistics.html", "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 commercial@mattermost.com.", "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com.", -- cgit v1.2.3-1-g7c22 From e938b71e60eda12b779fc06fee9aaaea43eb551b Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 9 Jan 2017 11:41:09 -0500 Subject: SAML help text improvement (#5003) --- webapp/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 416b268de..41c4d680a 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -597,7 +597,7 @@ "admin.saml.assertionConsumerServiceURLDesc": "Enter https:///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:///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: https://docs.mattermost.com/deployment/sso-saml.html", "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:", -- cgit v1.2.3-1-g7c22 From 189a745030871d013883f9ae66b7cb556d85bf24 Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 10 Jan 2017 14:25:20 -0300 Subject: translations PR 20170110 (#5031) * translations PR 20170110 * Demoting Dutch from beta to alpha --- webapp/i18n/en.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 41c4d680a..c2ec7a4e9 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -312,20 +312,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 Invite New Member to invite new users by email, or the Get Team Invite Link options from the Main Menu. If Get Team Invite Link is used to share a link, you can expire the invite code from Team Settings > Invite Code after the desired users join the team.", "admin.general.policy.teamInviteTitle": "Enable sending team invites from:", "admin.general.privacy": "Privacy", @@ -922,13 +922,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": "To maximize performance, some statistics are disabled. You can re-enable them in config.json. See: https://docs.mattermost.com/administration/statistics.html", "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 commercial@mattermost.com.", "analytics.system.expiringBanner": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com.", "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: https://docs.mattermost.com/administration/statistics.html", "analytics.system.textPosts": "Posts with Text-only", "analytics.system.title": "System Statistics", "analytics.system.totalChannels": "Total Channels", -- cgit v1.2.3-1-g7c22