Merge branch 'dev' into patch-6

2024-07-08 23:19:16 -07:00
parent 87779202f9 456665d0cb
commit 9f0d2b1e32
155 changed files with 1334 additions and 1034 deletions
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -123,7 +123,7 @@
  "label.new-password": "新密码",
  "label.none": "无",
  "label.number-of-records": "{x} {x, plural, one {record} other {records}}",
-  "label.ok": "OK",
+  "label.ok": "好的",
  "label.os": "操作系统",
  "label.overview": "概览",
  "label.owner": "所有者",