From 274e725e925144a53a70b270bb10b804fa195cd8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 31 十二月 2024 14:43:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index a282456..48b2818 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -127,6 +127,8 @@
           takeon:'鎽嗙墖瀹屾垚',
       },
       searchOrder:{
+          partask:'浠诲姟閲嶇疆',
+          partasks:'鏄惁浠诲姟閲嶇疆锛�',
           empty:'榛樿绌轰换鍔�',
           historicaltasks:'鍘嗗彶浠诲姟',
           cagedetails:'绗煎唴璇︽儏',
@@ -669,14 +671,78 @@
           removalmethodp: '闄よ啘鏂瑰紡',
           removalmethoda: '闄よ啘鏂瑰紡锛�',
           noremoval: '涓嶉櫎鑶�',
+          removal: '闄よ啘',
           coarselyground: '绮楃(',
           finegrinding: '绮剧(',
       },
     hellow: {
+        casFour: '姘斾綋4',
+        casFourb: '姘斾綋4锛�',
+        casFoura: '璇烽�夋嫨姘斾綋4',
+        casOne: '姘斾綋1',
+        casOneb: '姘斾綋1锛�',
+        casOnea: '璇烽�夋嫨姘斾綋1',
+        casThree: '姘斾綋3',
+        casThreeb: '姘斾綋3锛�',
+        casThreea: '璇烽�夋嫨姘斾綋3',
+        casTwo: '姘斾綋2',
+        casTwob: '姘斾綋2锛�',
+        casTwoa: '璇烽�夋嫨姘斾綋2',
+        Y: '鏈�',
+        F: '鏃�',
+        frameFour: '闂撮殧鏉�4',
+        frameFourb: '闂撮殧鏉�4锛�',
+        frameFoura: '璇疯緭鍏ラ棿闅旀澘4',
+        frameOne: '闂撮殧鏉�1',
+        frameOneb: '闂撮殧鏉�1锛�',
+        frameOnea: '璇疯緭鍏ラ棿闅旀澘1',
+        frameThree: '闂撮殧鏉�3',
+        frameThreeb: '闂撮殧鏉�3锛�',
+        frameThreea: '璇疯緭鍏ラ棿闅旀澘3',
+        frameTwo: '闂撮殧鏉�2',
+        frameTwob: '闂撮殧鏉�2锛�',
+        frameTwoa: '璇疯緭鍏ラ棿闅旀澘2',
+        intervalFrameHeight: '闂撮殧妗嗛珮搴�',
+        intervalFrameHeighta: '璇疯緭鍏ラ棿闅旀楂樺害',
+        intervalFrameHeightb: '闂撮殧妗嗛珮搴︼細',
+        intervalFrameType: '闂撮殧妗嗙被鍨�',
+        intervalFrameTypec: '璇烽�夋嫨闂撮殧妗嗙被鍨�',
+        intervalFrameTyped: '闂撮殧妗嗙被鍨嬶細',
+        intervalFrameTypea: 'tps鑳�',
+        intervalFrameTypeb: '閾濋棿闅旀潯',
+        intervalFrameWidth: '闂撮殧妗嗗搴�',
+        intervalFrameWidtha: '璇疯緭鍏ラ棿闅旀瀹藉害',
+        intervalFrameWidthb: '闂撮殧妗嗗搴︼細',
+        sealInsert: '瀵嗗皝宓屽叆',
+        sealInsertb: '瀵嗗皝宓屽叆锛�',
+        sealInserta: '璇疯緭鍏ュ瘑灏佸祵鍏�',
+        hollowformula: '涓┖閰嶆柟',
+        hollowformuldet: '鏄惁鍒犻櫎璇ヤ腑绌洪厤鏂癸紵',
+        hollowtaskdet: '鏄惁鍒犻櫎璇ヤ换鍔★紵',
+        taskdet: '鍒犻櫎浠诲姟',
+        edithollowformula: '淇敼涓┖閰嶆柟',
+        phollowformula: '璇烽�夋嫨涓┖閰嶆柟',
+        hollowformulp: '涓┖閰嶆柟锛�',
+        bottomRemove: '涓嬩晶闄よ啘閲忥細',
+        bottomRemovep: '涓嬩晶闄よ啘閲�',
+        bottomRemovea: '璇疯緭鍏ヤ笅渚ч櫎鑶滈噺',
+        topRemove: '涓婁晶闄よ啘閲忥細',
+        topRemovep: '涓婁晶闄よ啘閲�',
+        topRemovea: '璇疯緭鍏ヤ笂渚ч櫎鑶滈噺',
+        leftRemove: '宸︿晶闄よ啘閲忥細',
+        leftRemovep: '宸︿晶闄よ啘閲�',
+        leftRemovea: '璇疯緭鍏ュ乏渚ч櫎鑶滈噺',
+        rightRemove: '鍙充晶闄よ啘閲忥細',
+        rightRemovep: '鍙充晶闄よ啘閲�',
+        rightRemovea: '璇疯緭鍏ュ彸渚ч櫎鑶滈噺',
+        formulaNamep: '閰嶆柟鍚�',
+        formulaName: '閰嶆柟鍚嶏細',
+        formulaNamea: '璇疯緭鍏ラ厤鏂瑰悕',
         stopproject: '鏆傚仠浠诲姟',
         pstopproject: '鏄惁鏆傚仠浠诲姟锛�',
         reviewproject: '棰勮宸ョ▼',
         line: '绾胯矾',
+        linea: '绾胯矾锛�',
         line1: '绾胯矾涓�',
         line2: '绾胯矾浜�',
         line3: '绾胯矾涓�',

--
Gitblit v1.8.0