From 5db14138646f88b780fcf90000abdd0cd925c1b9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 09:54:21 +0800
Subject: [PATCH] 主界面添加扫码枪二维码显示,添加软急停,调整终止任务功能

---
 CanadaMes-ui/src/lang/locales/en-US.json |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index c19f5e7..2a568e0 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -303,7 +303,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 +349,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