From 85a0a75ab65874f8c010df5ba9cec0d97bf84708 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 一月 2024 08:19:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 313dcc4..b100ef2 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,5 @@
{
-
- "ip": "localhost",
+ "ip":"localhost",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -39,6 +38,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",
@@ -270,7 +272,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 +285,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",
@@ -300,7 +302,7 @@
"current Information":"current information",
"Modify Information":"Modify information",
"Clear Current":"Clear Current",
- "Confirm Modification":"Confirm modification",
+ "Confirm":"Confirm",
"The glass ID already exists in the loading queue":"The glass ID already exists in the loading queue",
"This glass ID already exists in the sorting cage":"This glass ID already exists in the sorting cage",
"Outing Queue":"Outing Queue",
@@ -308,7 +310,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",
@@ -326,6 +328,7 @@
"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",
@@ -333,6 +336,29 @@
"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",
+ "Next":"Next",
+ "Current Frame":"Current Frame",
+ "Outside":"Outside",
+ "Inside":"Inside",
+ "Cancel":"Cancel",
+ "Are you sure to clear this barcode ?":"Are you sure to clear this barcode ?",
+ "Terminate Feeding":"Terminate Feeding",
+ "Terminate Outing":"Terminate Outing",
+ "SoftEmergencyStop":"SoftEmergencyStop",
+ "Unable to clear glass ID in automatic mode":"Unable to clear glass ID in automatic mode",
+ "Are you sure you want an emergency stop ?":"Are you sure you want an emergency stop ?",
+ "Current State":"Current State",
+ "Automatic":"Automatic",
+ "Hand Movement":"Hand Movement",
+ "Please enter the correct glassID":"Please enter the correct glassID",
+ "Switch":"Switch",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
@@ -367,9 +393,9 @@
"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",
@@ -386,7 +412,12 @@
"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",
+ "杞�ュ仠": "emgHMI"
+
},
"langPositioning1": {
"鏍煎瓙闂磋窛": "GridSpacing",
@@ -533,9 +564,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