diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-05-09 11:14:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-09 11:14:32 +0200 |
commit | fc8baba8cb26cdcb74f00a4c51c8a88f1ee3e7ac (patch) | |
tree | 587dde695e2d6121bb8f0495e0c988ab0d3d1e3f /config/locales/simple_form.zh-CN.yml | |
parent | 5233e9910677c921ab93e0997964144b1df95a63 (diff) | |
parent | 299ab28d5f1af7da5ec3688ebcbbf711f4567367 (diff) |
Merge pull request #1533 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.zh-CN.yml')
-rw-r--r-- | config/locales/simple_form.zh-CN.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml index 3e2409648..012b02b35 100644 --- a/config/locales/simple_form.zh-CN.yml +++ b/config/locales/simple_form.zh-CN.yml @@ -101,12 +101,12 @@ zh-CN: text: 预置文本 title: 标题 admin_account_action: - include_statuses: 在电子邮件中包括已举报的嘟文 + include_statuses: 在电子邮件中包括已报告的嘟文 send_email_notification: 通过邮件提醒此用户 text: 内容警告 type: 动作 types: - disable: 禁用 + disable: 冻结 none: 忽略 sensitive: 敏感内容 silence: 静音 @@ -203,7 +203,7 @@ zh-CN: mention: 当有用户在嘟文中提及我时,发送电子邮件提醒我 pending_account: 在有帐号需要审核时,发送电子邮件提醒我 reblog: 当有用户转嘟了我的嘟文时,发送电子邮件提醒我 - report: 在提交新举报时,发送电子邮件提醒我 + report: 在提交新报告时,发送电子邮件提醒我 trending_tag: 当未经审核的话题成为当前热门时发邮件提醒 rule: text: 规则 |