From 5400d8b310ce6fe6919594a096f3a87307a66e61 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 11 一月 2024 08:47:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 135 ++++++++++++++++++++++++++++----------------
1 files changed, 85 insertions(+), 50 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 4a8de1b..422dbf4 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -39,6 +39,9 @@
"exit": "exit",
"changePassword": "changePassword",
"resetPassword": "resetPassword",
+ "Old password":"Old password",
+ "New password":"New password",
+ "Confirm password":"Confirm password",
"home": "Home",
"role": "role",
"langRoleManagement": "Role Management",
@@ -111,6 +114,8 @@
"鏈夋晥": "Valid",
"鏃犳晥": "Invalid",
"璇疯緭鍏ュ悕绉�": "Please enter a name",
+ "璇疯緭鍏ヨ鑹�": "Please enter a role",
+ "璇疯緭鍏ユ潈闄愭弿杩�":"Please enter a permission description",
"闀垮害鍦� 2 鍒� 15 涓瓧绗�": "Length between 2 and 15 characters",
"璇疯緭鍏ョ姸鎬�": "Please enter the status",
"娣诲姞瑙掕壊": "Add Role",
@@ -281,7 +286,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",
@@ -306,7 +311,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",
@@ -319,6 +324,26 @@
"Top":"Top",
"Up":"Up",
"Down":"Down",
+ "Unable to find the placement method of the aluminum frame":"Unable to find the placement method of the aluminum frame",
+ "Unable to find whether the aluminum frame is flipped or not":"Unable to find whether the aluminum frame is flipped or not",
+ "You do not have this permission":"You do not have this permission",
+ "This glass is already in the Queue":"This glass is already in the Queue",
+ "Complete":"Complete",
+ "Allow":"Allow",
+ "Not Allow":"Not Allow",
+ "Completed":"Completed",
+ "Waiting":"Waiting",
+ "Deleted":"Deleted",
+ "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",
+ "Outed":"Outed",
+ "Queue State":"Queue State",
+ "Sorting State":"Sorting State",
+ "Confirm State":"Confirm State",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
@@ -342,27 +367,20 @@
"A02鍗婅嚜鍔ㄥ惎鍔�": "A02 Semi-Auto Start",
"B01 鎵�鍦ㄦ牸瀛�": "B01 Current Grid",
"B02 鎵�鍦ㄦ牸瀛�": "B02 Current Grid"
+
},
"langParameter1": {
- "A01~A02杈撻��": "A01~A02 Conveying",
- "B01~B02杈撻��": "B01~B02 Conveying",
- "D01~D02杈撻��": "D01~D02 Conveying",
- "缈昏浆鐐瑰姩閫熷害": "Flip Jog Speed",
- "灏忚溅鐐瑰姩閫熷害": "Cart Jog Speed",
- "鏈�楂橀�熷害": "Max Speed",
- "楂橀�熺嚎閫熷害": "High-Speed Line Speed",
- "浣庨�熺嚎閫熷害": "Low-Speed Line Speed",
- "鎵嬪姩閫熷害": "Manual Speed"
+
},
"langParameter2": {
"D01鎵嬪姩鐘舵��": "D01 Manual Status",
"娓呴櫎ID": "Clear ID",
"ID": "ID",
- "A02ID": "ID",
- "B01ID": "ID",
- "B02ID": "ID",
+ "A02ID": "A02ID",
+ "B01ID": "B01ID",
+ "B02ID": "B02ID",
"D02鎵嬪姩鐘舵��": "D02 Manual Status",
"D03鎵嬪姩鐘舵��": "D03 Manual Status",
"D04鎵嬪姩鐘舵��": "D04 Manual Status",
@@ -378,7 +396,12 @@
"A01褰撳墠鏍煎瓙": "A01 Current Grid",
"A02鎵�鍦ㄦ牸瀛�": "A02 Current Grid",
"B01鎵�鍦ㄦ牸瀛�": "B01 Current Grid",
- "B02鎵�鍦ㄦ牸瀛�": "B02 Current Grid"
+ "B02鎵�鍦ㄦ牸瀛�": "B02 Current Grid",
+ "鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨": "Abort/ResumeTasks",
+ "A01缁堟/缁х画": "A01Abort/ResumeTasks",
+ "A02缁堟/缁х画": "A02Abort/ResumeTasks",
+ "瀛樼墖绛夊緟寤舵椂": "Storage wait delay"
+
},
"langPositioning1": {
"鏍煎瓙闂磋窛": "GridSpacing",
@@ -407,26 +430,27 @@
"澶嶄綅": "Reset",
"鏈洖闆�": "NotZero",
"鍥為浂": "Zero",
- "鐩爣鏍煎瓙": "Target Grid"
+ "鐩爣鏍煎瓙": "Target Grid",
+ "鏍煎瓙闂磋窛": "GridSpacing",
+ "瀛樼墖鎺ョ墖鍦板潃": "StorageReceivingAddress",
+ "鍑虹墖鎺ョ墖鍦板潃": "OutgoingReceivingAddress",
+ "瀛樼墖鏍间綅缃瀹�": "StorageGridPositionSetting",
+ "1#鏍煎湴鍧�": "grid address1# ",
+ "22#鏍煎湴鍧�": "grid address22#",
+ "43#鏍煎湴鍧�": "grid address43#",
+ "64#鏍煎湴鍧�": "grid address64#",
+ "85#鏍煎湴鍧�": "grid address85#",
+ "106#鏍煎湴鍧�": "grid address106#",
+ "127#鏍煎湴鍧�": "grid address127#",
+ "148#鏍煎湴鍧�": "grid address148#",
+ "169#鏍煎湴鍧�": "grid address169#",
+ "190#鏍煎湴鍧�": "grid address190#",
+ "鍑虹墖鏍间綅缃瀹�": "OutgoingGridPositionSetting",
+ "B01鏍间綅缃瀹�":"B01PositionSetting",
+ "B02浣嶇疆璁惧畾":"B02PositionSetting"
},
"langPositioning2": {
- "鏍煎瓙闂磋窛": "GridSpacing",
- "瀛樼墖鎺ョ墖鍦板潃": "StorageReceivingAddress",
- "鍑虹墖鎺ョ墖鍦板潃": "OutgoingReceivingAddress",
- "瀛樼墖鏍间綅缃瀹�": "StorageGridPositionSetting",
- "1#鏍煎湴鍧�": "grid address1# ",
- "22#鏍煎湴鍧�": "grid address22#",
- "43#鏍煎湴鍧�": "grid address43#",
- "64#鏍煎湴鍧�": "grid address64#",
- "85#鏍煎湴鍧�": "grid address85#",
- "106#鏍煎湴鍧�": "grid address106#",
- "127#鏍煎湴鍧�": "grid address127#",
- "148#鏍煎湴鍧�": "grid address148#",
- "169#鏍煎湴鍧�": "grid address169#",
- "190#鏍煎湴鍧�": "grid address190#",
- "鍑虹墖鏍间綅缃瀹�": "OutgoingGridPositionSetting",
- "B01鏍间綅缃瀹�":"B01PositionSetting",
- "B02浣嶇疆璁惧畾":"B02PositionSetting"
+
}, "ManualonePositionlang": {
"A01鎵嬪姩鏍煎瓙": "A01 Target grid(Manual)",
"A01瀹氫綅閫熷害": "A01 TRAVEL POS Velocity manual",
@@ -444,7 +468,7 @@
"B01褰撳墠鏍煎瓙": "B01 Current Grid",
"B01鍚姩": "B01 Start",
"澶嶄綅": "Reset",
- "鍥為浂": "Zero",
+ "鍥為浂": "Home",
"鏈洖闆�": "NotZero",
"B02鎵嬪姩鏍煎瓙": "B02 Target grid(Manual)",
"B02瀹氫綅閫熷害": "B02 TRAVEL POS Velocity manual",
@@ -464,14 +488,14 @@
"鏁呴殰": "Fault",
"澶嶄綅": "Reset",
"鏈洖闆�": "NotZero",
- "鍥為浂": "Zero",
+ "鍥為浂": "Home",
"A02鎵嬪姩浣嶇疆": "A02 turn Target Angle(Manual)",
"A02瀹氫綅閫熷害": "A02 TURN POS Velocity manual",
"A02缈昏浆瀹炴椂浣嶇疆": "A02 turn Actual angle",
- "A02缈昏浆鍚姩": "SERVE TURN",
- "A02澶嶄綅": "Reset",
- "鏈洖闆�": "NotZero",
- "鍥為浂": "Zero"
+ "A02缈昏浆鍚姩": "A02 SERVE TURN",
+ "A02澶嶄綅": "Reset"
+
+
},
"AutomaticParameterSettinglang": {
"A01琛岃蛋楂橀�熻搴�": "A01 turn Angle1",
@@ -484,7 +508,16 @@
"A02绗煎瓙瑙掑害": "A02 turn Angle4",
"澶ц溅鑷姩閫熷害": "A01 A02 TRAVEL POS Velocity AUTO",
"灏忚溅鑷姩閫熷害": "B01 B02 TRAVEL POS Velocity AUTO",
- "鑷姩缈昏浆閫熷害": "A01 A02 TURN POS Velocity AUTO"
+ "鑷姩缈昏浆閫熷害": "A01 A02 TURN POS Velocity AUTO",
+ "A01~A02杈撻��": "A01~A02 Conveying",
+ "B01~B02杈撻��": "B01~B02 Conveying",
+ "D01~D06杈撻��": "D01~D06 Conveying",
+ "缈昏浆鐐瑰姩閫熷害": "Flip Jog Speed",
+ "灏忚溅鐐瑰姩閫熷害": "Cart Jog Speed",
+ "鏈�楂橀�熷害": "Max Speed",
+ "楂橀�熺嚎閫熷害": "High-Speed Line Speed",
+ "浣庨�熺嚎閫熷害": "Low-Speed Line Speed",
+ "鎵嬪姩閫熷害": "Manual Speed"
},
"ManualJoglang": {
"D01杈撻��": "D01 VFD conveyor",
@@ -503,19 +536,21 @@
"A02琛岃蛋鐐瑰姩": "A02 SERVE TRAVEL",
"B01琛岃蛋鐐瑰姩": "B01 SERVE TRAVEL",
"B02琛岃蛋鐐瑰姩": "B02 SERVE TRAVEL",
- "B02缈昏浆姘旂几": "B02 YV TURN",
- "B02鍗囬檷姘旂几": "B02 YV UP DOWN",
- "B02鐢电闃�": "B02 YV Gassing",
- "B01缈昏浆姘旂几": "B01 YV TURN",
- "B01鍗囬檷姘旂几": "B01 YV UP DOWN",
- "B01鐢电闃�": "B01 YV Gassing",
+ "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"
- }
-
+ "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