diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
| commit | 0ad919b19257b7d8eb447f7955030927d26cdbe6 (patch) | |
| tree | d78bd5ba447da166bb7d97a3df3e6d97902a5cdb /config/locales/zh-CN.yml | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 5187e4e758b0636432d984d1a95a310cac536205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.
Diffstat (limited to 'config/locales/zh-CN.yml')
| -rw-r--r-- | config/locales/zh-CN.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 92ae4cbe7..d0b3b1550 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -204,6 +204,7 @@ zh-CN: reject_user: 拒绝用户 remove_avatar_user: 移除头像 reopen_report: 重开举报 + resend_user: 重新发送确认电子邮件 reset_password_user: 重置密码 resolve_report: 处理举报 sensitive_account: 将你账号中的媒体标记为敏感内容 @@ -262,6 +263,7 @@ zh-CN: reject_user_html: "%{name} 拒绝了用户 %{target} 的注册" remove_avatar_user_html: "%{name} 删除了 %{target} 的头像" reopen_report_html: "%{name} 重开了举报 %{target}" + resend_user_html: "%{name} 给 %{target} 发送了重新确认电子邮件" reset_password_user_html: "%{name} 重置了用户 %{target} 的密码" resolve_report_html: "%{name} 处理了举报 %{target}" sensitive_account_html: "%{name} 将 %{target} 的媒体标记为敏感内容" @@ -1223,6 +1225,8 @@ zh-CN: carry_blocks_over_text: 这个用户迁移自你屏蔽过的 %{acct} carry_mutes_over_text: 这个用户迁移自你隐藏过的 %{acct} copy_account_note_text: 这个用户迁移自 %{acct}，你曾为其添加备注： + navigation: + toggle_menu: 切换菜单 notification_mailer: admin: report: |