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/py.js |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 37b5d18..f1ae786 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -87,6 +87,20 @@
         layoutSequence:'小械褉懈泄薪 薪芯屑械褉',
     },
     sorter: {
+        inPlace:'鍒颁綅',
+        ninPlace:'鏈埌浣�',
+        emptymissions:'绌轰换鍔�',
+        advancetask:'杩涚墖浠诲姟',
+        outputtasks:'鍑虹墖浠诲姟',
+        straighttasks:'鐩撮�氫换鍔�',
+        endingtask:'缁撴潫',
+        another:'鍏朵粬',
+        taskRunning:'浠诲姟璇锋眰',
+        remainWidth:'鍓╀綑',
+        id:'纾ㄨ竟鍓嶇悊鐗囩琛↖D',
+        updateTime:'鏇存柊鏃堕棿',
+        place:'鏄惁鍒颁綅',
+        layernow:'褰撳墠灞傚彿',
         gridnumber: '携褔械械泻 褋械褌泻谢邪',
         glassnumber: '袧芯屑械褉 褋褌邪泻谢邪',
         width: '楔懈褉懈薪邪',
@@ -107,15 +121,18 @@
         projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
         takeon:'鎽嗙墖瀹屾垚',
         dilapidation: '袩芯胁褉械卸写械薪懈械',
+        takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
         takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
     },
     searchOrder: {
+        breakagn:'鏈牬鎹�',
+        lacknumber:'缂虹墖鏁伴噺',
         processcard:'鎸囧畾娴佺▼鍗�',
         filminformation:'浜哄伐涓嬬墖淇℃伅',
         currentglassinformation:'鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
         printlabels:'鎵撳嵃鏍囩',
-        deleteTask:'鍒犻櫎宸ョ▼',
-        pdeleteTask:'鏄惁鍒犻櫎宸ョ▼锛�',
+        deleteTask:'缁撴潫宸ョ▼',
+        pdeleteTask:'鏄惁缁撴潫宸ョ▼锛�',
         searchlayout:'袟邪锌褉芯褋 薪械褌械屑锌械褉懈褉芯胁邪薪薪芯泄 褌械褏薪芯谢芯谐懈褔械褋泻芯泄 泻邪褉褌褘',
         fullfurnaces:'袣芯谢懈褔械褋褌胁芯 锌芯谢薪褘褏 锌械褔械泄',
         specifiedproject:'校泻邪蟹邪薪薪褘泄 胁 写邪薪薪褘泄 屑芯屑械薪褌 锌褉芯械泻褌',

--
Gitblit v1.8.0