From e4e6c1a0e34cbd5aca446018d19166497d8d7814 Mon Sep 17 00:00:00 2001
From: admin <52323@qq.com>
Date: 星期五, 15 九月 2023 11:38:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

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

diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index ad35a8e..01ce8da 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -171,5 +171,109 @@
   "State": "State",
   "Alarm": "Alarm",
   "Distribute": "Distribute",
-  "Search": "Search"
+  "Search": "Search",
+  "dvstate": {
+    "鑷姩": "automatic",
+    "鎵嬪姩": "manual"
+  },
+  "langUsernameLabel": "Username",
+  "langPasswordLabel": "Password",
+  "langPasswordPlaceholder": "Please enter your password",
+  "langConfirmPasswordLabel": "Confirm Password",
+  "langConfirmPasswordPlaceholder": "Please confirm your password",
+  "langEmailLabel": "Email",
+  "langQQLabel": "QQ",
+  "langQQPlaceholder": "Please enter your QQ number",
+  "langPhoneNumberLabel": "Phone Number",
+  "langPhoneNumberPlaceholder": "Please enter your phone number",
+  "langUsernameRequiredMessage": "Please enter your username",
+  "langUsernameLengthMessage": "Username length should be between 5 and 15 characters",
+  "langPasswordRequiredMessage": "Please enter your password",
+  "langPasswordLengthMessage": "Password length should be between 5 and 15 characters",
+  "langEmailRequiredMessage": "Please enter your email",
+  "langEmailFormatMessage": "Invalid email format",
+  "langRegisterButton": "Register",
+  "langResetButton": "Reset",
+  "langCancelButton": "Cancel",
+  "langRegisterSuccessMessage": "Registration successful",
+  "today": "today",
+  "yesterday": "yesterday",
+  "week": "week",
+  "shijian": "date",
+  "Pick a day": "Pick a day",
+  "alarmid": "id",
+  "alacontent": "content",
+  "time-on": "time-on",
+  "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 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",
+
+  "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 ?",
+  "prompt":"prompt",
+  "Yes":"Yes",
+  "No":"No"
+
 }
\ No newline at end of file

--
Gitblit v1.8.0