From 4c70d9f0656bbec48fa619f2ec9aa0ee12fca2c1 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 04 十二月 2023 09:04:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/zh-CN.json | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 49d0c11..b232931 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -301,10 +301,16 @@
"In the queue":"鍦ㄩ槦鍒�",
"Enter the Frame No":"璇疯緭鍏ラ摑妗唅d",
"Manually Infeed Glass":"鎵嬪姩杩涚墖",
+ "Normal":"姝ｅ父",
+ "Entering":"姝ｅ湪杩�",
+ "Outing":"姝ｅ湪鍑�",
+ "Suspend":"鏆傚仠",
+ "Stop":"鍋滄",
+ "Start":"寮�濮�",
"langparameter": {
- "conveyor Velocity(Auto FAST)": "鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
- "conveyor Velocity(Auto SLOW)": "鐨甫杈撻�佽嚜鍔ㄦ參閫�",
- "conveyor Velocity(Manual)": "鐨甫杈撻�佹墜鍔ㄩ�熷害",
+ "conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
+ "conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
+ "conveyor Velocity(Manual)": "D01-D06 鐨甫杈撻�佹墜鍔ㄩ�熷害",
"A01 A02 TURN JOG Velocity": "A01 A02 缈昏浆鐐瑰姩閫熷害",
"A01 A02 TRAVEL JOG Velocity": "A01 A02 琛岃蛋鐐瑰姩閫熷害",
"B01 B02 TRAVEL JOG Velocity": "B01 B02 琛岃蛋鐐瑰姩閫熷害",
--
Gitblit v1.8.0