From 058a11fb3ff22c77a152853794fe1aae13cee640 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 06 十二月 2023 10:23:49 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index a7667ae..0030697 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,4 +1,6 @@
{
+
+ "ip": "192.168.10.21",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -437,14 +439,14 @@
"B01鎵嬪姩鏍煎瓙": "B01 Target grid(Manual)",
"B01瀹氫綅閫熷害": "B01 TRAVEL POS Velocity manual",
"B01褰撳墠鏍煎瓙": "B01 Current Grid",
- "B01鍚姩": "Start",
+ "B01鍚姩": "B01 Start",
"澶嶄綅": "Reset",
"鍥為浂": "Zero",
"鏈洖闆�": "NotZero",
"B02鎵嬪姩鏍煎瓙": "B02 Target grid(Manual)",
"B02瀹氫綅閫熷害": "B02 TRAVEL POS Velocity manual",
"B02褰撳墠鏍煎瓙": "B02 Current Grid",
- "B02鍚姩": "Start",
+ "B02鍚姩": "B02 Start",
"澶嶄綅": "Reset",
"A01瀹炴椂浣嶇疆": "A01 tavel Actual Position",
"A02瀹炴椂浣嶇疆": "A02 tavel Actual Position",
--
Gitblit v1.8.0