From 266c31981da044af1c1bc276867441bae6f8c9e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Tue, 5 Feb 2019 15:09:37 +0900
Subject: [PATCH 1/2] Fix typo

---
 src/models/meta.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/models/meta.ts b/src/models/meta.ts
index 4d4b00be6..e5b729ea1 100644
--- a/src/models/meta.ts
+++ b/src/models/meta.ts
@@ -209,7 +209,7 @@ export type IMeta = {
 	remoteDriveCapacityMb?: number;
 
 	/**
-	 * Max allowed note text length in charactors
+	 * Max allowed note text length in characters
 	 */
 	maxNoteTextLength?: number;
 

From 17e1b49bffaff657bb14d2621bc7d3967c3dc7e2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 5 Feb 2019 15:16:53 +0900
Subject: [PATCH 2/2] New translations ja-JP.yml (Chinese Simplified) (#4140)

---
 locales/zh-CN.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 0645832c0..cc3345bca 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -113,7 +113,7 @@ common:
   use-avatar-reversi-stones: "用头像作为黑白棋的棋子"
   verified-user: "认证用户"
   disable-animated-mfm: "在帖子中禁用动画文本"
-  disable-showing-animated-images: "アニメーション画像を再生しない"
+  disable-showing-animated-images: "不播放动画"
   suggest-recent-hashtags: "在帖子表单上显示最近流行的主题标签"
   always-show-nsfw: "总是显示 NSFW 的内容"
   always-mark-nsfw: "总是用 NSFW 来标记附件"
@@ -345,8 +345,8 @@ common/views/components/note-menu.vue:
   copy-link: "复制链接"
   favorite: "收藏这个投稿"
   unfavorite: "取消收藏"
-  watch: "ウォッチ"
-  unwatch: "ウォッチ解除"
+  watch: "关注"
+  unwatch: "取消关注"
   pin: "固定个人资料"
   unpin: "解除固定"
   delete: "删除"