From 0fe8ad13fae53fbc2c70db625852b2b4c8f07d82 Mon Sep 17 00:00:00 2001
From: Vinoth Kannan <vinothkannan@vinkas.com>
Date: Mon, 4 May 2020 18:44:30 +0530
Subject: [PATCH] UX: change the user merge button's label and icon.

---
 app/assets/javascripts/admin/templates/user-index.hbs | 4 ++--
 config/locales/client.en.yml                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index adbe7e50e9f..1353ed0d789 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -686,8 +686,8 @@
     {{/if}}
 
     {{#if model.can_be_merged}}
-      {{d-button label="admin.user.merge.transfer_and_delete"
-                 icon="trash-alt"
+      {{d-button label="admin.user.merge.button"
+                 icon="arrows-alt-h"
                  class="btn-danger"
                  action=(action "promptTargetUser")}}
     {{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5c3211a53b8..336a4cf6c15 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4350,7 +4350,7 @@ en:
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "Delete User"
         merge:
-          transfer_and_delete: "Transfer & Delete"
+          button: "Merge"
           prompt:
             title: "Transfer & Delete @%{username}"
             description: |