From aff3977ee493cfa7554792285100c7b6407e1d74 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 20 十二月 2023 13:34:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/zh-CN.json | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 28dcca4..a7b7d97 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,5 +1,5 @@
{
- "ip": "192.168.10.21",
+ "ip": "localhost",
"systemTitle": "鐧诲綍绯荤粺",
"usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
"passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
@@ -252,7 +252,7 @@
"There is no such order": "娌℃湁姝よ鍗曠殑鐜荤拑",
"There are currently tasks": "褰撳墠鏈変换鍔�",
"There is no such glass": "娌℃湁姝ょ幓鐠�",
- "There is no such grid": "娌℃湁绌洪棽鏍煎瓙",
+ "There is no such slot": "娌℃湁绌洪棽鏍煎瓙",
"No delete allowed": "涓嶈兘鍒犻櫎",
"No out allowed": "涓嶈兘鍑虹墖",
"Are you sure to perform this operation ?": "纭畾鎵ц姝ゆ搷浣�?",
@@ -273,7 +273,7 @@
"DataBase Connection failed": "鏁版嵁搴撹繛鎺ュけ璐�",
"Distribute parameters": "涓嬪彂鍙傛暟",
"The glass size is not within the range": "鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
- "Increase": "娣诲姞",
+ "Add": "娣诲姞",
"Enable": "鍚敤",
"Disable": "绂佺敤",
"Usage": "浣跨敤鐜�",
@@ -293,12 +293,12 @@
"Confirm Modification": "纭淇敼",
"The glass ID already exists in the loading queue": "涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
"This glass ID already exists in the sorting cage": "鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id",
- "Production queue":"涓婄墖闃熷垪",
+ "Outing Queue":"鍑虹墖闃熷垪",
"Enter the Aluminum Frame No":"璇疯緭鍏ラ摑妗唅d",
"Frame No":"閾濇id",
"Glass information corresponding to aluminum frame":"閾濇瀵瑰簲鐨勭幓鐠冧俊鎭�",
"In the cage":"鍦ㄧ鍐�",
- "Flip":"缈昏浆",
+ "Flipped":"缈昏浆",
"In the queue":"鍦ㄩ槦鍒�",
"Enter the Frame No":"璇疯緭鍏ラ摑妗唅d",
"Manually Infeed Glass":"鎵嬪姩杩涚墖",
@@ -310,6 +310,23 @@
"Start":"寮�濮�",
"Sequence":"椤哄簭",
"Position":"浣嶇疆",
+ "Top":"缃《",
+ "Up":"涓婄Щ",
+ "Down":"涓嬬Щ",
+ "You do not have this permission":"You do not have this permission",
+ "Unable to find the placement method of the aluminum frame":"鏌ヨ涓嶅埌閾濇鎽嗘斁鏂瑰紡",
+ "Unable to find whether the aluminum frame is flipped or not":"鏌ヨ涓嶅埌閾濇鏄惁缈昏浆",
+ "This glass is already in the Queue":"姝ょ幓鐠冨凡鍦ㄥ嚭鐗囬槦鍒椾腑",
+ "Complete":"瀹屾垚",
+ "Not Allow":"涓嶅厑璁�",
+ "Completed":"宸插畬鎴�",
+ "Waiting":"绛夊緟涓�",
+ "Deleted":"宸插垹闄�",
+ "Glass State":"鐜荤拑鐘舵��",
+ "Absent":"涓嶅瓨鍦�",
+ "Approximately resettable time":"鍙浣嶅ぇ姒傛椂闂�",
+ "EXTERIQR OUT AND BYPASS TO THE LEFT":"EXTERIQR OUT AND BYPASS TO THE LEFT",
+ "EXTERIQR OUT AND BYPASS TO THE RIGHT":"EXTERIQR OUT AND BYPASS TO THE RIGHT",
"langparameter": {
"conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
--
Gitblit v1.8.0