From b6e2e999bd4c603bc36b1234af484184644104e9 Mon Sep 17 00:00:00 2001
From: nullkal <nullkal@nil.nu>
Date: Tue, 7 Nov 2017 22:49:32 +0900
Subject:  Show the local couterpart of emoji when it exists in
 /admin/custom_emojis (#5467)

* Show the local couterpart of emoji when it exists in admin/custom_emojis

* Fix indentation

* Fix error

* Add class table-action-link to Overwrite link

* Make it enable to overwrite emojis

* Make Code Climate happy
---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config/locales')

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d72ec92d0..ce439029c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -134,6 +134,7 @@ en:
       listed: Listed
       new:
         title: Add new custom emoji
+      overwrite: Overwrite
       shortcode: Shortcode
       shortcode_hint: At least 2 characters, only alphanumeric characters and underscores
       title: Custom emojis
-- 
cgit