From 3ab0fb6281f55924d49d7e28bd6655d59b2a346d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 10 五月 2024 09:37:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 4d61c84..6df853d 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,5 +1,5 @@
{
- "Clear":"Clear",
+ "Confirmation needed":"Confirmation needed",
"ip":"192.168.10.21",
"Mes Connection failed":"Mes Connection failed",
"Plc1 Connection failed":"Plc1 Connection failed",
@@ -251,7 +251,7 @@
"Length":"Length",
"Width":"Width",
"Operate":"Operate",
- "Terminate Task":"Terminate Task",
+ "Task Complete":"Task Complete",
"cancel":"cancel",
"confirm":"confirm",
"Number":"Number",
@@ -271,7 +271,7 @@
"List No":"List No",
"Box No":"Box No",
"Delete":"Delete",
- "Out":"Out",
+ "Outfeed":"Outfeed",
"Operation successful":"Operation successful",
"Operation canceled":"Operation canceled",
@@ -313,7 +313,7 @@
"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",
+ "Outfeed Queue":"Outfeed Queue",
"Enter the Frame No":"Enter the Frame No",
"Frame No":"Frame No",
"Glass information corresponding to aluminum frame":"Glass information corresponding to aluminum frame",
--
Gitblit v1.8.0