summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorEric Sethna <eric@spinpunch.com>2016-09-01 08:02:35 -0600
committerJoram Wilander <jwawilander@gmail.com>2016-09-01 10:02:35 -0400
commit38b25a87842feae6576be98fddd4569e79e63baf (patch)
tree19e9180a81077897901221da2f5c321f0de9f493 /webapp/i18n
parent26f96b240ddc8cf8c56decea72102b10238e0a43 (diff)
downloadchat-38b25a87842feae6576be98fddd4569e79e63baf.tar.gz
chat-38b25a87842feae6576be98fddd4569e79e63baf.tar.bz2
chat-38b25a87842feae6576be98fddd4569e79e63baf.zip
Update Push and Email Notifications Text (#3924)
* Update user_settings_notifications.jsx * Update user_settings_notifications.jsx * Update email_notification_setting.jsx * Update en.json * Update user_settings_notifications.jsx
Diffstat (limited to 'webapp/i18n')
-rw-r--r--webapp/i18n/en.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 8d1cfb3c7..9f01f6251 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1885,7 +1885,7 @@
"user.settings.notifications.desktop.duration": "Notification duration",
"user.settings.notifications.desktop.sound": "Notification sound",
"user.settings.notifications.desktopSounds": "Desktop notification sounds",
- "user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.",
+ "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
"user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.",
"user.settings.notifications.emailNotifications": "Email notifications",
"user.settings.notifications.everyHour": "Every hour",
@@ -1921,7 +1921,9 @@
"user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline",
"user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline",
"user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline",
- "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.",
+ "user.settings.push_notification.send": "Send mobile push notifications",
+ "user.settings.push_notification.status": "Trigger push notifications when",
+ "user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
"user.settings.security.close": "Close",
"user.settings.security.currentPassword": "Current Password",
"user.settings.security.currentPasswordError": "Please enter your current password.",