diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
commit | a2e7997592dd86baa7595c41eed274be4c200d07 (patch) | |
tree | b4c21af8bdf541d8156beb29e9f53766bd1fbadd /config/locales/doorkeeper.zh-CN.yml | |
parent | 6517b7b9f02f8590a8f9c5aa04e3ef9efeb4e757 (diff) | |
parent | cec1e902e006730f68bde0a4334e5b819a12a475 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.
Diffstat (limited to 'config/locales/doorkeeper.zh-CN.yml')
-rw-r--r-- | config/locales/doorkeeper.zh-CN.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml index 9586e9522..2ce18fe44 100644 --- a/config/locales/doorkeeper.zh-CN.yml +++ b/config/locales/doorkeeper.zh-CN.yml @@ -124,7 +124,7 @@ zh-CN: admin/reports: 举报管理 all: 所有 blocks: 屏蔽 - bookmarks: 收藏 + bookmarks: 书签 conversations: 会话 crypto: 端到端加密 favourites: 喜欢 @@ -155,8 +155,8 @@ zh-CN: admin:write:reports: 对举报执行管理操作 crypto: 使用端到端加密 follow: 关注或屏蔽用户 - push: 接收你的帐户的推送通知 - read: 读取你的帐户数据 + push: 接收你的账户的推送通知 + read: 读取你的账户数据 read:accounts: 查看账号信息 read:blocks: 查看你的屏蔽列表 read:bookmarks: 查看你的书签 |