From dd4778d2cc47467a39473f02513ec5438b5c9512 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 05 九月 2025 12:31:58 +0800
Subject: [PATCH] 1、合并冲突
---
UI-Project/src/lang/kr.js | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/kr.js b/UI-Project/src/lang/kr.js
index 635a82c..67dbb02 100644
--- a/UI-Project/src/lang/kr.js
+++ b/UI-Project/src/lang/kr.js
@@ -128,12 +128,16 @@
},
order:{
projectnumber:'頂勲鞝濏姼 氩堩樃毳� 鞛呺牓頃� 欤检劯鞖�',
+ noGlassToDamage:'旯 鞙犽Μ 鞐嗢潓锛�',
dilapidation:'韺岇啇',
+ dilapidationWhether:'頃� 氩堨潣 韥措Ν鞙茧 旯電旍 鞐秬锛�',
takeaway:'靾橂彊 鞝滉卑',
takeawaya:'鞝曤炒臧� 靾橂彊鞙茧 靾橃霅橃棃電旍 鞐秬锛�',
takeon:'欷�牍勱皜 鞕勲霅橃棃鞀惦媹雼�',
},
searchOrder:{
+ firstLinePriority: '鞚检劆 鞖办劆 靾滌渼',
+ secondLinePriority: '2靹� 鞖办劆靾滌渼',
hollowPriority:'欷戧车 鞖办劆 靾滌渼',
furnaces:'臧�霌� 彀瀳電� 鞖╆磻搿滌潣 靾�',
furnfullTemp:'鞙犽Μ鞚� 齑濍焿',
--
Gitblit v1.8.0