From 8114ef9bf2704a2bc05a15a36ab677808195a274 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 10:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 8541fa7..5cceb30 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -317,7 +317,7 @@
takemessage:'鏄惁鎷胯蛋璇ユ潯淇℃伅锛�',
breakage:'鐮存崯',
takeout:'鎷胯蛋',
- glasstype:'鐜荤拑绫诲瀷',
+ glasstype:'鐜荤拑鑶滅郴',
line:'绾胯矾',
status:'鐘舵��',
time:'鏃堕棿娈�',
@@ -709,6 +709,18 @@
finegrinding: '绮剧（',
},
hellow: {
+ hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
+ hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
+ hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',
+ hollowTotalAreaOutTwo: '涓┖浜岀嚎鐜荤拑闈㈢Н',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冩暟閲�',
+ countOut: '閽㈠寲鐜荤拑鏁伴噺',
+ countOutOne: '鍒囧壊涓�绾跨幓鐠冩暟閲�',
+ countOutTwo: '鍒囧壊浜岀嚎鐜荤拑鏁伴噺',
+ totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖绗肩幓鐠冮潰绉�',
+ totalAreaOut: '閽㈠寲鐜荤拑闈㈢Н',
+ totalAreaOutOne: '鍒囧壊涓�绾跨幓鐠冮潰绉�',
+ totalAreaOutTwo: '鍒囧壊浜岀嚎鐜荤拑闈㈢Н',
freeone: '涓�绾跨┖闂茬姸鎬侊細',
freetwo: '浜岀嚎绌洪棽鐘舵�侊細',
casFour: '姘斾綋4',
--
Gitblit v1.8.0