usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
syuilo 2019-02-05 17:30:25 +09:00
parent 350328770b 17e1b49bff
commit 2f4434b0d8
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
locales/zh-CN.yml
View File

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

2
src/models/meta.ts
View File

@ -209,7 +209,7 @@ export type IMeta = {
remoteDriveCapacityMb?: number; remoteDriveCapacityMb?: number;
/** /**
* Max allowed note text length in charactors * Max allowed note text length in characters
*/ */
maxNoteTextLength?: number; maxNoteTextLength?: number;