From aa82e3631a7571ce14f44ab5cb57401abd89692e Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期五, 21 七月 2023 16:24:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane

---
 src/assets/lang/zh.js |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index b3642d3..781d989 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -67,8 +67,8 @@
   dataManage: {
     dataManage: '鏁版嵁绠$悊',
     catalogueManage: '鐩綍绠$悊',
-    projectManagement: '椤圭洰绠$悊',
-    dataUpdata: '鏁版嵁涓婁紶',
+    projectManagement: '鏁版嵁璧勬簮鐩綍绠$悊',
+    dataUpdata: '鏁版嵁鍏ュ簱涓庢洿鏂�',
     datawarehousing: '鏁版嵁鍏ュ簱',
     rangeManage: '鍊煎煙绠$悊',
     dataRetrieval: '鏁版嵁鏌ヨ',
@@ -80,6 +80,7 @@
       menuName: '鑿滃崟鍚嶇О',
       menuType: '鑿滃崟绫诲瀷',
       layerName: '鍥惧眰鍚嶇О',
+      englishName: '鑻辨枃鍚嶇О',
       layerType: '鍥惧眰绫诲瀷',
       serviceName: '鏈嶅姟鍚嶇О',
       serviceType: '鏈嶅姟绫诲瀷',
@@ -89,14 +90,27 @@
       dataType: '鏁版嵁绫诲瀷',
       istrue: '鏄�',
       isfalse: '鍚�',
+      isEnable: '鍚敤',
+      isDisuse: '搴熷純',
+      isStop: '鍋滄',
+      testAddress: '娴嬭瘯鍦板潃',
+      firm: '鍘傚晢',
+      descr: '鎻忚堪',
+      status: '鐘舵��',
+      proxyAddress: '浠g悊鍦板潃',
       enTableName: '鑻辨枃琛ㄥ悕绉�',
       prompt1: '璇疯緭鍏ュ浘灞傚悕绉�',
       prompt2: '璇烽�夋嫨鍥惧眰绫诲瀷',
       prompt3: '璇烽�夋嫨鏈嶅姟绫诲瀷',
       prompt4: '璇疯緭鍏ユ湇鍔″湴鍧�',
-      prompt6: '璇疯緭鍏ヨ嫳鏂囪〃鍚嶇О(濡�:m_geocontrolpoint)',
+      prompt6: '璇疯緭鍏ヨ嫳鏂囧悕绉�',
       prompt7: '璇疯緭鍏ュ娉ㄤ俊鎭�',
       prompt8: '璇烽�夋嫨鏁版嵁绫诲瀷',
+      prompt9: '璇疯緭鍏ユ祴璇曞湴鍧�',
+      prompt10: '璇疯緭鍏ユ弿杩颁俊鎭�',
+      prompt11: '璇疯緭鍏ヤ唬鐞嗗湴鍧�',
+      prompt12: '璇疯緭鍏ヨ〃鍚嶇О',
+      tableName: '琛ㄥ悕绉�'
     },
     dataStaticObj: {
       type1: '鏈嶅姟鍚嶇О',
@@ -278,7 +292,7 @@
     },
   },
   operatManage: {
-    operatManage: '杩愮淮绠$悊',
+    operatManage: '杩愮淮鐩戠',
     ResourceLog: '璧勬簮鏃ュ織',
     organizationManage: '鍗曚綅绠$悊',
     DownloadLog: '涓嬭浇鏃ュ織',

--
Gitblit v1.9.3