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/en.js |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 69e8700..b251746 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -67,8 +67,8 @@
   dataManage: {
     dataManage: 'Data Manage',
     catalogueManage: 'Directory management',
-    projectManagement: 'Project Management',
-    dataUpdata: 'dataUpdata',
+    projectManagement: 'Data Resource Catalog Management',
+    dataUpdata: 'Data warehousing and updating',
     datawarehousing: 'Data warehousing',
     rangeManage: 'Range management',
     dataRetrieval: 'Data query',
@@ -80,6 +80,7 @@
       menuName: 'menu name',
       menuType: 'Menu Type',
       layerName: 'Layer Name',
+      englishName: 'English name',
       layerType: 'Layer Type',
       serviceName: 'service name',
       serviceType: 'service type',
@@ -89,15 +90,28 @@
       dataType: 'data type',
       istrue: 'true',
       isfalse: 'false',
+      isEnable: 'Enable',
+      isDisuse: 'Disuse',
+      isStop: 'Stop',
+      testAddress: 'Test Address',
+      firm: 'firm',
+      descr: 'descr',
+      status: 'status',
+      proxyAddress: 'Proxy Address',
       enTableName: 'English Table Name',
       prompt1: 'Please enter a layer name',
       prompt2: 'Please select a layer type',
       prompt3: 'Please select a service type',
       prompt4: 'Please enter the service address',
 
-      prompt6: 'Please enter the name of the English table (eg: m_geocontrollpoint)',
+      prompt6: 'Please enter an English name',
       prompt7: 'Please enter note information',
       prompt8: 'Please select a data type',
+      prompt9: 'Please enter the testing address',
+      prompt10: 'Please enter descriptive information',
+      prompt11: 'Please enter the proxy address',
+      prompt12: 'Please enter a table name',
+      tableName: 'Table Name'
 
     },
     dataStaticObj: {
@@ -284,7 +298,7 @@
   },
   operatManage: {
     organizationManage: 'Organizational management',
-    operatManage: 'Operat Manage',
+    operatManage: 'Operation and maintenance supervision',
     ResourceLog: 'Resource Log',
     DownloadLog: 'Download Log',
     UserRoleAuthorization: 'User Role Authorization',

--
Gitblit v1.9.3