tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gs-master

Browse Source
This commit is contained in:
David Yip
2017-10-27 09:45:25 -05:00
parent 656f5b6f87 781105293c
commit 870d71b78b
12 changed files with 88 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/locales/en.yml
View File

@ -130,11 +130,15 @@ en:
enable: Enable
enabled_msg: Successfully enabled that emoji
image_hint: PNG up to 50KB
listed: Listed
new:
title: Add new custom emoji
shortcode: Shortcode
shortcode_hint: At least 2 characters, only alphanumeric characters and underscores
title: Custom emojis
unlisted: Unlisted
update_failed_msg: Could not update that emoji
updated_msg: Emoji successfully updated!
upload: Upload
domain_blocks:
add_new: Add new