diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
| commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
| tree | a8a0df2129a863a739dda6399352d64af811110e /config/locales/doorkeeper.zh-CN.yml | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'config/locales/doorkeeper.zh-CN.yml')
| -rw-r--r-- | config/locales/doorkeeper.zh-CN.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml index 015d2c0ce..0d3c6d57e 100644 --- a/config/locales/doorkeeper.zh-CN.yml +++ b/config/locales/doorkeeper.zh-CN.yml @@ -125,7 +125,7 @@ zh-CN: read: 读取你的帐户数据 read:accounts: 查看账户信息 read:blocks: 查看你的屏蔽列表 - read:favourites: 查看你的收藏 + read:favourites: 查看喜欢的嘟文 read:filters: 查看你的过滤器 read:follows: 查看你的关注 read:lists: 查看你的列表 @@ -137,7 +137,7 @@ zh-CN: write: 修改你的账户数据 write:accounts: 修改你的个人资料 write:blocks: 屏蔽账户和域名 - write:favourites: 收藏嘟文 + write:favourites: 喜欢的嘟文 write:filters: 创建过滤器 write:follows: 关注其他人 write:lists: 创建列表 |