diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-12 15:57:34 +0100 |
commit | 980c004f0601bbfaf440c0ea56de408ccfd79007 (patch) | |
tree | 8ed051d5e8b9c530b3282cfd84e34e50b3bcfa57 /config/locales/doorkeeper.zh-CN.yml | |
parent | 180f1383943ad171d8394ef9af7c7861bfc08056 (diff) | |
parent | 24cd2126c6cfb80844ef9ffbf61647b3d9afdc68 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one
Diffstat (limited to 'config/locales/doorkeeper.zh-CN.yml')
-rw-r--r-- | config/locales/doorkeeper.zh-CN.yml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml index 0d3c6d57e..f186a954a 100644 --- a/config/locales/doorkeeper.zh-CN.yml +++ b/config/locales/doorkeeper.zh-CN.yml @@ -4,7 +4,7 @@ zh-CN: attributes: doorkeeper/application: name: 应用名称 - redirect_uri: 重定向 URI + redirect_uri: 跳转 URI scopes: 权限范围 website: 应用网站 errors: @@ -115,16 +115,17 @@ zh-CN: title: 需要 OAuth 认证 scopes: admin:read: 读取服务器上的所有数据 - admin:read:accounts: 读取所有账户的敏感信息 - admin:read:reports: 读取所有举报和被举报账户的敏感信息 + admin:read:accounts: 读取所有帐号的敏感信息 + admin:read:reports: 读取所有举报和被举报帐号的敏感信息 admin:write: 修改服务器上的所有数据 - admin:write:accounts: 对账户执行管理操作 + admin:write:accounts: 对帐号执行管理操作 admin:write:reports: 对举报执行管理操作 follow: 关注或屏蔽用户 push: 接收你的帐户的推送通知 read: 读取你的帐户数据 - read:accounts: 查看账户信息 + read:accounts: 查看账号信息 read:blocks: 查看你的屏蔽列表 + read:bookmarks: 查看您的书签 read:favourites: 查看喜欢的嘟文 read:filters: 查看你的过滤器 read:follows: 查看你的关注 @@ -134,9 +135,10 @@ zh-CN: read:reports: 查看你的举报 read:search: 以你的身份搜索 read:statuses: 查看所有嘟文 - write: 修改你的账户数据 + write: 修改你的账号数据 write:accounts: 修改你的个人资料 - write:blocks: 屏蔽账户和域名 + write:blocks: 屏蔽账号和域名 + write:bookmarks: 为嘟文添加书签 write:favourites: 喜欢的嘟文 write:filters: 创建过滤器 write:follows: 关注其他人 |