From 0c1eda923c60852f9652f1b9444230c256dad178 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 23 四月 2024 09:49:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/zh-CN.json | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 439e685..1a93fd5 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -1,6 +1,6 @@
{
"Clear":"娓呴櫎",
- "ip":"192.168.10.21",
+ "ip":"localhost",
"systemTitle": "鐧诲綍绯荤粺",
"usernamePlaceholder": "璇疯緭鍏ョ敤鎴峰悕",
"passwordPlaceholder": "璇疯緭鍏ュ瘑鐮�",
@@ -284,7 +284,7 @@
"Space (Pieces)": "绌洪棿(鐗囨暟)",
"This glass is already in the cage": "绗煎瓙閲屽凡鏈夋鐜荤拑",
"Enter the Order No": "璇疯緭鍏ヨ鍗昳d",
- "OrderInfo": "璁㈠崟淇℃伅",
+ "Order Info": "璁㈠崟淇℃伅",
"Query": "鏌ヨ",
"permission update": "鏉冮檺缂栬緫",
"query was successful": "鏌ヨ鎴愬姛",
@@ -354,6 +354,7 @@
"Please enter the correct glassID":"璇疯緭鍏ユ纭殑鐜荤拑ID",
"Switch":"鍒囨崲",
"This frame has glass that is currently outing":"姝ら摑妗嗘湁姝ｅ湪鍑虹墖鐨勭幓鐠�",
+ "The slot is disabled":"鏍煎瓙琚鐢�",
"langparameter": {
"conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
--
Gitblit v1.8.0