diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
commit | 91bef4759f40422b64d7990f9b90db0b493773b1 (patch) | |
tree | 3211b1014a6d0a88737db16c44d210ef96a070e4 /config/locales/zh-HK.yml | |
parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
parent | 554f659f2aa1eb9c0ca64ec1c9c177538434826c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js
Diffstat (limited to 'config/locales/zh-HK.yml')
-rw-r--r-- | config/locales/zh-HK.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index ee7ca4443..b1f9922fa 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -271,7 +271,6 @@ zh-HK: comment: none: 沒有 created_at: 日期 - id: ID mark_as_resolved: 標示為「已處理」 mark_as_unresolved: 標示為「未處理」 notes: @@ -282,7 +281,6 @@ zh-HK: placeholder: 記錄已執行的動作,或其他相關的更新…… reopen: 重開舉報 report: '舉報 #%{id}' - report_contents: 舉報內容 reported_account: 舉報用戶 reported_by: 舉報者 resolved: 已處理 @@ -290,12 +288,10 @@ zh-HK: silence_account: 將用戶靜音 status: 狀態 suspend_account: 將用戶停權 - target: 對象 title: 舉報 unassign: 取消指派 unresolved: 未處理 updated_at: 更新 - view: 檢視 settings: activity_api_enabled: desc_html: 本站用戶發佈的文章,以及本站的活躍用戶和一週內新用戶數 |