diff options
author | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
commit | 82b2e224a26765caf743b24844912faa2de9873a (patch) | |
tree | 1ee49dd3dbcef7867ad93f875262951612815851 /config/locales/doorkeeper.zh-CN.yml | |
parent | 6abb0950c6f694607cdc6a0c564751400d52ad5a (diff) | |
parent | e0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff) |
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts: db/schema.rb
Diffstat (limited to 'config/locales/doorkeeper.zh-CN.yml')
-rw-r--r-- | config/locales/doorkeeper.zh-CN.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml index 0eb5a0ab6..90c484369 100644 --- a/config/locales/doorkeeper.zh-CN.yml +++ b/config/locales/doorkeeper.zh-CN.yml @@ -114,6 +114,6 @@ zh-CN: application: title: 需要 OAuth 认证 scopes: - follow: 关注(或取消关注)、屏蔽(或取消屏蔽)用户 + follow: 关注或屏蔽用户 read: 读取你的帐户数据 write: 为你发表嘟文 |