From 36be959cd96fcc3c7791939e9f4a3e92d737284d Mon Sep 17 00:00:00 2001 From: enahum Date: Fri, 20 May 2016 10:13:18 -0300 Subject: daily translations 20160519 (#3061) --- webapp/i18n/en.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 164d57ae2..41e0a9747 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1390,12 +1390,8 @@ "user.settings.modal.notifications": "Notifications", "user.settings.modal.security": "Security", "user.settings.modal.title": "Account Settings", - "user.settings.push_notification.off": "Off", - "user.settings.push_notification.onlyMentions": "For mentions and direct messages", - "user.settings.push_notification.allActivity": "For all activity", - "user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.", - "user.settings.notification.push": "Mobile push notifications", "user.settings.notification.allActivity": "For all activity", + "user.settings.notification.push": "Mobile push notifications", "user.settings.notification.soundConfig": "Please configure notification sounds in your browser settings", "user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\"", "user.settings.notifications.close": "Close", @@ -1418,6 +1414,10 @@ "user.settings.notifications.title": "Notification Settings", "user.settings.notifications.usernameMention": "Your username mentioned \"@{username}\"", "user.settings.notifications.wordsTrigger": "Words that trigger mentions", + "user.settings.push_notification.allActivity": "For all activity", + "user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.", + "user.settings.push_notification.off": "Off", + "user.settings.push_notification.onlyMentions": "For mentions and direct messages", "user.settings.security.close": "Close", "user.settings.security.currentPassword": "Current Password", "user.settings.security.currentPasswordError": "Please enter your current password", -- cgit v1.2.3-1-g7c22