From 1de312a18d164c2fa3718a1a975b8c5804723bcf Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 13:46:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/lang/locales/en-US.json | 272 +++++++++++++++++++++++++++--------------------------
1 files changed, 139 insertions(+), 133 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index f307fe0..a3374c9 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -1,134 +1,4 @@
{
-<<<<<<< HEAD
- "systemTitle": "Login System",
- "usernamePlaceholder": "Please enter username",
- "passwordPlaceholder": "Please enter password",
- "loginButton": "Login",
- "registerButton": "Register",
- "resetButton": "Reset",
- "usernameRequired": "Please enter username",
- "usernameLength": "Username must be between 5 and 15 characters",
- "passwordRequired": "Please enter password",
- "passwordLength": "Password must be between 5 and 15 characters",
- "loginSuccess": "Login successful",
- "langBtnCN": "Chinese",
- "langBtnEN": "English",
- "langHome": "Home",
- "langUserManagement": "User Management",
- "langUserList": "User List",
- "langUsernamePlaceholder": "Please enter username",
- "langEmailPlaceholder": "Please enter email",
- "langSearch": "Search",
- "langAddUser": "Add User",
- "langUsername": "Username",
- "langEmail": "Email",
- "langCreateTime": "Create Time",
- "langDisabled": "Disabled",
- "langAction": "Action",
- "langEdit": "Edit",
- "langDelete": "Delete",
- "langAddUserTitle": "Add User",
- "langPassword": "Password",
- "langState": "State",
- "langSelect": "Please select",
- "langCancel": "Cancel",
- "langConfirm": "Confirm",
- "langEditUserTitle": "Edit User",
- "northglassMESsystem":"NorthGlassMesSystem",
- "exit":"exit",
- "changePassword":"changePassword",
- "resetPassword": "resetPassword",
- "home":"Home",
- "role":"role",
- "langRoleManagement": "Role Management",
- "langRoleList": "Role List",
- "langEnterRoleName": "Please enter role name",
- "langAddRole": "Add Role",
- "langName": "Name",
- "langIsValid": "Is Valid",
- "langOperation": "Operation",
- "langPleaseSelect": "Please select",
- "langValid": "Valid",
- "langInvalid": "Invalid",
- "langAddRoleSuccess": "Add role successfully",
- "langEnterName": "Please enter name",
- "langLengthBetween": "Length should be between",
- "langAnd": "and",
- "langCharacters": "characters",
- "langEnterState": "Please enter state",
- "langUpdateState": "Update state successfully",
- "langEditRole": "Edit Role",
- "langEditRoleSuccess": "Edit role successfully",
- "langDeleteRoleConfirm": "Are you sure you want to delete this role?",
- "langPrompt": "Prompt",
- "langDeleteRoleSuccess": "Delete role successfully",
- "langCancelDelete": "Cancelled deleting",
- "langRoleName":"langRoleName",
- "updateSuccessMessage":"updateSuccessMessage",
- "paginationTotal": "Total {total}",
- "paginationSizes": "Items per page",
- "paginationPrev": "Previous",
- "paginationPager": "{currentPage}/{pageCount}",
- "paginationNext": "Next",
- "paginationJumper": "Jump to",
- "breadcrumb": {
- "home": "Home",
- "permissionManagement": "Permission Management",
- "permissionList": "Permission List"
- },
- "search": {
- "placeholder": "Enter keywords"
- },
- "button": {
- "addPermission": "Add Permission",
- "cancel": "Cancel",
- "confirm": "Confirm"
- },
- "table": {
- "role": "Role",
- "permissionDescription": "Permission Description",
- "permissionValue": "Permission Value",
- "createTime": "Create Time",
- "isActive": "Is Active",
- "operation": "Operation"
- },
- "tooltip": {
- "edit": "Edit",
- "delete": "Delete"
- },
- "dialog": {
- "addPermission": "Add Permission",
- "editPermission": "Edit Permission"
- },
- "form": {
- "role": "Role",
- "select": "Please Select",
- "permission": "Permission",
- "isActive": "Is Active"
- },
- "鎿嶄綔": "Operation",
- "鏈夋晥": "Valid",
- "鏃犳晥": "Invalid",
- "璇疯緭鍏ュ悕绉�": "Please enter a name",
- "闀垮害鍦� 2 鍒� 15 涓瓧绗�": "Length between 2 and 15 characters",
- "璇疯緭鍏ョ姸鎬�": "Please enter the status",
- "娣诲姞瑙掕壊": "Add Role",
- "淇敼瑙掕壊": "Edit Role",
- "鍒犻櫎瑙掕壊": "Delete Role",
- "姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ鑹�, 鏄惁缁х画?": "This operation will permanently delete the role. Continue?",
- "鎻愮ず": "Reminder",
- "纭畾": "Confirm",
- "鍙栨秷": "Cancel",
- "娣诲姞瑙掕壊鎴愬姛": "Successfully added role",
- "鏇存柊鐘舵�佹垚鍔�": "Successfully updated status",
- "淇敼瑙掕壊鎴愬姛": "Successfully modified role",
- "鍒犻櫎瑙掕壊鎴愬姛": "Successfully deleted role",
- "淇敼鐢ㄦ埛鎴愬姛":"Successfully modified user",
- "translation": {
-
- }
- }
-=======
"systemTitle": "Login System",
"usernamePlaceholder": "Please enter username",
"passwordPlaceholder": "Please enter password",
@@ -294,11 +164,147 @@
"B02 OUT DEC error": "B02 OUT DEC error",
"B02 OUT pos error": "B02 OUT pos error"
},
+ "Electrical": "Electrical",
"Parameter": "Parameter",
"Action": "Action",
"Sign": "Sign",
"State": "State",
"Alarm": "Alarm",
- "Distribute": "Distribute"
-}
->>>>>>> 36acd690614dd276428530a59f448c543bac52d4
+ "Distribute": "Distribute",
+ "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 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