From 12c065f48d6a4f5b1489da95f2091edb9a831196 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 21 十二月 2023 13:07:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 313dcc4..34f5b2d 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -270,7 +270,7 @@
"There is no glass for this order":"There is no glass for this order",
"There are currently tasks":"There are currently tasks",
"There is no such glass":"There is no such glass",
- "There is no such slot":"There is no such slot",
+ "There is no such grid":"There is no such grid",
"No delete allowed":"No delete allowed",
"No out allowed":"No out allowed",
"Are you sure to perform this operation ?":"Are you sure to perform this operation ?",
@@ -283,7 +283,7 @@
"DataBase Connection failed":"DataBase Connection failed",
"Distribute parameters":"Distribute parameters",
"The glass size is not within the range":"The glass size is not within the range",
- "Increase":"Increase",
+ "Add":"Add",
"Enable":"Enable",
"Disable":"Disable",
"Usage":"Usage",
@@ -308,7 +308,7 @@
"Frame No":"Frame No",
"Glass information corresponding to aluminum frame":"Glass information corresponding to aluminum frame",
"In the cage":"In the cage",
- "Flip":"Flip",
+ "Flipped":"Flipped",
"In the queue":"In the queue",
"Normal":"Normal",
"Entering":"Entering",
@@ -333,6 +333,9 @@
"Glass State":"Glass State",
"Absent":"Absent",
"Approximately resettable time":"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",
+ "Complete Task":"Complete Task",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
@@ -386,7 +389,11 @@
"A02鎵�鍦ㄦ牸瀛�": "A02 Current Grid",
"B01鎵�鍦ㄦ牸瀛�": "B01 Current Grid",
"B02鎵�鍦ㄦ牸瀛�": "B02 Current Grid",
- "鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨": "Abort/ResumeTasks"
+ "鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨": "Abort/ResumeTasks",
+ "A01缁堟/缁х画": "A01Abort/ResumeTasks",
+ "A02缁堟/缁х画": "A02Abort/ResumeTasks",
+ "瀛樼墖绛夊緟寤舵椂": "Storage wait delay"
+
},
"langPositioning1": {
"鏍煎瓙闂磋窛": "GridSpacing",
@@ -533,9 +540,9 @@
"A02娉ㄧ數娉�": "A02 oil pump",
"A01琛岃蛋浼烘湇鍥為浂":"A01 SERVE TRAVEL Home",
"A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home"
- }
-
+ },
+ "A01琛岃蛋浼烘湇鍥為浂":"A01 SERVE TRAVEL Home",
+ "A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home"
-
}
\ No newline at end of file
--
Gitblit v1.8.0