From b5e913e90d7cd40a329663276954cd4d397afef5 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 24 十二月 2024 10:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 1899cd1..d869048 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,9 +121,15 @@
projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
dilapidation:'Breakage',
takeaway:'Manual removal',
+ takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
takeon:'The arrangement is complete',
},
searchOrder:{
+ inkageEntity:'杩涚墖鑱旀満鐘舵�侊細',
+ requestEntity:'杩涚墖璇锋眰鐘舵�侊細',
+ mesReplyEntity:'鍚姩鍛戒护锛�',
+ outInkageEntity:'鍑虹墖鑱旀満鐘舵�侊細',
+ outRequestEntity:'鍑虹墖璇锋眰鐘舵�侊細',
breakagn:'鏈牬鎹�',
lacknumber:'缂虹墖鏁伴噺',
processcard:'鎸囧畾娴佺▼鍗�',
--
Gitblit v1.8.0