From 43daf814dfa053f738cd7f18440f4b5ea373ff3d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 5 Nov 2018 01:33:06 +0900
Subject: [PATCH] =?UTF-8?q?[Client]=20=E7=B5=B5=E6=96=87=E5=AD=97=E7=99=BB?=
 =?UTF-8?q?=E9=8C=B2=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AB=E4=BE=BF?=
 =?UTF-8?q?=E5=88=A9=E6=83=85=E5=A0=B1=E3=82=92=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/ja-JP.yml                    | 1 +
 src/client/app/admin/views/emoji.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fceb462473..2c5fc9c3db 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1131,6 +1131,7 @@ admin/views/emoji.vue:
     aliases-desc: "スペースで区切って複数設定できます。"
     url: "絵文字画像URL"
     add: "追加"
+    info: "50KB以下のPNG画像をおすすめします。"
   emojis:
     title: "絵文字一覧"
     update: "更新"
diff --git a/src/client/app/admin/views/emoji.vue b/src/client/app/admin/views/emoji.vue
index b889d64bbb..7bcd905314 100644
--- a/src/client/app/admin/views/emoji.vue
+++ b/src/client/app/admin/views/emoji.vue
@@ -16,6 +16,7 @@
 			<ui-input v-model="url">
 				<span>%i18n:@add-emoji.url%</span>
 			</ui-input>
+			<ui-info>%i18n:@add-emoji.info%</ui-info>
 			<ui-button @click="add">%i18n:@add-emoji.add%</ui-button>
 		</section>
 	</ui-card>