From 22fcbf0a9ed8e0a2df9695859d7a52d1dd55b386 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期四, 09 二月 2023 10:35:39 +0800
Subject: [PATCH] 解决冲突
---
src/assets/lang/zh.js | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 2427e0a..b23568a 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -470,7 +470,6 @@
areasurvey: "闈㈢Н娴嬮噺",
volummeasure: "浣撶Н娴嬮噺",
point: "鐐�",
- textLabel: '鏂囨湰鐐�',
line: "绾�",
rectangle: "鐭╁舰",
polygon: "澶氳竟褰�",
@@ -478,6 +477,8 @@
flatterrain: "鍦板舰骞虫暣",
terrainexcavation: "鍦板舰寮�鎸�",
removepaint: "娓呴櫎缁樺埗",
+ addlabel: "鏂囧瓧",
+ textLabel: "鏂囨湰鐐�",
openFile: "鎵撳紑",
saveFile: "淇濆瓨",
synthobj: {
@@ -489,15 +490,11 @@
m6: "骞抽潰闈㈢Н",
m7: "浣撶Н",
m8: "瑙掑害",
- m9: "楂樼▼閲忔祴",
},
more: "鏇村",
Multiplechoice: "澶氶��",
Singlechoice: "鍗曢��",
undergroundMode: "鍦颁笅妯″紡",
- visibilityAnalysis: "閫氳鍒嗘瀽",
- circularViewAnalysis: "鍦嗗舰瑙嗗煙鍒嗘瀽",
- viewAnalysis: "瑙嗗煙鍒嗘瀽",
},
dataApply: {
type1: "浣滃簾",
--
Gitblit v1.9.3