From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index d9bbb3d..4287482 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -34,6 +34,8 @@
           quit:"Exit",
       },
       basicData:{
+          rackreset:'鏋跺瓙澶嶄綅',
+          prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
           printing:'鑷姩鎵撳嵃',
           laserprinting:'Laser printing machine ready status锛�',
           cuttingmachine:'Cutting machine ready status锛�',
@@ -579,6 +581,7 @@
           premark :'Please enter a note',
       },
       film:{
+          fail:'澶辫触',
           mes:'Original film storage details',
           warehousing:'store',
           pwarehousing:'鍏ュ簱璇锋眰',

--
Gitblit v1.8.0