From a02a16dfd84129e32c18dfa5cbd87b6dc86086cf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 29 十二月 2024 20:07:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index aa7d807..f849d93 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -87,6 +87,22 @@
layoutSequence:'Serial Number',
},
sorter:{
+ onesort:'涓�绾挎幇鐗�',
+ twosort:'浜岀嚎鎺扮墖',
+ inPlace:'鍒颁綅',
+ ninPlace:'鏈埌浣�',
+ emptymissions:'绌轰换鍔�',
+ advancetask:'杩涚墖浠诲姟',
+ outputtasks:'鍑虹墖浠诲姟',
+ straighttasks:'鐩撮�氫换鍔�',
+ endingtask:'缁撴潫',
+ another:'鍏朵粬',
+ taskRunning:'浠诲姟璇锋眰',
+ updateTime:'鏇存柊鏃堕棿',
+ id:'纾ㄨ竟鍓嶇悊鐗囩琛↖D',
+ remainWidth:'鍓╀綑',
+ place:'鏄惁鍒颁綅',
+ layernow:'褰撳墠灞傚彿',
gridnumber:'Grid number',
glassnumber:'Glass number',
width:'Width',
@@ -107,15 +123,26 @@
projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
dilapidation:'Breakage',
takeaway:'Manual removal',
+ takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
takeon:'The arrangement is complete',
},
searchOrder:{
+ empty:'榛樿绌轰换鍔�',
+ historicaltasks:'鍘嗗彶浠诲姟',
+ cagedetails:'绗煎唴璇︽儏',
+ inkageEntity:'杩涚墖鑱旀満鐘舵�侊細',
+ requestEntity:'杩涚墖璇锋眰鐘舵�侊細',
+ mesReplyEntity:'鍚姩鍛戒护锛�',
+ outInkageEntity:'鍑虹墖鑱旀満鐘舵�侊細',
+ outRequestEntity:'鍑虹墖璇锋眰鐘舵�侊細',
+ breakagn:'鏈牬鎹�',
+ lacknumber:'缂虹墖鏁伴噺',
processcard:'鎸囧畾娴佺▼鍗�',
filminformation:'浜哄伐涓嬬墖淇℃伅',
currentglassinformation:'鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
printlabels:'鎵撳嵃鏍囩',
- deleteTask:'鍒犻櫎宸ョ▼',
- pdeleteTask:'鏄惁鍒犻櫎宸ョ▼锛�',
+ deleteTask:'缁撴潫宸ョ▼',
+ pdeleteTask:'鏄惁缁撴潫宸ョ▼锛�',
searchlayout:'Non-tempered process card inquiry',
fullfurnaces:'Number of full furnaces',
specifiedproject:'The currently specified project',
@@ -646,6 +673,9 @@
finegrinding: '绮剧（',
},
hellow: {
+ stopproject: '鏆傚仠浠诲姟',
+ pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
+ reviewproject: '棰勮宸ョ▼',
line: '绾胯矾',
line1: '绾胯矾涓�',
line2: '绾胯矾浜�',
--
Gitblit v1.8.0