From 5531d68265411878fdf6d67200e339670046d7e2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 九月 2023 14:33:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

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

diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index d007fec..8140ccb 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -196,6 +196,7 @@
   "langResetButton": "Reset",
   "langCancelButton": "Cancel",
   "langRegisterSuccessMessage": "Registration successful",
+
   "娣诲姞鐢ㄦ埛鎴愬姛":"Successfully add user ",
   "confirmResetPassword": "Are you sure you want to reset the password to the default value?",
 
@@ -214,7 +215,43 @@
 "confirmButtonText": "Confirm",
 "cancelButtonText": "Cancel",
 "deleteSuccessMessage": "Deleted successfully",
-"deleteCancelledMessage": "Deletion cancelled"
+"deleteCancelledMessage": "Deletion cancelled",
 
 
+  "Enter the glass lD":"Enter the glass lD",
+  "Manually feed the glass":"Manually feed the glass",
+  "Enter the order number":"Enter the order number",
+  "Exit the glass by order number":"Exit the glass by order number",
+  "Please confirm the glass information":"Please confirm the glass information",
+  "Please confirm the Ordering Information":"Please confirm the Ordering Information",
+  "Alarm Information":"Alarm Information",
+  "Cage Details":"Cage Details",
+  "order":"order",
+  "length":"length",
+  "width":"width",
+  "coating":"coating",
+  "Operate":"Operate",
+  "end task":"end task",
+  "cancal":"cancal",
+  "confirm":"confirm",
+  "number":"number",
+  "Coming out glass ID":"Coming out glass ID",
+  "Incoming glass ID":"Incoming glass ID",
+  "The Cage number being used":"The Cage number being used",
+  "The Grille number being used":"The Grille number being used",
+  "Order Nmuber":"Order Nmuber",
+  "Length and width":"Length and width",
+  "id":"id",
+  "content":"content",
+  "timeon":"timeon",
+  "endTime":"endTime",
+
+  "The Cage number":"The Cage number",
+  "tier":"tier",
+  "cell":"cell",
+  "glassid":"glassid",
+  "order number":"order number",
+  "delete":"delete",
+  "out":"out"
+
 }
\ No newline at end of file

--
Gitblit v1.8.0