From 36de27dcf89a1a651c6498f3dc4c8fd872ca3f92 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 13 九月 2023 17:17:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

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

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index c8d6f5c..4eeba01 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -196,6 +196,80 @@
   "langResetButton": "閲嶇疆",
   "langCancelButton": "鍙栨秷",
   "langRegisterSuccessMessage": "娉ㄥ唽鎴愬姛",
+
+  "娣诲姞鐢ㄦ埛鎴愬姛":"娣诲姞鐢ㄦ埛鎴愬姛",
+  "confirmResetPassword": "纭閲嶇疆瀵嗙爜涓洪粯璁ゅ�煎悧锛�",
+  
+  "confirm": "纭畾",
+  "cancel": "鍙栨秷",
+  "passwordResetSuccess": "瀵嗙爜宸查噸缃负榛樿鍊�",
+  "confirmDeleteCategory": "姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ュ垎绫�, 鏄惁缁х画?",
+  "prompt": "鎻愮ず",
+  "userDeleteSuccess": "鍒犻櫎鐢ㄦ埛鎴愬姛",
+  "deleteCanceled": "宸插彇娑堝垹闄�",
+  "addUserSuccess": "娣诲姞鐢ㄦ埛鎴愬姛",
+  "editUserSuccess": "淇敼鐢ㄦ埛鎴愬姛",
+  "effective": "鏈夋晥",
+"invalid": "鏃犳晥",
+
+"addSuccessMessage": "娣诲姞鎴愬姛",
+"deleteConfirmMessage": "纭畾瑕佸垹闄よ鏉冮檺鍚楋紵",
+
+"confirmButtonText": "纭畾",
+"cancelButtonText": "鍙栨秷",
+"deleteSuccessMessage": "鍒犻櫎鎴愬姛",
+"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":"鍑虹墖",
+
+  "Operation successful":"鎿嶄綔鎴愬姛",
+  "Operation canceled":"鎿嶄綔鍙栨秷",
+  "There is no such order":"娌℃湁姝よ鍗曠殑鐜荤拑",
+  "There are currently tasks":"褰撳墠鏈変换鍔�",
+  "There is no such glass":"娌℃湁姝ょ幓鐠�",
+  "There is no such grid":"娌℃湁绌洪棽鏍煎瓙",
+  "No delete allowed":"涓嶈兘鍒犻櫎",
+  "No out allowed":"涓嶈兘鍑虹墖",
+  "Are you sure to perform this operation ?":"纭畾鎵ц姝ゆ搷浣�?",
+  "prompt":"鎻愮ず",
+  "Yes":"鏄�",
+  "No":"鍚�",
   "today": "浠婂ぉ",
   "yesterday": "鏄ㄥぉ",
   "week": "涓�鍛ㄥ墠",

--
Gitblit v1.8.0