From a5a5095c1cb82e9776b4ce1b8c48ea934af1ac0d Mon Sep 17 00:00:00 2001
From: Unknown <bernardo.trevisan@rocket.chat>
Date: Thu, 29 Mar 2018 15:07:51 -0300
Subject: [PATCH 1/3] [FIX] Missing Translation Key on Reactions

---
 packages/rocketchat-i18n/i18n/en.i18n.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 1d77ee1f6f60d..d6c5c3adf740d 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1388,6 +1388,7 @@
   "No_pages_yet_Try_hitting_Reload_Pages_button": "No pages yet. Try hitting \"Reload Pages\" button.",
   "No_messages_yet": "No messages yet",
   "No_pinned_messages": "No pinned messages",
+  "No_reactions": "No Reacting",
   "No_results_found": "No results found",
   "No_snippet_messages": "No snippet",
   "No_starred_messages": "No starred messages",

From cf8861029c288b82c7334ef65495a6206e73f3fc Mon Sep 17 00:00:00 2001
From: graywolf336 <graywolf336@craftyn.com>
Date: Thu, 29 Mar 2018 22:46:24 -0500
Subject: [PATCH 2/3] Clearify the translations of the no reacting

---
 .../client/views/channelSettings.html                        | 4 ++--
 packages/rocketchat-i18n/i18n/en.i18n.json                   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
index 735b947029ec3..7fff8adaa543b 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.html
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -137,9 +137,9 @@
 						</label>
 					</div>
 					<div class="rc-switch-double__label  {{equal false value 'disabled'}}">
-						{{_ "No_reactions"}}
+						{{_ "No_reacting"}}
 						<div class="rc-switch-double__description">
-							{{_ "No_reactions"}}
+							{{_ "No_reacting_Description"}}
 						</div>
 					</div>
 				</div>
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index d6c5c3adf740d..cf5b807da767b 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1388,7 +1388,8 @@
   "No_pages_yet_Try_hitting_Reload_Pages_button": "No pages yet. Try hitting \"Reload Pages\" button.",
   "No_messages_yet": "No messages yet",
   "No_pinned_messages": "No pinned messages",
-  "No_reactions": "No Reacting",
+  "No_reacting": "No Reacting",
+  "No_reacting_Description": "Disables reacting",
   "No_results_found": "No results found",
   "No_snippet_messages": "No snippet",
   "No_starred_messages": "No starred messages",
@@ -2243,4 +2244,4 @@
   "your_message_optional": "your message (optional)",
   "Your_password_is_wrong": "Your password is wrong!",
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
\ No newline at end of file
+}

From bacc1003d76c98995396f07d252e548115537df3 Mon Sep 17 00:00:00 2001
From: graywolf336 <graywolf336@craftyn.com>
Date: Thu, 29 Mar 2018 23:36:36 -0500
Subject: [PATCH 3/3] Really really clearify the disallow reacting language

---
 .../client/views/channelSettings.html                         | 4 ++--
 packages/rocketchat-i18n/i18n/en.i18n.json                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
index 7fff8adaa543b..a24334281aa25 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.html
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -137,9 +137,9 @@
 						</label>
 					</div>
 					<div class="rc-switch-double__label  {{equal false value 'disabled'}}">
-						{{_ "No_reacting"}}
+						{{_ "Disallow_reacting"}}
 						<div class="rc-switch-double__description">
-							{{_ "No_reacting_Description"}}
+							{{_ "Disallow_reacting_Description"}}
 						</div>
 					</div>
 				</div>
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index cf5b807da767b..72ddc6c206543 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -552,6 +552,8 @@
   "Disable_Notifications": "Disable Notifications",
   "Disable_two-factor_authentication": "Disable two-factor authentication",
   "Disabled": "Disabled",
+  "Disallow_reacting": "Disallow Reacting",
+  "Disallow_reacting_Description": "Disallows reacting",
   "Display_unread_counter": "Display number of unread messages",
   "Display_offline_form": "Display Offline Form",
   "Displays_action_text": "Displays action text",
@@ -1388,8 +1390,6 @@
   "No_pages_yet_Try_hitting_Reload_Pages_button": "No pages yet. Try hitting \"Reload Pages\" button.",
   "No_messages_yet": "No messages yet",
   "No_pinned_messages": "No pinned messages",
-  "No_reacting": "No Reacting",
-  "No_reacting_Description": "Disables reacting",
   "No_results_found": "No results found",
   "No_snippet_messages": "No snippet",
   "No_starred_messages": "No starred messages",