diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
commit | eb39db7f93061c936fcb0bb24d5ba0c9a6186993 (patch) | |
tree | e12b5f5c9fec1d698024c88cd9f3ea9fe5b249cd /config/locales/doorkeeper.zh-HK.yml | |
parent | f0bb3ff53307aac7b9c64ec8a48d4ba1d2019513 (diff) | |
parent | f890d2a766ae4c7fd8611dd4f3a15a13408f68c3 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
Diffstat (limited to 'config/locales/doorkeeper.zh-HK.yml')
-rw-r--r-- | config/locales/doorkeeper.zh-HK.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml index c8edc2b72..747108762 100644 --- a/config/locales/doorkeeper.zh-HK.yml +++ b/config/locales/doorkeeper.zh-HK.yml @@ -5,6 +5,8 @@ zh-HK: doorkeeper/application: name: 名稱 redirect_uri: 轉接 URI + scopes: 權限範圍 + website: 應用網站 errors: models: doorkeeper/application: @@ -33,9 +35,13 @@ zh-HK: redirect_uri: 每行輸入一個 URI scopes: 請用半形空格分開權限範圍 (scope)。留空表示使用預設的權限範圍 index: + application: 應用 callback_url: 回傳網址 + delete: 刪除 name: 名稱 new: 新增應用程式 + scopes: 權限範圍 + show: 顯示 title: 你的應用程式 new: title: 新增應用程式 |