From 42e74b509dc8a1be7798c030b1ad80f6c2755a73 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Tue, 2 Aug 2016 04:12:52 -0800 Subject: PLT-3691 tweaking sytem console text (#3712) --- webapp/i18n/en.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'webapp/i18n') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index c9f235d2a..1ca9ebd6d 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -578,8 +578,8 @@ "admin.service.listenExample": "Ex \":8065\"", "admin.service.mfaDesc": "When true, users will be given the option to add multi-factor authentication to their account. They will need a smartphone and an authenticator app such as Google Authenticator.", "admin.service.mfaTitle": "Enable Multi-factor Authentication:", - "admin.service.mobileSessionDays": "Session length for mobile apps (days):", - "admin.service.mobileSessionDaysDesc": "Mobile sessions will expire after the number of days specified and will require users to sign in again.", + "admin.service.mobileSessionDays": "Session length mobile (days):", + "admin.service.mobileSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.", "admin.service.outWebhooksDesc": "When true, outgoing webhooks will be allowed. See documentation to learn more.", "admin.service.outWebhooksTitle": "Enable Outgoing Webhooks: ", "admin.service.overrideDescription": "When true, webhooks and slash commands will be allowed to change the username they are posting as. Note, combined with allowing icon overriding, this could open users up to phishing attacks.", @@ -592,12 +592,12 @@ "admin.service.sessionCache": "Session Cache (minutes):", "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.", "admin.service.sessionDaysEx": "Ex \"30\"", - "admin.service.ssoSessionDays": "Session length for GitLab SSO authentication (days):", - "admin.service.ssoSessionDaysDesc": "GitLab single-sign-on sessions will expire after the number of days specified and will require users to sign in again.", + "admin.service.ssoSessionDays": "Session length SSO (days):", + "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.", "admin.service.testingDescription": "When true, /loadtest slash command is enabled to load test accounts, data and text formatting. Changing this requires a server restart before taking effect.", "admin.service.testingTitle": "Enable Testing Commands: ", - "admin.service.webSessionDays": "Session length for email and LDAP authentication (days):", - "admin.service.webSessionDaysDesc": "Email or LDAP sessions will expire after the number of days specified and will require users to sign in again.", + "admin.service.webSessionDays": "Session length LDAP and email (days):", + "admin.service.webSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. After changing this setting, the new session length will take effect after the next time the user enters their credentials.", "admin.service.webhooksDescription": "When true, incoming webhooks will be allowed. To help combat phishing attacks, all posts from webhooks will be labelled by a BOT tag. See documentation to learn more.", "admin.service.webhooksTitle": "Enable Incoming Webhooks: ", "admin.sidebar.addTeamSidebar": "Add team from sidebar menu", -- cgit v1.2.3-1-g7c22