From 5531d68265411878fdf6d67200e339670046d7e2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 九月 2023 14:33:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

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

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index abcaf71..e85ed6b 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -193,6 +193,7 @@
   "langResetButton": "閲嶇疆",
   "langCancelButton": "鍙栨秷",
   "langRegisterSuccessMessage": "娉ㄥ唽鎴愬姛",
+
   "娣诲姞鐢ㄦ埛鎴愬姛":"娣诲姞鐢ㄦ埛鎴愬姛",
   "confirmResetPassword": "纭閲嶇疆瀵嗙爜涓洪粯璁ゅ�煎悧锛�",
   
@@ -214,6 +215,44 @@
 "confirmButtonText": "纭畾",
 "cancelButtonText": "鍙栨秷",
 "deleteSuccessMessage": "鍒犻櫎鎴愬姛",
-"deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�"
+"deleteCancelledMessage": "宸插彇娑堝垹闄ゆ搷浣�",
+
+
+
+  "Enter the glass lD":"杈撳叆鐜荤拑id",
+  "Manually feed the glass":"鎵嬪姩涓婄墖",
+  "Enter the order number":"杈撳叆璁㈠崟鍙�",
+  "Exit the glass by order number":"鎸夎鍗曞嚭鐗�",
+  "Please confirm the glass information":"璇风‘璁ょ幓鐠冧俊鎭�",
+  "Please confirm the Ordering Information":"璇风‘璁よ鍗曚俊鎭�",
+  "Alarm Information":"鎶ヨ淇℃伅",
+  "Cage Details":"鐞嗙墖绗艰鎯�",
+  "order":"璁㈠崟",
+  "length":"闀�",
+  "width":"瀹�",
+  "coating":"娑傚眰",
+  "Operate":"鎿嶄綔",
+  "end task":"瀹屾垚浠诲姟",
+  "cancal":"鍙栨秷",
+  "confirm":"纭",
+  "number":"鏁伴噺",
+  "Coming out glass ID":"杩涚墖鐜荤拑id",
+  "Incoming glass ID":"鍑虹墖鐜荤拑id",
+  "The Cage number being used":"绗煎瓙",
+  "The Grille number being used":"鏍煎瓙",
+  "Order Nmuber":"璁㈠崟缂栧彿",
+  "Length and width":"灏哄",
+  "id":"id",
+  "content":"鍐呭",
+  "timeon":"鎶ヨ鏃堕棿",
+  "endTime":"缁撴潫鏃堕棿",
+
+  "The Cage number":"绗煎瓙",
+  "tier":"灞�",
+  "cell":"鏍煎瓙",
+  "glassid":"鐜荤拑id",
+  "order number":"璁㈠崟",
+  "delete":"鍒犻櫎",
+  "out":"鍑虹墖"
 
 }
\ No newline at end of file

--
Gitblit v1.8.0