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/en-US.json | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 2a568e0..19d8a6b 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,6 @@
{
-
- "ip": "localhost",
+ "Clear":"Clear",
+ "ip":"localhost",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -293,7 +293,7 @@
"Space (Pieces)":"Space (Pieces)",
"This glass is already in the cage":"This glass is already in the cage",
"Enter the Order No":"Enter the Order No",
- "OrderInfo":"OrderInfo",
+ "Order Info":"Order Info",
"Query":"Query",
"permission update":"permission update",
"query was successful":"query was successful",
@@ -360,6 +360,8 @@
"Hand Movement":"Hand Movement",
"Please enter the correct glassID":"Please enter the correct glassID",
"Switch":"Switch",
+ "This frame has glass that is currently outing":"This frame has glass that is currently outing",
+ "The slot is disabled":"The slot is disabled",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
@@ -567,7 +569,8 @@
"A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home"
},
"A01琛岃蛋浼烘湇鍥為浂":"A01 SERVE TRAVEL Home",
- "A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home"
+ "A02琛岃蛋浼烘湇鍥為浂":"A02 SERVE TRAVEL Home",
+ "Set":"Set"
}
\ No newline at end of file
--
Gitblit v1.8.0