From 92dab966727b26c69a8a1d5839b064f7942895e8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 五月 2024 09:20:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/lang/locales/en-US.json |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 2ef6fd2..4d61c84 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,10 @@
 {
   "Clear":"Clear",
   "ip":"192.168.10.21",
+  "Mes Connection failed":"Mes Connection failed",
+  "Plc1 Connection failed":"Plc1 Connection failed",
+  "Plc2 Connection failed":"Plc2 Connection failed",
+  "Remaining width:":"Remaining width:",
   "systemTitle": "Login System",
   "usernamePlaceholder": "Please enter username",
   "passwordPlaceholder": "Please enter password",
@@ -173,6 +177,7 @@
   },
   "Electrical": "Electrical",
   "Parameter": "Manual/Automatic",
+  "Manual/Automatic": "Manual/Automatic",
   "Action": "Action",
   "Sign": "Sign",
   "State": "State",
@@ -300,8 +305,10 @@
   "Scan Code Point":"Scan Code Point",
   "Upper film position":"Upper film position",
   "Glass Information":"Glass Information",
-  "current Information":"current information",
-  "Modify Information":"Modify information",
+  "D01 Current Information": "D01 Current Information",
+  "D02 Current Information": "D02 Current Information",
+  "D01 Modify Information": "D01 Modify Information",
+  "Scan Code Information":"Scan Code Information",
   "Clear Current":"Clear Current",
   "Confirm":"Confirm",
   "The glass ID already exists in the loading queue":"The glass ID already exists in the loading queue",

--
Gitblit v1.8.0