about summary refs log tree commit diff
path: root/config/locales/zh-TW.yml
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-14 08:35:55 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-11-14 08:35:55 +0100
commit32c70d2f09e27c474b7e20ef3e3b34f5a7f50121 (patch)
tree117e952f835329eadc0095e809427f7af5be9631 /config/locales/zh-TW.yml
parent81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff)
parentb59ce0a60ff4f90bb16a8c3338ad37218af052b8 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
Diffstat (limited to 'config/locales/zh-TW.yml')
-rw-r--r--config/locales/zh-TW.yml8
1 files changed, 3 insertions, 5 deletions
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 5953c2275..c9596c040 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -597,7 +597,7 @@ zh-TW:
         other: "%{count} 個使用者"
       categories:
         administration: 管理員
-        devops: Devops
+        devops: DevOps
         invites: 邀請
         moderation: 站務
         special: 特殊
@@ -647,7 +647,7 @@ zh-TW:
         view_audit_log_description: 允許使用者檢視伺服器上的管理動作歷史
         view_dashboard: 檢視儀表板
         view_dashboard_description: 允許使用者存取儀表板與各種指標
-        view_devops: Devops
+        view_devops: DevOps
         view_devops_description: 允許使用者存取 Sidekiq 與 pgHero 儀表板
       title: 角色
     rules:
@@ -1349,7 +1349,6 @@ zh-TW:
     browser: 瀏覽器
     browsers:
       alipay: 支付寶
-      blackberry: 黑莓機
       chrome: Chrome 瀏覽器
       edge: Microsoft Edge 瀏覽器
       electron: Electron 瀏覽器
@@ -1372,8 +1371,7 @@ zh-TW:
     platforms:
       adobe_air: Adobe Air
       android: Android
-      blackberry: 黑莓機 (Blackberry)
-      chrome_os: Chrome OS
+      chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
       linux: Linux