Merge branch 'master' of gitee.com:starlock-cn/app-starlock

# Conflicts: # star_lock/images/lan/lan_en.json # star_lock/images/lan/lan_keys.json # star_lock/images/lan/lan_zh.json 解决国际化文件冲突
2024-05-08 13:53:32 +08:00 · 2024-05-08 13:53:32 +08:00 · 45fb12506a
commit 45fb12506a
parent 6caeb5a5c2 d3045c69a1
3 changed files with 6 additions and 3 deletions
--- a/star_lock/images/lan/lan_en.json
+++ b/star_lock/images/lan/lan_en.json
@ -824,5 +824,6 @@
  "关闭":"Shut down",
  "传输中'":"In transit",
  "操作记录":"Operation record",
-  "修改姓名":"Modify name"
+  "修改姓名":"Modify name",
+  "传输中":"In transit"
 }
--- a/star_lock/images/lan/lan_keys.json
+++ b/star_lock/images/lan/lan_keys.json
@ -852,5 +852,6 @@
  "关闭":"关闭",
  "传输中'":"传输中",
  "操作记录":"操作记录",
-  "修改姓名":"修改姓名"
+  "修改姓名":"修改姓名",
+  "传输中":"传输中"
 }
--- a/star_lock/images/lan/lan_zh.json
+++ b/star_lock/images/lan/lan_zh.json
@ -855,5 +855,6 @@
  "关闭":"关闭",
  "传输中'":"传输中",
  "操作记录":"操作记录",
-  "修改姓名":"修改姓名"
+  "修改姓名":"修改姓名",
+  "传输中":"传输中"
 }