diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-21 16:40:02 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-21 16:40:02 +0200 |
commit | a4c9bda771c04526005f708dfb9ca2ccced60d52 (patch) | |
tree | 9ed60f78e2e8acc823bccb7c75ecaa3fdb1b7ab6 /config/locales/doorkeeper.zh-CN.yml | |
parent | 98ecadbf99aa823164608f796a40ab1cd067bdc2 (diff) | |
parent | 46061dc041b0a2a4a3907976cc3432abdb1d67ec (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.
Diffstat (limited to 'config/locales/doorkeeper.zh-CN.yml')
-rw-r--r-- | config/locales/doorkeeper.zh-CN.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml index 90c484369..3c7dd99be 100644 --- a/config/locales/doorkeeper.zh-CN.yml +++ b/config/locales/doorkeeper.zh-CN.yml @@ -115,5 +115,6 @@ zh-CN: title: 需要 OAuth 认证 scopes: follow: 关注或屏蔽用户 + push: 接收你的帐户的推送通知 read: 读取你的帐户数据 write: 为你发表嘟文 |