From 3ab0fb6281f55924d49d7e28bd6655d59b2a346d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 10 五月 2024 09:37:36 +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, 4 insertions(+), 4 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index d261697..197fd40 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,5 +1,5 @@
{
- "Clear":"娓呴櫎",
+ "Confirmation needed":"娓呴櫎",
"ip":"192.168.10.21",
"Mes Connection failed":"Mes杩炴帴澶辫触",
"Plc1 Connection failed":"Plc1杩炴帴澶辫触",
@@ -241,7 +241,7 @@
"Length": "闀�",
"Width": "瀹�",
"Operate": "鎿嶄綔",
- "Terminate Task":"缁撴潫浠诲姟",
+ "Task Complete":"缁撴潫浠诲姟",
"end task": "瀹屾垚浠诲姟",
"Number": "鏁伴噺",
"Outfeed glass barcode": "鍑虹墖鐜荤拑id",
@@ -259,7 +259,7 @@
"Slot No": "鏍煎瓙",
"Barcode": "鐜荤拑id",
"Delete": "鍒犻櫎",
- "Out": "鍑虹墖",
+ "Outfeed": "鍑虹墖",
"Operation successful": "鎿嶄綔鎴愬姛",
"Operation canceled": "鎿嶄綔鍙栨秷",
"There is no such order": "娌℃湁姝よ鍗曠殑鐜荤拑",
@@ -308,7 +308,7 @@
"Confirm": "纭",
"The glass ID already exists in the loading queue": "涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
"This glass ID already exists in the sorting cage": "鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id",
- "Outing Queue":"鍑虹墖闃熷垪",
+ "Outfeed Queue":"鍑虹墖闃熷垪",
"Enter the Aluminum Frame No":"璇疯緭鍏ラ摑妗唅d",
"Frame No":"閾濇id",
"Glass information corresponding to aluminum frame":"閾濇瀵瑰簲鐨勭幓鐠冧俊鎭�",
--
Gitblit v1.8.0