about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authornullkal <nullkal@nil.nu>2017-11-07 22:49:32 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-11-07 14:49:32 +0100
commitb6e2e999bd4c603bc36b1234af484184644104e9 (patch)
treef1aa9fc571fc656780e9b22a2c1dccb3f521997c /config/locales
parent782224c99151665470b138add583d50df17b4380 (diff)
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
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml1
1 files changed, 1 insertions, 0 deletions
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