Merge branch 'develop' of https://github.com/syuilo/misskey into develop

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: "删除"

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;