diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 19:12:10 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-10 21:00:30 +0100 |
| commit | a2a64ecd3e3551707412c47f0d16e484dea25632 (patch) | |
| tree | bc4e0b8e0ca2a2735f527bff8bd73421c0ff72dd /config/locales/zh-TW.yml | |
| parent | fb0c906c717f2b21bb63610742a357850142b522 (diff) | |
| parent | 70801b850c78d7879182eeba4eae509af42fafeb (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
Diffstat (limited to 'config/locales/zh-TW.yml')
| -rw-r--r-- | config/locales/zh-TW.yml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 5e209d2ff..f4bda0f34 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -218,11 +218,6 @@ zh-TW: title: 新增封鎖網域 reject_media: 拒絕媒體檔案 reject_media_hint: 刪除本地緩存的媒體檔案，並且不再接收來自該網域的任何媒體檔案。與自動封鎖無關 - severities: - noop: 無 - silence: 自動靜音 - suspend: 自動封鎖 - severity: 嚴重度 show: affected_accounts: 資料庫中有%{count}個使用者受影響 retroactive: @@ -230,7 +225,6 @@ zh-TW: suspend: 對此網域的所有使用者取消封鎖 title: 撤銷 %{domain} 的網域封鎖 undo: 撤銷 - title: 網域封鎖 undo: 撤銷 email_domain_blocks: add_new: 加入新項目 @@ -243,10 +237,6 @@ zh-TW: title: 新增E-mail封鎖 title: E-mail封鎖 instances: - account_count: 已知帳戶 - domain_name: 網域 - reset: 重設 - search: 搜尋 title: 已知站點 invites: filter: |