From 85a0a75ab65874f8c010df5ba9cec0d97bf84708 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 一月 2024 08:19:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index c19f5e7..b100ef2 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,6 +1,5 @@
{
-
- "ip": "localhost",
+ "ip":"localhost",
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -303,7 +302,7 @@
"current Information":"current information",
"Modify Information":"Modify information",
"Clear Current":"Clear Current",
- "Confirm Modification":"Confirm modification",
+ "Confirm":"Confirm",
"The glass ID already exists in the loading queue":"The glass ID already exists in the loading queue",
"This glass ID already exists in the sorting cage":"This glass ID already exists in the sorting cage",
"Outing Queue":"Outing Queue",
@@ -349,6 +348,17 @@
"Outside":"Outside",
"Inside":"Inside",
"Cancel":"Cancel",
+ "Are you sure to clear this barcode ?":"Are you sure to clear this barcode ?",
+ "Terminate Feeding":"Terminate Feeding",
+ "Terminate Outing":"Terminate Outing",
+ "SoftEmergencyStop":"SoftEmergencyStop",
+ "Unable to clear glass ID in automatic mode":"Unable to clear glass ID in automatic mode",
+ "Are you sure you want an emergency stop ?":"Are you sure you want an emergency stop ?",
+ "Current State":"Current State",
+ "Automatic":"Automatic",
+ "Hand Movement":"Hand Movement",
+ "Please enter the correct glassID":"Please enter the correct glassID",
+ "Switch":"Switch",
"ServoManualone": {
"A01 鎵�鍦ㄦ牸瀛�": "A01 Current Grid",
"鏁伴噺": "Quantity",
--
Gitblit v1.8.0