From 1c26bd4ac7453b5f4a29f0e428893b5247a8fde8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 24 十月 2023 10:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

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

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 15860c4..20c1032 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,17 +1,16 @@
-
-  {
-    "systemTitle": "鐧诲綍绯荤粺",
-    "usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
-    "passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
-    "loginButton": "鐧诲綍",
-    "registerButton": "娉ㄥ唽",
-    "resetButton": "閲嶇疆",
-    "usernameRequired": "璇疯緭鍏ョ敤鎴峰悕",
-    "usernameLength": "鐢ㄦ埛鍚嶉暱搴﹀湪5-15涓瓧绗︿箣闂�",
-    "passwordRequired": "璇疯緭鍏ュ瘑鐮�",
-    "passwordLength": "瀵嗙爜闀垮害鍦�5-15涓瓧绗︿箣闂�",
-    "loginSuccess": "鐧诲綍鎴愬姛",
-    "langBtnCN": "涓枃",
+{
+  "systemTitle": "鐧诲綍绯荤粺",
+  "usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
+  "passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
+  "loginButton": "鐧诲綍",
+  "registerButton": "娉ㄥ唽",
+  "resetButton": "閲嶇疆",
+  "usernameRequired": "璇疯緭鍏ョ敤鎴峰悕",
+  "usernameLength": "鐢ㄦ埛鍚嶉暱搴﹀湪5-15涓瓧绗︿箣闂�",
+  "passwordRequired": "璇疯緭鍏ュ瘑鐮�",
+  "passwordLength": "瀵嗙爜闀垮害鍦�5-15涓瓧绗︿箣闂�",
+  "loginSuccess": "鐧诲綍鎴愬姛",
+  "langBtnCN": "涓枃",
   "langBtnEN": "English",
   "langHome": "棣栭〉",
   "langUserManagement": "鐢ㄦ埛绠＄悊",
@@ -31,10 +30,271 @@
   "langPassword": "瀵嗙爜",
   "langState": "鐘舵��",
   "langSelect": "璇烽�夋嫨",
-  "langCancel": "鍙栨秷",
-  "langConfirm": "纭畾",
   "langEditUserTitle": "淇敼鐢ㄦ埛",
-  "northglassMESsystem":"鍖楃幓MES绯荤粺",
-  "exit":"閫�鍑�"
-  }
-  
\ No newline at end of file
+  "northglassMESsystem": "鍖楃幓MES绯荤粺",
+  "exit": "閫�鍑�",
+  "changePassword": "淇敼瀵嗙爜",
+  "resetPassword": "閲嶇疆瀵嗙爜",
+  "home": "涓婚〉",
+  "role": "瑙掕壊",
+  "langRoleManagement": "瑙掕壊绠＄悊",
+  "langRoleList": "瑙掕壊鍒楄〃",
+  "langEnterRoleName": "璇疯緭鍏ヨ鑹插悕绉�",
+  "langAddRole": "娣诲姞瑙掕壊",
+  "langName": "鍚嶇О",
+  "langIsValid": "鏄惁鏈夋晥",
+  "langOperation": "鎿嶄綔",
+  "langPleaseSelect": "璇烽�夋嫨",
+  "langValid": "鏈夋晥",
+  "langInvalid": "鏃犳晥",
+  "langConfirm": "纭畾",
+  "langCancel": "鍙栨秷",
+  "langAddRoleSuccess": "娣诲姞瑙掕壊鎴愬姛",
+  "langEnterName": "璇疯緭鍏ュ悕绉�",
+  "langLengthBetween": "闀垮害鍦�",
+  "langAnd": "鍜�",
+  "langCharacters": "涓瓧绗︿箣闂�",
+  "langEnterState": "璇疯緭鍏ョ姸鎬�",
+  "langUpdateState": "鐘舵�佹洿鏂版垚鍔�",
+  "langEditRole": "缂栬緫瑙掕壊",
+  "langEditRoleSuccess": "缂栬緫瑙掕壊鎴愬姛",
+  "langDeleteRoleConfirm": "纭畾瑕佸垹闄よ瑙掕壊鍚楋紵",
+  "langPrompt": "鎻愮ず",
+  "langDeleteRoleSuccess": "鍒犻櫎瑙掕壊鎴愬姛",
+  "langCancelDelete": "宸插彇娑堝垹闄�",
+  "langRoleName": "瑙掕壊鍚嶇О",
+  "updateSuccessMessage": "鏇存柊鎴愬姛",
+  "paginationTotal": "鍏� {total} 鏉�",
+  "paginationSizes": "姣忛〉鏄剧ず",
+  "paginationPrev": "涓婁竴椤�",
+  "paginationPager": "{currentPage}/{pageCount}",
+  "paginationNext": "涓嬩竴椤�",
+  "paginationJumper": "璺宠嚦",
+  "breadcrumb": {
+    "home": "棣栭〉",
+    "permissionManagement": "鏉冮檺绠＄悊",
+    "permissionList": "鏉冮檺鍒楄〃"
+  },
+  "search": {
+    "placeholder": "璇疯緭鍏ュ叧閿瓧"
+  },
+  "button": {
+    "addPermission": "娣诲姞鏉冮檺",
+    "cancel": "鍙栨秷",
+    "confirm": "纭"
+  },
+  "table": {
+    "role": "瑙掕壊",
+    "permissionDescription": "鏉冮檺鎻忚堪",
+    "permissionValue": "鏉冮檺鍊�",
+    "createTime": "鍒涘缓鏃堕棿",
+    "isActive": "鏄惁婵�娲�",
+    "operation": "鎿嶄綔"
+  },
+  "tooltip": {
+    "edit": "淇敼",
+    "delete": "鍒犻櫎"
+  },
+  "dialog": {
+    "addPermission": "娣诲姞鏉冮檺",
+    "editPermission": "缂栬緫鏉冮檺"
+  },
+  "form": {
+    "role": "瑙掕壊",
+    "select": "璇烽�夋嫨",
+    "permission": "鏉冮檺",
+    "isActive": "鏄惁婵�娲�"
+  },
+  "鎿嶄綔": "鎿嶄綔",
+  "鏈夋晥": "鏈夋晥",
+  "鏃犳晥": "鏃犳晥",
+  "璇疯緭鍏ュ悕绉�": "璇疯緭鍏ュ悕绉�",
+  "闀垮害鍦� 2 鍒� 15 涓瓧绗�": "闀垮害鍦� 2 鍒� 15 涓瓧绗�",
+  "璇疯緭鍏ョ姸鎬�": "璇疯緭鍏ョ姸鎬�",
+  "娣诲姞瑙掕壊": "娣诲姞瑙掕壊",
+  "淇敼瑙掕壊": "淇敼瑙掕壊",
+  "鍒犻櫎瑙掕壊": "鍒犻櫎瑙掕壊",
+  "姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ鑹�, 鏄惁缁х画?": "姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ鑹�, 鏄惁缁х画?",
+  "鎻愮ず": "鎻愮ず",
+  "纭畾": "纭畾",
+  "鍙栨秷": "鍙栨秷",
+  "娣诲姞瑙掕壊鎴愬姛": "娣诲姞瑙掕壊鎴愬姛",
+  "鏇存柊鐘舵�佹垚鍔�": "鏇存柊鐘舵�佹垚鍔�",
+  "淇敼瑙掕壊鎴愬姛": "淇敼瑙掕壊鎴愬姛",
+  "鍒犻櫎瑙掕壊鎴愬姛": "鍒犻櫎瑙掕壊鎴愬姛",
+  "translation": {
+    "D01 VFD error": "D01 VFD 閿欒",
+    "D02 VFD error": "D02 VFD 閿欒",
+    "D03 VFD error": "D03 VFD 閿欒",
+    "D04 VFD error": "D04 VFD 閿欒",
+    "D05 VFD error": "D05 VFD 閿欒",
+    "D06 VFD error": "D06 VFD 閿欒",
+    "B01 VFD error": "B01 VFD 閿欒",
+    "B02 VFD error": "B02 VFD 閿欒",
+    "A01 VFD error": "A01 VFD 閿欒",
+    "A02 VFD error": "A02 VFD 閿欒",
+    "A01 servo turn error": "A01 servo turn 閿欒",
+    "A02 servo turn error": "A02 servo turn 閿欒",
+    "A01 servo travel error": "A01 servo travel 閿欒",
+    "A02 servo travel error": "A02 servo travel 閿欒",
+    "B01 servo travel error": "B01 servo travel 閿欒",
+    "B02 servo travel error": "B02 servo travel 閿欒",
+    "D01 DEC error": "D01 DEC 閿欒",
+    "D01 pos error": "D01 pos 閿欒",
+    "D02 DEC error": "D02 DEC 閿欒",
+    "D02 pos error": "D02 pos 閿欒",
+    "D03 DEC error": "D03 DEC 閿欒",
+    "D03 pos error": "D03 pos 閿欒",
+    "D04 DEC error": "D04 DEC 閿欒",
+    "D04 pos error": "D04 pos 閿欒",
+    "D05 DEC error": "D05 DEC 閿欒",
+    "D05 pos error": "D05 pos 閿欒",
+    "D06 DEC error": "D06 DEC 閿欒",
+    "D06 pos error": "D06 pos 閿欒",
+    "A01 DEC error": "A01 DEC 閿欒",
+    "A01 pos error": "A01 pos 閿欒",
+    "A02 DEC error": "A02 DEC 閿欒",
+    "A02 pos error": "A02 pos 閿欒",
+    "B01 IN DEC error": "B01 IN DEC 閿欒",
+    "B01 IN pos error": "B01 IN pos 閿欒",
+    "B01 OUT DEC error": "B01 OUT DEC 閿欒",
+    "B01 OUT pos error": "B01 OUT pos 閿欒",
+    "B02 IN DEC error": "B02 IN DEC 閿欒",
+    "B02 IN pos error": "B02 IN pos 閿欒",
+    "B02 OUT DEC error": "B02 OUT DEC 閿欒",
+    "B02 OUT pos error": "B02 OUT pos 閿欒"
+  },
+  "Electrical": "璁惧绠＄悊",
+  "Parameter": "鍙傛暟涓嬪彂",
+  "Action": "寮�鍏虫帶鍒�",
+  "Sign": "IO鐘舵��",
+  "State": "璁惧鐘舵��",
+  "Alarm": "鎶ヨ淇℃伅",
+  "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":"鏉冮檺缂栬緫"
+
+}
\ No newline at end of file

--
Gitblit v1.8.0