diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-12-19 13:52:54 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-19 13:52:54 +0100 |
commit | ab5ff638f2968e3f434e504c7caab370bf71c9c0 (patch) | |
tree | 172f2c2fc8192688b960dd2bd42ea126ad9245fb /config/locales/zh-CN.yml | |
parent | 66ab1f83b0d342341181e0c88da83c966391fc0c (diff) | |
parent | 902c6bed5aab12c2e97af3452f122247777226af (diff) |
Merge branch 'master' into glitch-soc/master
Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc
Diffstat (limited to 'config/locales/zh-CN.yml')
-rw-r--r-- | config/locales/zh-CN.yml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 3af145c66..49dd31bac 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -107,9 +107,7 @@ zh-CN: email_status: 电子邮件地址状态 enable: 启用 enabled: 已启用 - feed_url: 订阅 URL followers: 关注者 - followers_url: 关注者(Followers)URL follows: 正在关注 header: 个人资料页横幅图片 inbox_url: 收件箱(Inbox)URL @@ -137,10 +135,8 @@ zh-CN: no_account_selected: 因为没有账户被选择,所以没有更改 no_limits_imposed: 无限制 not_subscribed: 未订阅 - outbox_url: 发件箱(Outbox)URL pending: 待审核 perform_full_suspension: 封禁 - profile_url: 个人资料页面 URL promote: 升任 protocol: 协议 public: 公开页面 @@ -163,7 +159,6 @@ zh-CN: moderator: 监察员 staff: 管理人员 user: 普通用户 - salmon_url: 三文鱼协议网址(Salmon URL) search: 搜索 search_same_ip: 具有相同IP的其他用户 shared_inbox_url: 公用收件箱(Shared Inbox)URL @@ -384,9 +379,6 @@ zh-CN: created_msg: 举报记录建立成功! destroyed_msg: 举报记录删除成功! reports: - account: - note: 条记录 - report: 条举报 action_taken_by: 操作执行者 are_you_sure: 你确定吗? assign_to_self: 接管 |