From 0184d6059bb1943fb74bf33d1d200a423c5bf5e6 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 4 Aug 2016 11:38:09 -0400
Subject: PLT-3506 Added flagged posts functionality (#3679)

* Added flagged posts functionality

* UI Improvements to flags (#3697)

* Added flag functionality for mobile

* Updating flagged text (#3699)

* Add back button to RHS thread when coming from flagged posts

* Updating position of flags (#3708)

* Plt 3506 - Reverting flag position (#3724)

* Revert "Updating position of flags (#3708)"

This reverts commit aaa05632c5d9eda35a048300a5bd7e99584c5b58.

* Fixing the icon in search

* Help text and white space improvements (#3730)

* Updatng help text and some white spacing.

* Updating help text
---
 webapp/i18n/en.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'webapp/i18n/en.json')

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 00fbe6ab6..67e366494 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1018,6 +1018,8 @@
   "create_comment.files": "Files uploading",
   "create_post.comment": "Comment",
   "create_post.post": "Post",
+  "flag_post.flag": "Flag for follow up",
+  "flag_post.unflag": "Unflag",
   "create_post.tutorialTip": "<h4>Sending Messages</h4><p>Type here to write a message and press <strong>Enter</strong> to post it.</p><p>Click the <strong>Attachment</strong> button to upload an image or a file.</p>",
   "create_post.write": "Write a message...",
   "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}.",
@@ -1370,6 +1372,8 @@
   "post_delete.someone": "Someone deleted the message on which you tried to post a comment.",
   "post_focus_view.beginning": "Beginning of Channel Archives",
   "post_info.del": "Delete",
+  "post_info.mobile.flag": "Flag",
+  "post_info.mobile.unflag": "Unflag",
   "post_info.edit": "Edit",
   "post_info.permalink": "Permalink",
   "post_info.reply": "Reply",
@@ -1393,14 +1397,19 @@
   "rename_channel.title": "Rename Channel",
   "rhs_comment.comment": "Comment",
   "rhs_comment.del": "Delete",
+  "rhs_comment.mobile.flag": "Flag",
+  "rhs_comment.mobile.unflag": "Unflag",
   "rhs_comment.edit": "Edit",
   "rhs_comment.permalink": "Permalink",
   "rhs_header.backToResultsTooltip": "Back to Search Results",
+  "rhs_header.backToFlaggedTooltip": "Back to Flagged Posts",
   "rhs_header.closeSidebarTooltip": "Close Sidebar",
   "rhs_header.details": "Message Details",
   "rhs_header.expandSidebarTooltip": "Expand Sidebar",
   "rhs_header.shrinkSidebarTooltip": "Shrink Sidebar",
   "rhs_root.del": "Delete",
+  "rhs_root.mobile.flag": "Flag",
+  "rhs_root.mobile.unflag": "Unflag",
   "rhs_root.direct": "Direct Message",
   "rhs_root.edit": "Edit",
   "rhs_root.permalink": "Permalink",
@@ -1409,6 +1418,7 @@
   "search_bar.usage": "<h4>Search Options</h4><ul><li><span>Use </span><b>\"quotation marks\"</b><span> to search for phrases</span></li><li><span>Use </span><b>from:</b><span> to find posts from specific users and </span><b>in:</b><span> to find posts in specific channels</span></li></ul>",
   "search_header.results": "Search Results",
   "search_header.title2": "Recent Mentions",
+  "search_header.title3": "Flagged Posts",
   "search_item.direct": "Direct Message",
   "search_item.jump": "Jump",
   "search_results.because": "<ul><li>If you're searching a partial phrase (ex. searching \"rea\", looking for \"reach\" or \"reaction\"), append a * to your search term.</li><li>Two letter searches and common words like \"this\", \"a\" and \"is\" won't appear in search results due to excessive results returned.</li></ul>",
@@ -1440,6 +1450,7 @@
   "sidebar.unreadBelow": "Unread post(s) below",
   "sidebar_header.tutorial": "<h4>Main Menu</h4><p>The <strong>Main Menu</strong> is where you can <strong>Invite New Members</strong>, access your <strong>Account Settings</strong> and set your <strong>Theme Color</strong>.</p><p>Team administrators can also access their <strong>Team Settings</strong> from this menu.</p><p>System administrators will find a <strong>System Console</strong> option to administrate the entire system.</p>",
   "sidebar_right_menu.accountSettings": "Account Settings",
+  "sidebar_right_menu.flagged": "Flagged Posts",
   "sidebar_right_menu.console": "System Console",
   "sidebar_right_menu.help": "Help",
   "sidebar_right_menu.inviteNew": "Invite New Member",
-- 
cgit v1.2.3-1-g7c22