From 0c1eda923c60852f9652f1b9444230c256dad178 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 23 四月 2024 09:49:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 34f5b2d..19d8a6b 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,6 @@
{
-
- "ip": "localhost",
+ "Clear":"Clear",
+ "ip":"localhost",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -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",
@@ -290,7 +293,7 @@
"Space (Pieces)":"Space (Pieces)",
"This glass is already in the cage":"This glass is already in the cage",
"Enter the Order No":"Enter the Order No",
- "OrderInfo":"OrderInfo",
+ "Order Info":"Order Info",
"Query":"Query",
"permission update":"permission update",
"query was successful":"query was successful",
@@ -300,7 +303,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",
@@ -326,6 +329,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",
@@ -336,6 +340,28 @@
"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",
+ "This frame has glass that is currently outing":"This frame has glass that is currently outing",
+ "The slot is disabled":"The slot is disabled",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
@@ -370,9 +396,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",
@@ -392,7 +418,8 @@
"鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨": "Abort/ResumeTasks",
"A01缁堟/缁х画": "A01Abort/ResumeTasks",
"A02缁堟/缁х画": "A02Abort/ResumeTasks",
- "瀛樼墖绛夊緟寤舵椂": "Storage wait delay"
+ "瀛樼墖绛夊緟寤舵椂": "Storage wait delay",
+ "杞�ュ仠": "emgHMI"
},
"langPositioning1": {
@@ -542,7 +569,8 @@
"A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home"
},
"A01琛岃蛋浼烘湇鍥為浂":"A01 SERVE TRAVEL Home",
- "A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home"
+ "A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home",
+ "Set":"Set"
}
\ No newline at end of file
--
Gitblit v1.8.0