From 707d28bd18f8832ac3824af4ae6f50dc1a30ee41 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 29 十一月 2023 11:02:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

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

diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 9d1bac8..f27a908 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -204,5 +204,107 @@
   "alarmid": "id",
   "alacontent": "content",
   "time-on": "time-on",
-  "End-Time": "End-Time"
+  "End-Time": "End-Time",
+  "langRegisterSuccessMessage": "Registration successful",
+
+  "娣诲姞鐢ㄦ埛鎴愬姛":"Successfully add user ",
+  "confirmResetPassword": "Are you sure you want to reset the password to the default value?",
+  "confirm": "Confirm",
+  "cancel": "Cancel",
+  "passwordResetSuccess": "Password has been reset to the default value",
+  "confirmDeleteCategory": "This operation will permanently delete the category. Do you want to continue?",
+  "prompt": "Prompt",
+  "userDeleteSuccess": "User deleted successfully",
+  "deleteCanceled": "Deletion canceled",
+  "addUserSuccess": "User added successfully",
+  "editUserSuccess": "User edited successfully",
+  "addSuccessMessage": "Added successfully",
+"deleteConfirmMessage": "Are you sure you want to delete this permission?",
+
+"confirmButtonText": "Confirm",
+"cancelButtonText": "Cancel",
+"deleteSuccessMessage": "Deleted successfully",
+"deleteCancelledMessage": "Deletion cancelled",
+
+
+  "Enter the glass barcode":"Enter the glass barcode",
+  "Manually Infeed Glass":"Manually Infeed 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",
+  "Operate":"Operate",
+  "Terminate Task":"Terminate Task",
+  "cancel":"cancel",
+  "confirm":"confirm",
+  "Number":"Number",
+  "Outfeed glass barcode":"Outfeed glass barcode",
+  "Infeed glass barcode":"Infeed glass barcode",
+  "Cage No":"Cage No",
+  "Slot No":"Slot No",
+  "Dim":"Dim",
+  "id":"id",
+  "content":"content",
+  "timeon":"timeon",
+  "endTime":"endTime",
+
+  "The Side":"The Side",
+  "Barcode":"Barcode",
+  "Order No":"Order No",
+  "List No":"List No",
+  "Box No":"Box No",
+  "Delete":"Delete",
+  "Out":"Out",
+
+  "Operation successful":"Operation successful",
+  "Operation canceled":"Operation canceled",
+  "There is no glass for this order":"There is no glass for this order",
+  "There are currently tasks":"There are currently tasks",
+  "There is no such glass":"There is no such glass",
+  "There is no such grid":"There is no such grid",
+  "No delete allowed":"No delete allowed",
+  "No out allowed":"No out allowed",
+  "Are you sure to perform this operation ?":"Are you sure to perform this operation ?",
+  "Yes":"Yes",
+  
+
+  "No":"No",
+  "Please enter the password":"Please enter the password",
+  "Password error":"Password error",
+  "DataBase Connection failed":"DataBase Connection failed",
+  "Distribute parameters":"Distribute parameters",
+  "The glass size is not within the range":"The glass size is not within the range",
+  "Increase":"Increase",
+  "Enable":"Enable",
+  "Disable":"Disable",
+  "Usage":"Usage",
+  "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",
+  "Query":"Query",
+  "permission update":"permission update",
+  "query was successful":"query was successful",
+  "Scan Code Point":"Scan Code Point",
+  "Upper film position":"Upper film position",
+  "Glass Information":"Glass Information",
+  "current Information":"current information",
+  "Modify Information":"Modify information",
+  "Clear Current":"Clear Current",
+  "Confirm Modification":"Confirm modification",
+  "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",
+  "Production queue":"Production queue",
+  "Enter the Frame No":"Enter the Frame No",
+  "Frame No":"Frame No",
+  "Glass information corresponding to aluminum frame":"Glass information corresponding to aluminum frame",
+  "In the cage":"In the cage",
+  "Flip":"Flip",
+  "In the queue":"In the queue"
+
 }
\ No newline at end of file

--
Gitblit v1.8.0