diff options
Diffstat (limited to 'webapp/i18n/en.json')
| -rw-r--r-- | webapp/i18n/en.json | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 3922f41bb..e51d9b43a 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -234,6 +234,10 @@ "admin.email.easHelp": "Learn more about compiling and deploying your own mobile apps from an <a href=\"http://docs.mattermost.com/deployment/push.html#enterprise-app-store-eas\" target=\"_blank\">Enterprise App Store</a>.", "admin.email.emailFail": "Connection unsuccessful: {error}", "admin.email.emailSuccess": "No errors were reported while sending an email. Please check your inbox to make sure.", + "admin.email.enableEmailBatching.clusterEnabled": "Email batching cannot be enabled when High Availability mode is enabled.", + "admin.email.enableEmailBatching.siteURL": "Email batching cannot be enabled unless the SiteURL is configured in <b>Configuration > SiteURL</b>.", + "admin.email.enableEmailBatchingTitle": "Enable Email Batching:", + "admin.email.enableEmailBatchingDesc": "When true, users can have email notifications for multiple direct messages and mentions combined into a single email, configurable in <b>Account Settings > Notifications</b>.", "admin.email.fullPushNotification": "Send full message snippet", "admin.email.genericPushNotification": "Send generic description with user and channel names", "admin.email.inviteSaltDescription": "32-character salt added to signing of email invites. Randomly generated on install. Click \"Regenerate\" to create new salt.", @@ -649,7 +653,7 @@ "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.", "admin.service.sessionDaysEx": "Ex \"30\"", "admin.service.siteURL": "Site URL:", - "admin.service.siteURLDescription": "The URL, including port number and protocol, from which users will access Mattermost. Leave blank to automatically configure based on incoming traffic.", + "admin.service.siteURLDescription": "The URL, including post number and protocol, that users will use to access Mattermost. Leave blank to automatically configure based on incoming traffic.", "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"", "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.", @@ -1764,16 +1768,20 @@ "user.settings.notifications.commentsRoot": "Mention any comments on your post", "user.settings.notifications.desktop": "Send desktop notifications", "user.settings.notifications.desktopSounds": "Desktop notification sounds", - "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from {siteName} for more than 5 minutes.", - "user.settings.notifications.emailNotifications": "Email notifications", + "user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.", + "user.settings.notifications.emailInfo": "Email notifications that are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.", + "user.settings.notifications.emailNotifications": "Send email notifications", + "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}", + "user.settings.notifications.everyHour": "Every hour", "user.settings.notifications.header": "Notifications", + "user.settings.notifications.immediately": "Immediately", "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.", "user.settings.notifications.never": "Never", "user.settings.notifications.noWords": "No words configured", "user.settings.notifications.off": "Off", "user.settings.notifications.on": "On", "user.settings.notifications.onlyMentions": "Only for mentions and direct messages", - "user.settings.notifications.push": "Mobile push notifications", + "user.settings.notifications.push": "Send mobile push notifications", "user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"", "user.settings.notifications.sensitiveUsername": "Your non-case sensitive username \"{username}\"", "user.settings.notifications.sensitiveWords": "Other non-case sensitive words, separated by commas:", |