From c85904597bf93e0fbae321093a970dd973b0f64f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 13 五月 2024 13:54:28 +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, 6 insertions(+), 2 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 459641e..aa0348d 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,7 +1,11 @@
{
"Clear":"Clear",
- "ip":"localhost",
+ "ip":"192.168.10.21",
"Abort":"Abort",
+ "Current scan":"Current scan",
+ "Interior Out Bypass: Right":"Interior Out Bypass: Right",
+ "Interior Out Bypass: Left":"Interior Out Bypass: Left",
+ "Remove Frame":"Remove Frame",
"Mes Connection failed":"Mes Connection failed",
"Plc1 Connection failed":"Plc1 Connection failed",
"Plc2 Connection failed":"Plc2 Connection failed",
@@ -353,7 +357,7 @@
"Sorting State":"Sorting State",
"Confirm State":"Confirm State",
"Next":"Next",
- "Current Frame":"Current Frame",
+ "Current Frame on Belt":"Current Frame on Belt",
"Outside":"Outside",
"Inside":"Inside",
"Cancel":"Cancel",
--
Gitblit v1.8.0