From 79e0a14068decac12cbd6c670639413f0fa9e18c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 09:42:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/lang/locales/zh-CN.json |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index ad84968..d261697 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -180,6 +180,10 @@
   "Sign": "IO鐘舵��",
   "State": "鐘舵��",
   "Alarm": "鎶ヨ淇℃伅",
+
+  "Cage Positions":"绗煎瓙瀹氫綅",
+  "PLC-MES Info":"PLC浜や簰",
+  
   "Distribute": "涓嬪彂",
   "Search": "鎼滅储",
   "dvstate": {
@@ -516,9 +520,9 @@
     "D05.State": "D05.鐘舵��",
     "D06.State": "D06.鐘舵��"
   },
-  "Automatic State":"鑷姩鐘舵��",
+  "Glass Data":"鑷姩鐘舵��",
   "ManualJog":"寮�鍏虫帶鍒�",
-  "ManualonePosition":"鎵嬪姩瀹氫綅",
+  "Manual Control":"鎵嬪姩瀹氫綅",
   "Servomanualone":"鍗婅嚜鍔�",
   "Address parameter settings":"鍦板潃鍙傛暟璁剧疆",
   "Speed parameter settings":"閫熷害鍙傛暟璁剧疆",

--
Gitblit v1.8.0