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 | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index abcaf71..4eeba01 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -168,17 +168,20 @@
"Parameter": "鍙傛暟涓嬪彂",
"Action": "寮�鍏虫帶鍒�",
"Sign": "IO鐘舵��",
- "State": "State",
+ "State": "璁惧鐘舵��",
"Alarm": "鎶ヨ淇℃伅",
"Distribute": "涓嬪彂",
"Search": "鎼滅储",
+ "dvstate": {
+ "automatic": "鑷姩",
+ "manual": "鎵嬪姩"
+ },
"langUsernameLabel": "鐢ㄦ埛鍚�",
"langPasswordLabel": "瀵嗙爜",
"langPasswordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
"langConfirmPasswordLabel": "纭瀵嗙爜",
"langConfirmPasswordPlaceholder": "璇风‘璁ゅ瘑鐮�",
"langEmailLabel": "閭",
-
"langQQLabel": "QQ",
"langQQPlaceholder": "璇疯緭鍏Q鍙风爜",
"langPhoneNumberLabel": "鎵嬫満鍙风爜",
@@ -193,6 +196,7 @@
"langResetButton": "閲嶇疆",
"langCancelButton": "鍙栨秷",
"langRegisterSuccessMessage": "娉ㄥ唽鎴愬姛",
+
"娣诲姞鐢ㄦ埛鎴愬姛":"娣诲姞鐢ㄦ埛鎴愬姛",
"confirmResetPassword": "纭閲嶇疆瀵嗙爜涓洪粯璁ゅ�煎悧锛�",
@@ -214,6 +218,65 @@
"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":"鍑虹墖",
+
+ "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": "缁撴潫鏃堕棿"
}
\ No newline at end of file
--
Gitblit v1.8.0