diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-07 15:17:13 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-07 15:17:13 +0000 |
| commit | c2e1bfd9ae3f5fe65c4918a37143d48a2cc12bb3 (patch) | |
| tree | eb2c9fd328b985d7d388e4a6f9543e0a1180a9e8 /app/javascript | |
| parent | 5083311d64f427771609e444b87c0c39cb6f8ac2 (diff) | |
| parent | 1d92b90be9f494d90a6f79f53be9cca68562867e (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/locales/zh-CN.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index ce16dcd8e..ef850256c 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -50,7 +50,7 @@ "column_header.unpin": "取消固定", "column_subheading.navigation": "导航", "column_subheading.settings": "设置", - "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.", + "compose_form.hashtag_warning": "这条嘟文被设置为“不公开”，因此它不会出现在任何话题标签的列表下。只有公开的嘟文才能通过话题标签进行搜索。", "compose_form.lock_disclaimer": "你的帐户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。", "compose_form.lock_disclaimer.lock": "开启保护", "compose_form.placeholder": "在想啥？", @@ -214,7 +214,7 @@ "search_popout.tips.user": "用户", "search_results.total": "共 {count, number} 个结果", "standalone.public_title": "大家都在干啥？", - "status.block": "Block @{name}", + "status.block": "屏蔽 @{name}", "status.cannot_reblog": "无法转嘟这条嘟文", "status.delete": "删除", "status.embed": "嵌入", @@ -223,7 +223,7 @@ "status.media_hidden": "隐藏媒体内容", "status.mention": "提及 @{name}", "status.more": "更多", - "status.mute": "Mute @{name}", + "status.mute": "隐藏 @{name}", "status.mute_conversation": "隐藏此对话", "status.open": "展开嘟文", "status.pin": "在个人资料页面置顶", |