From ff65e5ede536ebaa9230b2f28d81bd93f91eaf16 Mon Sep 17 00:00:00 2001
From: Yusuke Nemoto <stooner.hoe@gmail.com>
Date: Fri, 16 Sep 2016 20:53:42 +0900
Subject: [PATCH] Fix messages id & Add necessary messages to en.json (#4027)

---
 webapp/components/search_results_header.jsx | 6 +++---
 webapp/i18n/en.json                         | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/webapp/components/search_results_header.jsx b/webapp/components/search_results_header.jsx
index e0d57494c7..8fbe4ab1f4 100644
--- a/webapp/components/search_results_header.jsx
+++ b/webapp/components/search_results_header.jsx
@@ -58,7 +58,7 @@ export default class SearchResultsHeader extends React.Component {
         const closeSidebarTooltip = (
             <Tooltip id='closeSidebarTooltip'>
                 <FormattedMessage
-                    id='rhs_header.closeTooltip'
+                    id='rhs_header.closeSidebarTooltip'
                     defaultMessage='Close Sidebar'
                 />
             </Tooltip>
@@ -67,7 +67,7 @@ export default class SearchResultsHeader extends React.Component {
         const expandSidebarTooltip = (
             <Tooltip id='expandSidebarTooltip'>
                 <FormattedMessage
-                    id='rhs_header.expandTooltip'
+                    id='rhs_header.expandSidebarTooltip'
                     defaultMessage='Expand Sidebar'
                 />
             </Tooltip>
@@ -76,7 +76,7 @@ export default class SearchResultsHeader extends React.Component {
         const shrinkSidebarTooltip = (
             <Tooltip id='shrinkSidebarTooltip'>
                 <FormattedMessage
-                    id='rhs_header.expandTooltip'
+                    id='rhs_header.shrinkSidebarTooltip'
                     defaultMessage='Shrink Sidebar'
                 />
             </Tooltip>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index f9b6149f00..0a31413f49 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -971,6 +971,7 @@
   "channel_header.channel": "Channel",
   "channel_header.channelHeader": "Set Channel Header...",
   "channel_header.delete": "Delete {term}...",
+  "channel_header.flagged": "Flagged Posts",
   "channel_header.group": "Group",
   "channel_header.leave": "Leave {term}",
   "channel_header.manageMembers": "Manage Members",
@@ -1936,6 +1937,7 @@
   "user.settings.notifications.emailNotifications": "Email notifications",
   "user.settings.notifications.header": "Notifications",
   "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
+  "user.settings.notifications.never": "Never",
   "user.settings.notifications.noWords": "No words configured",
   "user.settings.notifications.off": "Off",
   "user.settings.notifications.on": "On",