From 79e0a14068decac12cbd6c670639413f0fa9e18c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 09:42:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 85 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index b1acb4c..4d61c84 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -176,7 +176,7 @@
"B02 OUT pos error": "B02 OUT pos error"
},
"Electrical": "Electrical",
- "Parameter": "Parameter",
+ "Parameter": "Manual/Automatic",
"Manual/Automatic": "Manual/Automatic",
"Action": "Action",
"Sign": "Sign",
@@ -381,7 +381,7 @@
"A02缈昏浆瀹炴椂浣嶇疆": "A02FlipPosition",
"鏁呴殰": "Fault",
"澶嶄綅": "Reset",
- "鏈洖闆�": "NotZero",
+ "鏈洖闆�": "Homing Failure",
"鍥為浂": "Home",
"鐩爣鏍煎瓙": "Target Grid",
"A02 鎵�鍦ㄦ牸瀛�": "A02 Current Grid",
@@ -454,7 +454,7 @@
"缈昏浆瀹炴椂浣嶇疆": "FlipPosition",
"鏁呴殰": "Fault",
"澶嶄綅": "Reset",
- "鏈洖闆�": "NotZero",
+ "鏈洖闆�": "Homing Failure",
"鍥為浂": "Zero",
"鐩爣鏍煎瓙": "Target Grid",
"鏍煎瓙闂磋窛": "GridSpacing",
@@ -473,7 +473,9 @@
"190#鏍煎湴鍧�": "grid address190#",
"鍑虹墖鏍间綅缃瀹�": "OutgoingGridPositionSetting",
"B01鏍间綅缃瀹�":"B01PositionSetting",
- "B02浣嶇疆璁惧畾":"B02PositionSetting"
+ "B02浣嶇疆璁惧畾":"B02PositionSetting",
+ "A01鍘熺偣璁板繂":"A01 Calibration Pos",
+ "A02鍘熺偣璁板繂":"A02 Calibration Pos"
},
"langPositioning2": {
@@ -495,30 +497,30 @@
"B01鍚姩": "B01 Start",
"澶嶄綅": "Reset",
"鍥為浂": "Home",
- "鏈洖闆�": "NotZero",
+ "鏈洖闆�": "Homing Failure",
"B02鎵嬪姩鏍煎瓙": "B02 Target grid(Manual)",
"B02瀹氫綅閫熷害": "B02 TRAVEL POS Velocity manual",
"B02褰撳墠鏍煎瓙": "B02 Current Grid",
"B02鍚姩": "B02 Start",
"澶嶄綅": "Reset",
- "A01瀹炴椂浣嶇疆": "A01 tavel Actual Position",
- "A02瀹炴椂浣嶇疆": "A02 tavel Actual Position",
- "B01瀹炴椂浣嶇疆": "B02 tavel Actual Position",
- "B02瀹炴椂浣嶇疆": "B02 tavel Actual Position"
+ "A01瀹炴椂浣嶇疆": "A01 Actual Position",
+ "A02瀹炴椂浣嶇疆": "A02 Actual Position",
+ "B01瀹炴椂浣嶇疆": "B02 Actual Position",
+ "B02瀹炴椂浣嶇疆": "B02 Actual Position"
},
"Manualoneposition2lang": {
"A01鎵嬪姩浣嶇疆": "A01 turn Target Angle(Manual)",
"A01瀹氫綅閫熷害": "A01 TURN POS Velocity manual",
"A01缈昏浆瀹炴椂浣嶇疆": "A01 turn Actual angle",
- "A01缈昏浆鍚姩": "A01 SERVE TURN",
+ "A01缈昏浆鍚姩": "A01 Tilt",
"鏁呴殰": "Fault",
"澶嶄綅": "Reset",
- "鏈洖闆�": "NotZero",
+ "鏈洖闆�": "Homing Failure",
"鍥為浂": "Home",
"A02鎵嬪姩浣嶇疆": "A02 turn Target Angle(Manual)",
"A02瀹氫綅閫熷害": "A02 TURN POS Velocity manual",
"A02缈昏浆瀹炴椂浣嶇疆": "A02 turn Actual angle",
- "A02缈昏浆鍚姩": "A02 SERVE TURN",
+ "A02缈昏浆鍚姩": "A02 Tilt",
"A02澶嶄綅": "Reset"
@@ -546,37 +548,36 @@
"鎵嬪姩閫熷害": "Manual Speed"
},
"ManualJoglang": {
- "D01杈撻��": "D01 VFD conveyor",
- "D02杈撻��": "D02 VFD conveyor",
- "D03杈撻��": "D03 VFD conveyor",
- "D04杈撻��": "D04 VFD conveyor",
- "D05杈撻��": "D05 VFD conveyor",
- "D06杈撻��": "D06 VFD conveyor",
- "A01杈撻�佹鍚�": "A01 VFD conveyor",
- "A02杈撻�佹鍚�": "A02 VFD conveyor",
- "B01杈撻��": "B01 VFD conveyor",
- "B02杈撻��": "B02 VFD conveyor",
- "A01缈昏浆": "A01 SERVE TURN",
- "A02缈昏浆": "A02 SERVE TURN",
- "A01琛岃蛋鐐瑰姩": "A01 SERVE TRAVEL",
- "A02琛岃蛋鐐瑰姩": "A02 SERVE TRAVEL",
- "B01琛岃蛋鐐瑰姩": "B01 SERVE TRAVEL",
- "B02琛岃蛋鐐瑰姩": "B02 SERVE TRAVEL",
- "B02缈昏浆姘旂几": "B02 Solenoid TURN",
- "B02鍗囬檷姘旂几": "B02 Solenoid UP DOWN",
- "B02鍚规皵": "B02 Solenoid Gassing",
- "B01缈昏浆姘旂几": "B01 Solenoid TURN",
- "B01鍗囬檷姘旂几": "B01 Solenoid UP DOWN",
- "B01鍚规皵": "B01 Solenoid Gassing",
- "A01杈撻�佸弽鍚�": "A01 VFD conveyor reverse",
- "A02杈撻�佸弽鍚�": "A02 VFD conveyor reverse",
- "A01娉ㄧ數娉�": "A01 oil pump",
- "A02娉ㄧ數娉�": "A02 oil pump",
- "A01琛岃蛋浼烘湇鍥為浂":"A01 SERVE TRAVEL Home",
- "A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home"
+ "D01杈撻��": "D01",
+ "D02杈撻��": "D02",
+ "D03杈撻��": "D03",
+ "D04杈撻��": "D04",
+ "D05杈撻��": "D05",
+ "D06杈撻��": "D06",
+ "A01杈撻�佹鍚�": "ConvCyor",
+ "A02杈撻�佹鍚�": "ConvCyor",
+ "B01杈撻��": "ConvCyor",
+ "B02杈撻��": "ConvCyor",
+ "A01缈昏浆": "Tilt",
+ "A02缈昏浆": "Tilt",
+ "A01琛岃蛋鐐瑰姩": "Drive",
+ "A02琛岃蛋鐐瑰姩": "Drive",
+ "B01琛岃蛋鐐瑰姩": "Drive",
+ "B02琛岃蛋鐐瑰姩": "Drive",
+ "B02缈昏浆姘旂几": "Tilt Cyl",
+ "B02鍗囬檷姘旂几": "V Cylinder",
+ "B02鍚规皵": "Air blow",
+ "B01缈昏浆姘旂几": "Tilt Cyl",
+ "B01鍗囬檷姘旂几": "V Cylinder",
+ "B01鍚规皵": "Air blow",
+ "A01杈撻�佸弽鍚�": "ConvCyor",
+ "A02杈撻�佸弽鍚�": "ConvCyor",
+ "A01娉ㄧ數娉�": "Oil Pump",
+ "A02娉ㄧ數娉�": "Oil Pump",
+ "A01鍘熺偣璁板繂":"A01 Calibration Pos",
+ "A02鍘熺偣璁板繂":"A02 Calibration Pos"
},
- "A01琛岃蛋浼烘湇鍥為浂":"A01 SERVE TRAVEL Home",
- "A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home",
+
"Set":"Set"
--
Gitblit v1.8.0