From 4f3aa71ed602c1abbafa638591b20abc3c7be224 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 一月 2024 10:03:45 +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, 8 insertions(+), 3 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index cc0008c..b86982f 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -166,7 +166,7 @@
"B02 OUT pos error": "B02 OUT pos 閿欒"
},
"Electrical": "璁惧绠＄悊",
- "Parameter": "鍙傛暟涓嬪彂",
+ "Parameter": "鍙傛暟璁剧疆",
"Action": "寮�鍏虫帶鍒�",
"Sign": "IO鐘舵��",
"State": "璁惧鐘舵��",
@@ -333,6 +333,11 @@
"Queue State":"闃熷垪鐘舵��",
"Sorting State":"鎺掑簭鐘舵��",
"Confirm State":"纭鐘舵��",
+ "Next":"涓嬩竴涓�",
+ "Current Frame":"褰撳墠閾濇",
+ "Outside":"澶栦晶",
+ "Inside":"鍐呬晶",
+ "Cancel":"鍙栨秷",
"langparameter": {
"conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
@@ -420,7 +425,6 @@
"SafetyDoor.requset": "瀹夊叏闂ㄨ姹傝繘鍏�",
"SafetyDoor.confirm": "瀹夊叏闂ㄧ‘璁�",
"SafetyDoor.reset": "瀹夊叏闂ㄥ浣�",
- "Sspce":"澶囩敤",
"A01.SR left dec":"A01宸﹂敭閫�",
"A01.SR left in pos":"A01宸﹀埌浣�",
"A01.SR left safety":"A01宸﹀畨鍏�",
@@ -493,6 +497,7 @@
"ManualonePosition":"鎵嬪姩瀹氫綅",
"Servomanualone":"鍗婅嚜鍔�",
"Address parameter settings":"鍦板潃鍙傛暟璁剧疆",
- "Speed parameter settings":"閫熷害鍙傛暟璁剧疆"
+ "Speed parameter settings":"閫熷害鍙傛暟璁剧疆",
+ "InteractionState":"浜や簰鐘舵��"
}
\ No newline at end of file
--
Gitblit v1.8.0