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/zh-CN.json |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 5cf1fcc..d261697 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,6 +1,10 @@
 {
   "Clear":"娓呴櫎",
   "ip":"192.168.10.21",
+  "Mes Connection failed":"Mes杩炴帴澶辫触",
+  "Plc1 Connection failed":"Plc1杩炴帴澶辫触",
+  "Plc2 Connection failed":"Plc2杩炴帴澶辫触",
+  "Remaining width:":"鍓╀綑瀹藉害:",
   "systemTitle": "鐧诲綍绯荤粺",
   "usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
   "passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
@@ -171,6 +175,7 @@
   },
   "Electrical": "璁惧绠$悊",
   "Parameter": "鍙傛暟璁剧疆",
+  "Manual/Automatic": "鎵嬪姩/鑷姩",
   "Action": "寮�鍏虫帶鍒�",
   "Sign": "IO鐘舵��",
   "State": "鐘舵��",
@@ -295,8 +300,10 @@
   "Scan Code Point": "鎵爜浣�",
   "Upper film position": "涓婄墖浣�",
   "Glass Information": "鐜荤拑淇℃伅",
-  "current Information": "褰撳墠淇℃伅",
-  "Modify Information": "淇敼淇℃伅",
+  "D01 Current Information": "D01褰撳墠淇℃伅",
+  "D02 Current Information": "D02褰撳墠淇℃伅",
+  "D01 Modify Information": "D01寰呯‘璁�",
+  "Scan Code Information":"鎵爜淇℃伅",
   "Clear Current": "娓呴櫎褰撳墠",
   "Confirm": "纭",
   "The glass ID already exists in the loading queue": "涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",

--
Gitblit v1.8.0