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

1 files changed, 31 insertions, 0 deletions

diff --git a/config/locales/doorkeeper.zh-HK.yml b/config/locales/doorkeeper.zh-HK.yml
index d9c91caf0..30971f29f 100644
--- a/config/locales/doorkeeper.zh-HK.yml
+++ b/config/locales/doorkeeper.zh-HK.yml
@@ -72,6 +72,7 @@ zh-HK:
       index:
         application: 應用程式
         created_at: 授權日期
+        date_format: "%Y-%m-%d %H:%M:%S"
         scopes: 權限範圍
         title: 已獲你授權的程用程式
     errors:
@@ -113,7 +114,37 @@ zh-HK:
       application:
         title: 需要 OAuth 授權
     scopes:
+      admin:read: 讀取伺服器的所有資料
+      admin:read:accounts: 讀取所有帳戶的敏感資訊
+      admin:read:reports: 讀取所有回報 / 被回報之帳戶的敏感資訊
+      admin:write: 修改伺服器的所有資料
+      admin:write:accounts: 對帳戶進行仲裁管理動作
+      admin:write:reports: 對報告進行仲裁管理動作
       follow: 關注、封鎖、解除封鎖及取消關注用戶
       push: 接收你的帳號的推送通知
       read: 閱讀你的用戶資料
+      read:accounts: 檢視帳戶資訊
+      read:blocks: 檢視您的封鎖名單
+      read:bookmarks: 檢視您的書籤
+      read:favourites: 檢視您的收藏項目
+      read:filters: 檢視您的過濾條件
+      read:follows: 檢視您關注的人
+      read:lists: 檢視您的名單
+      read:mutes: 檢視您靜音的人
+      read:notifications: 檢視您的通知
+      read:reports: 檢視您的檢舉
+      read:search: 以你的身份搜尋
+      read:statuses: 檢視所有嘟文
       write: 以你的名義發佈文章
+      write:accounts: 修改您的個人檔案
+      write:blocks: 封鎖帳戶及站台
+      write:bookmarks: 書籤狀態
+      write:favourites: 收藏嘟文
+      write:filters: 建立過濾條件
+      write:follows: 關注其他人
+      write:lists: 建立名單
+      write:media: 上傳媒體檔案
+      write:mutes: 靜音使用者及對話
+      write:notifications: 清除您的通知
+      write:reports: 檢舉其他人
+      write:statuses: 發布嘟文