From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/lang/en.js |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 1899cd1..e81910d 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -87,6 +87,20 @@
           layoutSequence:'Serial Number',
       },
       sorter:{
+          inPlace:'鍒颁綅',
+          ninPlace:'鏈埌浣�',
+          emptymissions:'绌轰换鍔�',
+          advancetask:'杩涚墖浠诲姟',
+          outputtasks:'鍑虹墖浠诲姟',
+          straighttasks:'鐩撮�氫换鍔�',
+          endingtask:'缁撴潫',
+          another:'鍏朵粬',
+          taskRunning:'浠诲姟璇锋眰',
+          updateTime:'鏇存柊鏃堕棿',
+          id:'纾ㄨ竟鍓嶇悊鐗囩琛↖D',
+          remainWidth:'鍓╀綑',
+          place:'鏄惁鍒颁綅',
+          layernow:'褰撳墠灞傚彿',
           gridnumber:'Grid number',
           glassnumber:'Glass number',
           width:'Width',
@@ -107,6 +121,7 @@
           projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
           dilapidation:'Breakage',
           takeaway:'Manual removal',
+          takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
           takeon:'The arrangement is complete',
       },
       searchOrder:{

--
Gitblit v1.8.0