From 17b8d077f7efe3db20344987cdad9da9d9ab3de6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 03 十一月 2023 15:21:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/zh-CN.json | 141 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 139 insertions(+), 2 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index ee14dae..fa58c91 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -164,10 +164,147 @@
"B02 OUT DEC error": "B02 OUT DEC 閿欒",
"B02 OUT pos error": "B02 OUT pos 閿欒"
},
+ "Electrical": "璁惧绠＄悊",
"Parameter": "鍙傛暟涓嬪彂",
"Action": "寮�鍏虫帶鍒�",
"Sign": "IO鐘舵��",
- "State": "State",
+ "State": "璁惧鐘舵��",
"Alarm": "鎶ヨ淇℃伅",
- "Distribute": "涓嬪彂"
+ "Distribute": "涓嬪彂",
+ "Search": "鎼滅储",
+ "dvstate": {
+ "automatic": "鑷姩",
+ "manual": "鎵嬪姩"
+ },
+ "langUsernameLabel": "鐢ㄦ埛鍚�",
+ "langPasswordLabel": "瀵嗙爜",
+ "langPasswordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
+ "langConfirmPasswordLabel": "纭瀵嗙爜",
+ "langConfirmPasswordPlaceholder": "璇风‘璁ゅ瘑鐮�",
+ "langEmailLabel": "閭",
+ "langQQLabel": "QQ",
+ "langQQPlaceholder": "璇疯緭鍏Q鍙风爜",
+ "langPhoneNumberLabel": "鎵嬫満鍙风爜",
+ "langPhoneNumberPlaceholder": "璇疯緭鍏ユ墜鏈哄彿鐮�",
+ "langUsernameRequiredMessage": "璇疯緭鍏ョ敤鎴峰悕",
+ "langUsernameLengthMessage": "鐢ㄦ埛鍚嶉暱搴﹀湪5鍒�15涓瓧绗︿箣闂�",
+ "langPasswordRequiredMessage": "璇疯緭鍏ュ瘑鐮�",
+ "langPasswordLengthMessage": "瀵嗙爜闀垮害鍦�5鍒�15涓瓧绗︿箣闂�",
+ "langEmailRequiredMessage": "璇疯緭鍏ラ偖绠�",
+ "langEmailFormatMessage": "閭鏍煎紡涓嶆纭�",
+ "langRegisterButton": "娉ㄥ唽",
+ "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",
+ "Infeed barcodid":"鎵嬪姩涓婄墖",
+ "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":"瀹�",
+ "Operate":"鎿嶄綔",
+ "end task":"瀹屾垚浠诲姟",
+ "cancel":"鍙栨秷",
+ "confirm":"纭",
+ "number":"鏁伴噺",
+ "Outfeed Barcodid":"鍑虹墖鐜荤拑id",
+ "Infeed Barcodid":"杩涚墖鐜荤拑id",
+ "The Cage number being used":"绗煎瓙",
+ "The Slot number being used":"鏍煎瓙",
+ "Order Nmuber":"璁㈠崟缂栧彿",
+ "List Number":"鍒楄〃缂栧彿",
+ "Box Number":"绠卞瓙缂栧彿",
+ "Length and Width":"灏哄",
+ "id":"id",
+ "content":"鍐呭",
+ "timeon":"鎶ヨ鏃堕棿",
+ "endTime":"缁撴潫鏃堕棿",
+
+ "The Cage number":"绗煎瓙",
+ "The Side":"鍐呭渚�",
+ "The Slot Number":"鏍煎瓙",
+ "Barcodid":"鐜荤拑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": "涓�鍛ㄥ墠",
+ "shijian": "鏃ユ湡",
+ "Pick a day": "閫夋嫨鏃ユ湡",
+ "alarmid": "id",
+ "alacontent": "鎶ヨ鍐呭",
+ "time-on": "寮�濮嬫椂闂�",
+ "End-Time": "缁撴潫鏃堕棿",
+
+ "Please enter the password":"璇疯緭鍏ュ瘑鐮�",
+ "Password error":"瀵嗙爜閿欒",
+ "DataBase Connection failed":"鏁版嵁搴撹繛鎺ュけ璐�",
+ "Distribute parameters":"涓嬪彂鍙傛暟",
+ "The glass size is not within the range":"鐜荤拑灏哄涓嶅湪鑼冨洿鍐�",
+ "increase":"娣诲姞",
+ "Enable":"鍚敤",
+ "Disable":"绂佺敤",
+ "Usage":"浣跨敤鐜�",
+ "Space (Pieces)":"绌洪棿(鐗囨暟)",
+ "This glass is already in the cage":"绗煎瓙閲屽凡鏈夋鐜荤拑",
+ "Enter the Order lD":"璇疯緭鍏ヨ鍗昳d",
+ "OrderInfo":"璁㈠崟淇℃伅",
+ "Query":"鏌ヨ",
+ "permission update":"鏉冮檺缂栬緫",
+ "query was successful":"鏌ヨ鎴愬姛",
+ "Scan Code Point":"鎵爜浣�",
+ "Upper film position":"涓婄墖浣�",
+ "Glass Information":"鐜荤拑淇℃伅",
+ "current Information":"褰撳墠淇℃伅",
+ "Modify Information":"淇敼淇℃伅",
+ "Clear Current":"娓呴櫎褰撳墠",
+ "Confirm Modification":"纭淇敼",
+ "The glass ID already exists in the loading queue":"涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
+ "This glass ID already exists in the sorting cage":"鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id"
+
}
\ No newline at end of file
--
Gitblit v1.8.0