From b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 十一月 2025 08:53:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/lang/en.js |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 077f1ad..b8d5f71 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -36,6 +36,7 @@
     basicData: {
         untask: 'No task',
         tonumber: 'Total number of films uploaded',
+        sectionUpperSuccessful:'Upper section operation successful锛�',
         finishnumber: 'Completed quantity',
         rackreset: 'Rack reset',
         prackreset: 'Is the rack reset锛�',
@@ -131,12 +132,15 @@
         projectnumber: 'Please enter the project number',
         noGlassToDamage:'No broken glass锛�',
         dilapidation: 'Breakage',
+        dilapidationDetails:'Damage details',
+        dilapidationAll:'One-click damage',
         dilapidationWhether:'Whether it is broken with one click锛�',
         takeaway: 'Manual removal',
         takeawaya: 'Should the information be manually taken away锛�',
         takeon: 'The arrangement is complete',
     },
     searchOrder: {
+        loadingText: 'Loading data, please wait...',
         firstLinePriority: 'First-line priority',
         secondLinePriority: 'second-line priority',
         hollowPriority:'Hollow priority',
@@ -520,6 +524,7 @@
         createTime: 'Return date',
     },
     large: {
+        patchCount:'Quantity Replenished',
         Productionsituation:'Production situation',
         Productionandoperationstatus:'Production and operation status',
         cuttingState:'Operation status on the day of cutting',
@@ -800,9 +805,16 @@
         finegrinding: 'Fine grinding',
     },
     hellow: {
-        Content:'鍐呭',
+        taskAlreadyClaimed: 'This task has already been claimed and cannot be performed again.',
+        claimed: 'Already claimed',
+        claimFailed: 'Failed to receive task',
+        claimedTasksCleared: 'The received task status has been cleared',
+        Content:'Content',
         idSame:'The glass ID for the entry task is the same',
         sizeSame:'There are glass pieces of the same specification inside the cage',
+        slotLess:'Insufficient remaining slots',
+        overSize:'There is glass in the straight-through feeder, end this feeding process.',
+        noGlass:'Glass information not found, please collect the project',
         projectMsg2:'Please select a label template',
         clickmakesure: 'Whether or not to confirm the click锛�',
         logarithm: 'logarithm锛�',

--
Gitblit v1.8.0