From b08b1ff013857f71aab947a4239f0527a54d717a Mon Sep 17 00:00:00 2001
From: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Date: Tue, 28 Apr 2020 13:04:04 -0400
Subject: [PATCH] GRN2-xx: Fixed translation location for room status (#1378)

* Fixed translation location for room status

* Added more missing translations
---
 app/views/admins/components/_server_room_row.html.erb | 6 +++---
 config/locales/en.yml                                 | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/admins/components/_server_room_row.html.erb b/app/views/admins/components/_server_room_row.html.erb
index eaf6a083..f874452e 100644
--- a/app/views/admins/components/_server_room_row.html.erb
+++ b/app/views/admins/components/_server_room_row.html.erb
@@ -36,9 +36,9 @@
   <td class="text-left">
     <% running = room_is_running(room.bbb_id) %>
     <% if running %>
-      <%= t("administrator.rooms.running") %>
+      <%= t("administrator.rooms.table.running") %>
     <% else %>
-      <%= t("administrator.rooms.not_running") %>
+      <%= t("administrator.rooms.table.not_running") %>
     <% end %>
   </td>
   <td class="text-center">
@@ -48,7 +48,7 @@
       </a>
       <div class="dropdown-menu dropdown-menu-right">
         <%= link_to room_path(room), class: "dropdown-item" do %>
-          <i class="dropdown-icon far fa-eye"></i> <%= t("administrator.rooms.view") %>
+          <i class="dropdown-icon far fa-eye"></i> <%= t("administrator.rooms.table.view") %>
         <% end %>
         <%= button_to start_room_path(room), class: "dropdown-item", "data-disable": "" do %>
           <i class="dropdown-icon fas fa-door-open"></i> <%= running ? t("room.join") : t("room.start") %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ee55901d..547209e5 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -147,6 +147,7 @@ en:
         delete: Delete
         edit: Edit
         edit_roles: Edit the user roles
+        merge: Merge
         perm_delete: Permanently Delete
         unban: Unban User
         undelete: Undelete