1.修改部分国际化英文翻译

2.修复无法添加子节点组的bug
3.调整登录页

4 files changed, 382 insertions, 390 deletions

diff --git a/WebRoot/i18n/globalMessages_en_US.properties b/WebRoot/i18n/globalMessages_en_US.properties
index 4e786c2..4c95949 100644
--- a/WebRoot/i18n/globalMessages_en_US.properties
+++ b/WebRoot/i18n/globalMessages_en_US.properties
@@ -104,7 +104,7 @@ remoteConn.text.svgMsg= No SVG plug-in installed, download and install
 ################################################
 #addCheckTypeSetInfo.jsp page
 actsi.message.title=Add Monitoring Category Setting Information
-actsi.text.checkTypeName1=Monitoring Category Name
+actsi.text.checkTypeName1=Monitoring Category
 actsi.text.checkTypeName=Monitoring Category
 actsi.text.tableName=Corresponding Database Table
 actsi.text.checkTypeName1.hasSpecialChar=There are special characters in the monitor category name. Please re-enter it.
@@ -175,7 +175,7 @@ ctsil.error.isDelete=Is sure to delete the setting information?
 ctsil.error.selectFile=Please select the imported file
 ctsil.error.selectFileType=Please select the correct import file type
 ctsil.error.isImport=Import monitoring category. Are you sure to import?
-ctsil.text.detecationTypeName=Monitoring Category Name
+ctsil.text.detecationTypeName=Monitoring Category
 ctsil.message.selectDetecationTypeDefault=Please Select
 ctsil.button.downloadModel=Download Template
 ctsil.button.import=Import
@@ -234,7 +234,7 @@ ctsl.message.noRecord=No Record
 #updateCheckTypeSetInfo.jsp page
 uctsi.message.title=Modify Monitoring Category Information
 uctsi.message.faild=Abnormal Operation!
-uctsi.message.checkTypeName1=Monitoring Category Name
+uctsi.message.checkTypeName1=Monitoring Category
 uctsi.message.tableName=Corresponding Database Table
 uctsi.error.hasSpecialChar=There are special characters in the monitoring category name, please re-enter
 uctsi.error.inputTableName=Please enter the database table name
@@ -887,7 +887,7 @@ prl.message.success=Operation is successful!
 prl.message.faild=Operation Failed!
 prl.message.hasSpecialChar=Input is a special character, please re-enter!
 prl.message.select=Please select a row!
-prl.text.checkTypeName=Monitoring Category Name
+prl.text.checkTypeName=Monitoring Category
 prl.message.checkTypeDefault=Please Select
 prl.text.processIdenName=Setting Name
 prl.message.processIdenName=Please enter the setting name
@@ -1076,7 +1076,7 @@ sitlc.text.showGrap=Graphics View
 sitlc.text.showList=List View
 
 #toConfigPort.jsp page
-tcp.message.title=Port State Configuration
+tcp.message.title=Port State Setting
 tcp.message.inputInfo=Input is a special character, please re-enter!
 tcp.text.nodeIp=Section      point
 tcp.message.nodeIp=Please enter node IP
@@ -1117,7 +1117,7 @@ adsi.message.pIdenFont=Please enter letters and numbers
 adsi.message.selectDefault=Please Select
 adsi.message.monitorCategory=Please select monitoring category first
 adsi.button.back=Back
-adsi.text.title=Monitor Settings Basic Information
+adsi.text.title=Monitoring Basic Information
 adsi.text.processIdenName=Setting Name
 adsi.text.processIden=Setting ID
 adsi.text.checkType=Monitoring Category
@@ -1162,7 +1162,7 @@ ddsi.text.processIdenName=Setting Name
 ddsi.text.processIden=Setting ID
 ddsi.text.nodeGroup=Node Groups
 ddsi.text.nodeIp=Node IP
-ddsi.text.checkTypeName=Monitoring Category Name
+ddsi.text.checkTypeName=Monitoring Category
 ddsi.text.checkType=Monitoring Category
 ddsi.text.checkWay=Monitoring Method
 ddsi.message.passive=Passive
@@ -1195,7 +1195,7 @@ ddsi.text.myFileFile=Script File
 ddsi.text.download=Click To Download
 
 #detecSetInfoList.jsp page
-dsil.message.title=Monitor Settings Information
+dsil.message.title=Monitoring Information
 dsil.message.success=Operation is successful!
 dsil.message.faild=Operation Failed!
 dsil.message.selectARow=Please select a row!
@@ -1205,11 +1205,11 @@ dsil.message.hasSpecialChar=Input is a special character, please re-enter!
 dsil.message.selectImportFile=Please select the imported file
 dsil.message.selectCorrectImportFile=Please select the correct import file type
 dsil.message.sureToImport=Import monitoring settings. Are you sure to import?
-dsil.message.detecationWarning=Monitor setting operation completed. Continue to maintain data?
+dsil.message.detecationWarning=Monitoring operation completed. Continue to maintain data?
 dsil.message.hint=Tip
 dsil.text.nodeIp=Node IP
 dsil.message.nodeIp=Please enter node IP
-dsil.text.checkTypeName=Monitoring Category Name
+dsil.text.checkTypeName=Monitoring Category
 dsil.message.selectDefault=Please Select
 dsil.text.processIdenName=Setting Name
 dsil.message.processIdenName=Please enter a setting name
@@ -1266,7 +1266,7 @@ udsi.message.lxr=Please select at least one user to view
 udsi.message.checkGapInfo=The monitoring and upload interval must be greater than or equal to 5 minutes
 udsi.message.selectDefault=Please Select
 udsi.button.back=Back
-udsi.text.title=Monitor Settings Basic Information
+udsi.text.title=Monitoring Basic Information
 udsi.text.processIdenName=Setting Name
 udsi.text.processIden=Setting ID
 udsi.text.checkType=Monitoring Category
@@ -1486,7 +1486,7 @@ emi1.text.addUser=Create User
 emi1.text.userGroup=User Group
 emi1.text.nodeGroup=Node Group
 emi1.text.targetPath=Destination Path
-emi1.text.missionComments=Mission Description
+emi1.text.missionComments=Task Description
 emi1.text.nodeIp=Node IP
 emi1.text.state=State
 emi1.text.returnValue=Return Value
@@ -1507,7 +1507,7 @@ emi2.text.userGroup=User Group
 emi2.text.nodeGroup=Node Group
 emi2.text.isFilter=Filter Results
 emi2.text.filterValue=Filter Content
-emi2.text.missionComments=Mission Description
+emi2.text.missionComments=Task Description
 emi2.text.startTime=Start Time
 emi2.text.endTime=End Time
 emi2.text.cycle=Cycle
@@ -1630,7 +1630,7 @@ bil.message.inputInfo=Input is a special character, please re-enter!
 bil.message.selectImportFile=Please select the imported file
 bil.message.selectFileType=Please select the correct import file type
 bil.message.sureToImport=Import cabinet, are you sure to import?
-bil.message.warning=Enclosure operation completed. Continue to maintain data?
+bil.message.warning=Cabinet operation completed. Continue to maintain data?
 bil.message.hint=Tip
 bil.text.nodeBoxTable=Cabinet Number
 bil.message.nodeBoxTable=Please enter the cabinet number
@@ -1773,7 +1773,7 @@ ril.button.downloadExample=Download Template
 ril.text.importXls=Import Excel
 ril.button.import=Import
 ril.button.export=Export
-ril.button.boxmanager=Enclosure Management
+ril.button.boxmanager=Cabinet Management
 ril.text.index=Serial Number
 ril.text.roomRows=Room Rows
 ril.text.roomCols=Computer Room Columns
@@ -1947,7 +1947,6 @@ dbi.button.back=Back
 #updateBrandInfo.jsp page
 ubi.message.addBrandInfoTitle=Add brand information
 ubi.text.brandName=Brand Name
-ubi.text.title=Edit Brand
 ubi.text.brandOid=Brand OID
 ubi.text.brandDesc=Brand Description
 
@@ -2000,7 +1999,7 @@ abdti.text.nameFormatInfo=[Y]: represents the location of the device itself in t
 abdti.text.diTableName=Monitoring Information Table
 abdti.text.indexFiled=Connection Field
 abdti.text.statusFiled=Status Field
-abdti.text.statusSymbols=Anomaly Comparators
+abdti.text.statusSymbols=Abnormal Comparators
 abdti.text.statusValue=Exception Comparison Value
 abdti.text.deviceDesc=Device Description
 abdti.text.autoAddDeviceID=Automatically add device labels at the end of the description
@@ -2037,7 +2036,7 @@ adti.text.figureFill=Device Picture
 adti.text.diTableName=Monitoring Information Table
 adti.text.indexFiled=Connection Field
 adti.text.statusFiled=Status Field
-adti.text.statusSymbols=Anomaly Comparators
+adti.text.statusSymbols=Abnormal Comparators
 adti.text.statusValue=Exception Comparison Value
 adti.text.deviceDesc=Device Description
 adti.button.add=Submit
@@ -2338,7 +2337,7 @@ uds.buttone.reset=Reset
 eid.message.title=Node Information
 eid.text.title=System Alert Information
 eid.text.errorName=Exception Type
-eid.text.errorCode=Anomaly Flag
+eid.text.errorCode=Abnormal Flag
 eid.text.errortIp=Exception Generated IP
 eid.text.errortGetip=Exception To Provide IP
 eid.text.errorTime=Exception Generation Time
@@ -2552,7 +2551,7 @@ asnti.text.source=Source File Or Directory
 asnti.text.coverFile=Overwrite Directory
 asnti.text.execCmd=Execute File Or Command
 asnti.text.execResult=Execution Result File
-asnti.text.missionName=Command Name
+asnti.text.missionName=Task Name
 asnti.text.mlmc=Please select the command name
 asnti.text.maxWaitTime1=Waiting Time
 asnti.text.coverPath=Overwrite Directory
@@ -2564,7 +2563,6 @@ asnti.message.missionType1=File Push
 asnti.message.missionType4=Command Execution
 asnti.message.missionType6=Upgrade Deployment
 asnti.text.systemIdName=View
-asnti.text.missionName=Task Name
 asnti.text.nodeGroup=Section  point  Group
 asnti.text.isNotNull=Can not be null
 asnti.button.select=Select
@@ -2663,11 +2661,10 @@ mcpfncs.text.startupFile=Startup File Or Command
 mcpfncs.text.pidFile=PID File
 mcpfncs.text.execParams=Startup Parameters
 mcpfncs.message.execParams=Multiple parameters are separated by semicolons
-mcpfncs.message.maxWaitTime=Waiting Time
+mcpfncs.message.maxWaitTime=Seconds (if it is empty, it will wait for 3 seconds by default)
 mcpfncs.text.recoveryFile=Recover Files Or Directories
 mcpfncs.text.recoverySets=Add Recovery Parameters
 mcpfncs.text.addBackupSets=Add backup parameters
-mcpfncs.message.maxWaitTime=Seconds (if it is empty, it will wait for 3 seconds by default)
 
 #missioncmdPara6ForNewSimilar.jsp page
 mcpfns6.text.path=Path
@@ -3317,7 +3314,7 @@ mrs.message.commandExec=Command Execution
 mrs.message.shellRegist=Shell Registration
 mrs.message.upgradeDeployment=Upgrade Deployment
 mrs.text.loopFlag=Period Tasks
-mrs.text.resultView=Mission Results View
+mrs.text.resultView=Task Results View
 mrs.text.pie=Task State Diagram
 mrs.text.line=Line Trend Chart
 mrs.text.data=Period Statistics
@@ -3368,9 +3365,9 @@ ntil.text.selectDefault=Please Select
 ntil.message.timed=Period Tasks
 ntil.message.untimed=Acyclic Tasks
 ntil.text.missionState=Task Status
-ntil.message.missionCreated=Mission created
+ntil.message.missionCreated=Task created
 ntil.message.missionExec=The task has started execution
-ntil.message.missionComplete=Mission completed
+ntil.message.missionComplete=Task completed
 ntil.message.execFailed=The task failed to execute
 ntil.message.revocation=Periodic tasks for revocation
 ntil.message.cancellation=Period cancellation
@@ -3415,7 +3412,7 @@ ntilc.message.getStream=Streaming Text Data Acquisition
 ntilc.message.commandExec=Command Execution
 ntilc.message.shellRegist=Shell Registration
 ntilc.message.upgradeDeployment=Upgrade Deployment
-ntilc.message.missionCreated=Mission created
+ntilc.message.missionCreated=Task created
 ntilc.message.taskExec=The task has started execution
 ntilc.message.completed=Completed
 ntilc.message.allSuccess=All succeeded
@@ -3544,7 +3541,7 @@ tt.text.execcommand=Execute Command
 ################################################## ###########
 #addSnmpDetecttypeInfo.jsp page
 asdti.message.title=Adding SNMP Monitoring Items
-asdti.text.sortName=SNMP Monitoring Category Name
+asdti.text.sortName=SNMP Monitoring Category
 asdti.text.title=Add SNMP Monitoring Items
 asdti.text.sortDesc=SNMP Monitoring Category Description
 asdti.text.submit=Submit
@@ -3553,7 +3550,7 @@ asdti.text.back=Back
 
 #detailSnmpDetecttypeInfo.jsp page
 dsdti.text.title=View SNMP Monitoring Items
-dsdti.text.sortName=SNMP Monitoring Category Name
+dsdti.text.sortName=SNMP Monitoring Category
 dsdti.text.sortDesc=SNMP Monitoring Category Description
 
 #snmpDetecttypeInfoList.jsp page
@@ -3562,7 +3559,7 @@ sdtil.message.success=Operation is successful!
 sdtil.message.faild=Operation Failed!
 sdtil.message.selectOne=Please select a row!
 sdtil.message.delete=Is sure to delete the setting information?
-sdtil.text.sortName=SNMP Monitoring Category Name
+sdtil.text.sortName=SNMP Monitoring Category
 sdtil.text.index=Serial Number
 sdtil.text.sortTypeDesc=SNMP Monitoring Category Description
 sdtil.text.noRecord=No Record
@@ -3570,7 +3567,7 @@ sdtil.text.noRecord=No Record
 #updateSnmpDetecttypeInfo.jsp page
 usdti.message.title=Modify SNMP Monitoring Items
 usdti.text.title=Modify SNMP Monitoring Items
-usdti.text.sortName=SNMP Monitoring Category Name
+usdti.text.sortName=SNMP Monitoring Category
 usdti.text.sortTypeDesc=SNMP Monitoring Category Description
 usdti.text.submit=Submit
 usdti.text.reset=Reset
@@ -3848,7 +3845,7 @@ eil.text.index=Serial Number
 eil.text.troubleCode=Error Code
 eil.text.troubleInfo=Trouble Name
 eil.text.troubleDescr=Error Description
-eil.text.systemName=System Name
+eil.text.systemName=View
 eil.text.createUser=Created By
 eil.text.createDate=Created
 eil.text.lastUpUser=Modifiers
@@ -4097,13 +4094,13 @@ uil.text.noRecord=No Record
 cg.message.title=Add Node Information
 cg.text.userGroup=User Group
 cg.text.room=Room
-cg.text.box=Enclosure
+cg.text.box=Cabinet
 cg.text.nodes=Node Groups/Nodes
 cg.text.indecate=Please do the task to 5, do data monitoring, please go to 6
-cg.text.mission=Mission
+cg.text.mission=Task
 cg.text.decateType=Detection Category
 cg.text.decateDate=Detection Data
-cg.text.decateSets=Monitor Settings
+cg.text.decateSets=Monitoring
 cg.message.brower=The browser does not support inline frames or is configured not to display inline frames.
 
 
@@ -4119,7 +4116,7 @@ mc.message.sureNodeExists=Make sure you have the nodes you need
 mc.message.toAddNode=Please add node for node group
 mc.text.userGroup=User Group
 mc.text.room=Room
-mc.text.box=Enclosure
+mc.text.box=Cabinet
 mc.text.nodeGroup=Node Groups
 mc.text.node=Node
 mc.text.decateType=Detection Category
@@ -4134,7 +4131,7 @@ tc.message.sureNodeExists=Make sure you have the nodes you need
 tc.message.toAddNode=Please add node for node group
 tc.text.userGroup=User Group
 tc.text.room=Room
-tc.text.box=Enclosure
+tc.text.box=Cabinet
 tc.text.nodeGroup=Node Groups
 tc.text.node=Node
 tc.text.mission=Tasks
@@ -4483,7 +4480,7 @@ updatenode.text.nodeMac=Node MAC
 updatenode.text.nNa=Node Name
 updatenode.text.nodeBoxIspn=Cabinet Number
 updatenode.text.nodeUType=Node Thickness (U-bit)
-updatenode.text.nodeBeginUType=Enclosure Start U Bit
+updatenode.text.nodeBeginUType=Cabinet Start U Bit
 updatenode.message.nodeBeginUType=Please select network element type
 updatenode.message.selectDefault=Please Select
 updatenode.message.nodeUType=Node thickness (U bit), please enter the number!
@@ -4616,7 +4613,7 @@ asi.message.ipRepeat.and=And
 asi.message.ipRepeat.with=With
 asi.button.back=Back
 asi.text.title=Adding Server Information
-asi.text.configIp=Configuration Manage IP
+asi.text.configIp=Managed IPs
 asi.message.configIp=Configure IP
 asi.message.getIp=Allocated IP
 asi.button.add=Add
@@ -4635,7 +4632,7 @@ dsi.text.serverIp=Server IP
 dsi.text.serverState=Server Status
 dsi.message.serverState0=Enabled
 dsi.message.serverState1=Disabled
-dsi.text.configIp=Configuration Manage IP
+dsi.text.configIp=Managed IPs
 
 #serverInfoList.jsp page
 serverinfo.message.title=DataController Management
@@ -4662,7 +4659,7 @@ serverinfo.button.showDiv=Export
 serverinfo.text.index=Serial Number
 serverinfo.text.createTime=Created At
 serverinfo.text.isOnline=Online
-serverinfo.text.configIp=Configuration Manage IP
+serverinfo.text.configIp=Managed IPs
 serverinfo.message.Y=Yes
 serverinfo.message.N=No
 serverinfo.button.downloadExampleUpdate=Download Template
@@ -4693,7 +4690,7 @@ upserver.message.ipRepeat.with=With
 upserver.button.back=Back
 upserver.text.title=Modify Server Information
 upserver.text.serverState=Server Status
-upserver.text.configIp=Configuration Manage IP
+upserver.text.configIp=Managed IPs
 upserver.message.configIp=Configure IP
 upserver.message.hasip=Allocated IP
 upserver.button.add=Add
@@ -4711,8 +4708,8 @@ upserver.button.reset=Reset
 addsysinfo.message.title=Add View Information
 addsysinfo.message.sysExists=The system already exists. Please re-enter!
 addsysinfo.message.faild=Abnormal operation!
-addsysinfo.text.systemName=System Name
-addsysinfo.text.systemDesc=System Description
+addsysinfo.text.systemName=View
+addsysinfo.text.systemDesc=View Description
 addsysinfo.text.systemIp=Register IP
 addsysinfo.text.systemPort=Register Port
 addsysinfo.message.systemName=There are special characters in the system name. Please re-enter it.
@@ -4732,8 +4729,8 @@ addsysinfo.text.reset=Reset
 detailsys.message.title=Network Management System
 detailsys.button.back=Back
 detailsys.text.title=View Basic Information
-detailsys.text.systemName=System Name
-detailsys.text.systemDesc=System Description
+detailsys.text.systemName=View
+detailsys.text.systemDesc=View Description
 detailsys.text.systemCreatetime=Add time
 detailsys.text.systemState=System State
 detailsys.message.systemState0=Enabled
@@ -4790,9 +4787,9 @@ sysinfolist.message.includeStart=Contains enabled views. Please reselect!
 sysinfolist.message.inputInfo=Enter special characters, please re-enter!
 sysinfolist.message.warning=Business system operation completed. Continue to maintain data?
 sysinfolist.message.hint=Tip
-sysinfolist.text.systemName=System Name
+sysinfolist.text.systemName=View
 sysinfolist.message.systemName=Please enter the system name
-sysinfolist.text.systemDesc=System Description
+sysinfolist.text.systemDesc=View Description
 sysinfolist.message.systemDesc=Please enter a system description
 sysinfolist.text.index=Serial Number
 sysinfolist.text.isMaster=Master/Subsystem
@@ -4809,8 +4806,8 @@ sysinfolist.text.noRecord=No Record
 upsysinfo.message.title=Modify View Information
 upsysinfo.message.repeat=The system already exists. Please re-enter!
 upsysinfo.message.faild=Abnormal operation!
-upsysinfo.text.systemName=System Name
-upsysinfo.text.systemDesc=System Description
+upsysinfo.text.systemName=View
+upsysinfo.text.systemDesc=View Description
 upsysinfo.message.systemName=There are special characters in the system name. Please re-enter it.
 upsysinfo.button.back=Back
 upsysinfo.text.title=Modify View Information
@@ -4839,7 +4836,7 @@ check_type_info.process.TABLE_DESC=Default Process Information
 check_type_info.NMSClient.TABLE_DESC=Agent monitoring service starts monitoring task list
 check_type_info.systeminfo.TABLE_DESC=Server System Information
 check_type_info.switchport.CHECK_TYPE_NAME1=Switch Monitoring
-check_type_info.net.CHECK_TYPE_NAME1=Network Condition Monitoring
+check_type_info.net.CHECK_TYPE_NAME1=Network Status Monitoring
 check_type_info.SYSTEM.TABLE_DESC=Get target host basic xinxi
 check_type_info.disk.CHECK_TYPE_NAME1=Hard Disk Monitoring
 check_type_info.dpSystemStatus.CHECK_TYPE_NAME1=DP System Status
@@ -5158,7 +5155,7 @@ plugin_info.hh.file_name=1_Create a New Microsoft Visio Drawing .vsdx
 #Tue Apr 17 18:13:03 CST 2018
 set_det_data_con.5.menu_name=Alarm Information
 set_det_data_con.2.menu_name=Alarm Information
-set_det_data_con.3.menu_name=Exception Server
+set_det_data_con.3.menu_name=Abnormal Server
 set_det_data_con.4.menu_name=Abnormal Network Element
 set_det_data_con.1.menu_name=Business Logic Topology
 #tabledboperationrpt
@@ -5203,23 +5200,23 @@ xt_js_jbxx.regionRole.jsms=Sub-central user role authorization with data display
 #xt_mk_jbxx
 #Tue Apr 17 18:20:41 CST 2018
 xt_mk_jbxx.361.mkmc=Port State Configuration
-xt_mk_jbxx.303.mkmc=Copy Of The Task
-xt_mk_jbxx.381.mkmc=Network Element Monitoring
+xt_mk_jbxx.303.mkmc=Task Duplicating
+xt_mk_jbxx.381.mkmc=Network Element
 xt_mk_jbxx.313.mkmc=Setting Alarms
 xt_mk_jbxx.543.mkms=Add New Plugin
 xt_mk_jbxx.12.mkms=New Fault Library
-xt_mk_jbxx.269.mkmc=Monitor Configuration
+xt_mk_jbxx.269.mkmc=Monitoring
 xt_mk_jbxx.299.mkmc=Upline
 xt_mk_jbxx.545.mkms=Remove Plugin
-xt_mk_jbxx.421.mkmc=Monitoring Alarm Configuration
+xt_mk_jbxx.421.mkmc=Monitoring Alarm Setting
 xt_mk_jbxx.307.mkmc=Enabled
 xt_mk_jbxx.14.mkms=New Module Management
-xt_mk_jbxx.279.mkmc=Permissions Management
+xt_mk_jbxx.279.mkmc=Permissions
 xt_mk_jbxx.441.mkmc=3D Room
 xt_mk_jbxx.461.mkmc=Brand Management
 xt_mk_jbxx.309.mkmc=Edit
 xt_mk_jbxx.501.mkmc=Alarm Information
-xt_mk_jbxx.521.mkmc=Monitoring Filter Configuration
+xt_mk_jbxx.521.mkmc=Monitoring Filter Setting
 xt_mk_jbxx.10.mkmc=Add
 xt_mk_jbxx.14.mkmc=Module Management
 xt_mk_jbxx.16.mkmc=Add Submodules
@@ -5228,24 +5225,24 @@ xt_mk_jbxx.274.mkms=Node Group and Node Maintenance
 xt_mk_jbxx.266.mkms=Views of task information and execution status and results only.
 xt_mk_jbxx.276.mkms=DC Management Scope
 xt_mk_jbxx.288.mkms=User Group Management Interface
-xt_mk_jbxx.270.mkmc=Category Configuration
+xt_mk_jbxx.270.mkmc=Monitoring Category
 xt_mk_jbxx.1.mkms=System Module Management, Etc.
 xt_mk_jbxx.280.mkmc=Department Configuration
-xt_mk_jbxx.272.mkmc=Special Equipment Configuration
+xt_mk_jbxx.272.mkmc=Exclusive Device Setting
 xt_mk_jbxx.262.mkmc=Server Monitoring
 xt_mk_jbxx.282.mkmc=User Management
-xt_mk_jbxx.274.mkmc=Node Configuration
+xt_mk_jbxx.274.mkmc=Node Setting
 #xt_mk_jbxx.264.mkmc=Special Monitoring
-xt_mk_jbxx.264.mkmc=Exclusive Device Monitor
+xt_mk_jbxx.264.mkmc=Exclusive Device
 xt_mk_jbxx.310.mkmc=Delete
 xt_mk_jbxx.284.mkmc=Data Display
-xt_mk_jbxx.266.mkmc=Mission View
+xt_mk_jbxx.266.mkmc=Task Status
 xt_mk_jbxx.542.mkms=Add, Delete, Check, And Download Plug-ins
-xt_mk_jbxx.276.mkmc=DC Range Configuration
+xt_mk_jbxx.276.mkmc=DC Range Setting
 xt_mk_jbxx.11.mkms=System Fault Library
 xt_mk_jbxx.9.mkms=Data Dictionary and Parameter Configuration Function
 xt_mk_jbxx.304.mkmc=Add Reverse
-xt_mk_jbxx.288.mkmc=User Group Configuration
+xt_mk_jbxx.288.mkmc=User Group Setting
 xt_mk_jbxx.544.mkms=Modify Plugins
 xt_mk_jbxx.306.mkmc=Disabled
 xt_mk_jbxx.13.mkms=Modify Fault Bank
@@ -5262,13 +5259,13 @@ xt_mk_jbxx.285.mkms=Topology Display
 xt_mk_jbxx.267.mkms=Configuration Management
 xt_mk_jbxx.269.mkms=Configure Monitoring Settings Information
 xt_mk_jbxx.289.mkms=Add User Group
-xt_mk_jbxx.271.mkmc=Mission Configuration
-xt_mk_jbxx.261.mkmc=Exception Server
+xt_mk_jbxx.271.mkmc=Task Management
+xt_mk_jbxx.261.mkmc=Abnormal Server
 xt_mk_jbxx.281.mkmc=Actor Configuration
-xt_mk_jbxx.273.mkmc=Room Configuration
-xt_mk_jbxx.263.mkmc=Anomaly Network Element
+xt_mk_jbxx.273.mkmc=Room Setting
+xt_mk_jbxx.263.mkmc=Abnormal Network Element
 xt_mk_jbxx.293.mkmc=Offline
-xt_mk_jbxx.283.mkmc=Modify Personal Information
+xt_mk_jbxx.283.mkmc=Profile
 xt_mk_jbxx.275.mkmc=View Configuration
 xt_mk_jbxx.501.mkms=Display configuration level alarm information, including server and network element
 xt_mk_jbxx.521.mkms=Set filtering conditions (alarm level, emergency) for the business logic topology, alarm information, abnormal server, abnormal network element, and system warning information menu
@@ -5301,7 +5298,7 @@ xt_mk_jbxx.33.mkmc=Node Management
 xt_mk_jbxx.72.mkms=Delete Machine Room Information
 xt_mk_jbxx.245.mkms=Add 2
 xt_mk_jbxx.141.mkmc=Node Group Display
-xt_mk_jbxx.267.mkmc=Configuration Management
+xt_mk_jbxx.267.mkmc=Configuration
 xt_mk_jbxx.67.mkms=Enable Scheduled Tasks
 xt_mk_jbxx.23.mkms=View and operate all views
 xt_mk_jbxx.2.mkms=User/User Group/Role Permissions Configuration
@@ -5321,7 +5318,7 @@ xt_mk_jbxx.79.mkmc=Topology Display
 xt_mk_jbxx.68.mkms=Add A New Reverse Task
 xt_mk_jbxx.121.mkms=Network Element Graphical Configuration
 xt_mk_jbxx.40.mkms=Add Subnode Group
-xt_mk_jbxx.316.mkmc=Task Configuration Wizard
+xt_mk_jbxx.316.mkmc=Task Management Wizard
 xt_mk_jbxx.24.mkms=New View
 xt_mk_jbxx.51.mkms=Add Monitoring Settings
 xt_mk_jbxx.46.mkmc=OID Dictionary Management
@@ -5330,11 +5327,11 @@ xt_mk_jbxx.19.mkms=Role Management
 xt_mk_jbxx.73.mkmc=3D Machine Room Map
 xt_mk_jbxx.57.mkmc=Monitoring Data
 xt_mk_jbxx.62.mkms=Data that requires an alarm
-xt_mk_jbxx.181.mkmc=Task Configuration Wizard
+xt_mk_jbxx.181.mkmc=Task Management Wizard
 xt_mk_jbxx.68.mkmc=Add Reverse
 xt_mk_jbxx.121.mkmc=Network element graphical configuration
 xt_mk_jbxx.40.mkmc=Add Subnode Group
-xt_mk_jbxx.321.mkmc=Exception Device
+xt_mk_jbxx.321.mkmc=Abnormal Device
 xt_mk_jbxx.3.mkmc=View
 xt_mk_jbxx.19.mkmc=Role Management
 xt_mk_jbxx.58.mkms=Set Monitoring Category
@@ -5410,7 +5407,7 @@ DeptManageAction.update.success=Operation successful
 DeptManageAction.update.faild=Operation failed
 #CheckTypeSetAction
 CheckTypeSetAction.downloadExample.title.monitorType=Monitoring Category (Required)
-CheckTypeSetAction.downloadExample.title.monitorTypeName=Monitoring Category Name (Required)
+CheckTypeSetAction.downloadExample.title.monitorTypeName=Monitoring Category(Required)
 CheckTypeSetAction.downloadExample.title.remark=Remarks
 CheckTypeSetAction.downloadExample.title.mapTable=Corresponding Database Table (Required)
 CheckTypeSetAction.downloadExample.title.tableDesc=Table Description
@@ -5447,7 +5444,7 @@ CheckTypeSetAction.downloadExample.errorInfo25=Whether the {0} row 5 column node
 CheckTypeSetAction.downloadExample.errorInfo26={0}column node table name cannot be empty;
 CheckTypeSetAction.downloadExample.errorInfo27={0}column node table name error;
 CheckTypeSetAction.downloadExample.detecateType=Monitoring Category
-CheckTypeSetAction.downloadExample.detecateTypeName=Monitoring Category Name
+CheckTypeSetAction.downloadExample.detecateTypeName=Monitoring Category
 CheckTypeSetAction.downloadExample.remark=Notes
 CheckTypeSetAction.downloadExample.tableMap=Corresponding Database Table
 CheckTypeSetAction.downloadExample.tableDesc=Table Description
@@ -5497,7 +5494,7 @@ CheckTypeSetAction.addCheckTypeSetInfo.detecateNameRepeat=Duplicate monitoring c
 CheckTypeSetAction.addCheckTypeSetInfo.detecateRepeat=Duplicate monitoring category, please re-enter!
 CheckTypeSetAction.addCheckTypeSetInfo.tableExists=Already exists in the data table. It is forbidden to modify SNMP monitoring!
 CheckTypeSetAction.addCheckTypeSetInfo.validateTable=Authenticating the table for exceptions
-CheckTypeSetAction.addCheckTypeSetInfo.detecateSetsExists=Monitor settings already exist in this category and it is forbidden to delete!
+CheckTypeSetAction.addCheckTypeSetInfo.detecateSetsExists=Monitoring already exist in this category and it is forbidden to delete!
 
 #DetectionSetAction
 DetectionSetAction.downloadExample.title.setName=Set Name (Required)
@@ -5599,7 +5596,7 @@ DetectionSetAction.downloadExample.valid=Valid
 DetectionSetAction.downloadExample.unvalid=Invalid
 DetectionSetAction.downloadExample.title1.nodeGroup=Node Group
 DetectionSetAction.downloadExample.title1.nodeIp=Node IP
-DetectionSetAction.downloadExample.title1.moniteType=Monitoring Category Name
+DetectionSetAction.downloadExample.title1.moniteType=Monitoring Category
 DetectionSetAction.downloadExample.title1.moniteTime=Monitoring Interval (Minutes)
 DetectionSetAction.downloadExample.title1.tryTimes=Attempts
 DetectionSetAction.downloadExample.title1.outTime=Timeout (Seconds)
@@ -5702,7 +5699,7 @@ MonitorDataAction.emportCurrentXlsAbnormalSet.title.lastCheckTime=Last Checkup T
 MonitorDataAction.emportCurrentXlsAbnormalSet.title.duration=Duration
 MonitorDataAction.emportCurrentXlsAbnormalSet.title.attempt=Attempts
 MonitorDataAction.emportCurrentXlsAbnormalSet.title.stateInfo=Status Information
-MonitorDataAction.emportCurrentXlsAbnormalSet.deviceException=Exception Device Information Table
+MonitorDataAction.emportCurrentXlsAbnormalSet.deviceException=Abnormal Device Information Table
 MonitorDataAction.emportCurrentXlsAbnormalSet.detecateData=Monitoring Data Information Table
 MonitorDataAction.emportCurrentXlsAbnormalSet.faild=Operation failed
 MonitorDataAction.emportCurrentXlsAbnormalSet.success=Operation successful
@@ -5848,7 +5845,7 @@ MissionParameterDefaultsAction.check.setingInfo=Parameter Information
 #SimpleMissionAction.java
 SimpleMissionAction.add.toAddView=Jump to add page action
 SimpleMissionAction.check.saveMissionInfo=Save task and parameter information operations
-SimpleMissionAction.check.missionTypeError=Mission type error ~ Error
+SimpleMissionAction.check.missionTypeError=Task type error ~ Error
 SimpleMissionAction.check.stopMission=Disable task operation
 SimpleMissionAction.check.appUpdate=Application Upgrade
 SimpleMissionAction.check.validateConfig=Configuration correctness verification
@@ -5908,7 +5905,7 @@ NmsTaskManagerAction.executeAction.success=Operation succeeded
 NmsTaskManagerAction.executeAction.sql1=update mission_state_table mst set mst.mission_state_desc = 'Total'+total+' execution nodes,</br>'+(total-ok-fail)+'not executed,</br>'+( Ok+fail) + "have executed [success] +ok +", failed "+fail +"]'
 NmsTaskManagerAction.executeAction.missionExec=Task execution notification
 NmsTaskManagerAction.executeAction.missionComplete=End of task execution
-NmsTaskManagerAction.executeAction.missionRevokeComplete=Tasks is  revoked complete
+NmsTaskManagerAction.executeAction.missionRevokeComplete=Tasks is revoked complete
 NmsTaskManagerAction.executeAction.validFaild=Decision failed
 NmsTaskManagerAction.executeAction.sql2=update mission_state_table mst set mst.mission_state_desc = 'Latest period total' + total + 'execution nodes, </br>' + (total-ok-fail) + 'not executed, </br>' +(ok+fail)+"have executed [success]+ok+", failed"+fail+"]' where mst.mission_id
 NmsTaskManagerAction.executeAction.validFaildLoop=The status of the current task is re-evaluated after the failure, and the task status description (cycle) is abnormal
@@ -6033,7 +6030,7 @@ NodeManageAction.addNodeInfo.errorInfo22={0} Line 12 column node status cannot b
 NodeManageAction.addNodeInfo.errorInfo23={0} Line 12 column node status error;
 NodeManageAction.addNodeInfo.selectFileIsNull=The selected file is empty. Please reselect!
 NodeManageAction.addNodeInfo.noBoxWithNode=The cabinet selected for this node does not exist
-NodeManageAction.addNodeInfo.spaceToSmall=This node was selected for placement beyond the enclosure
+NodeManageAction.addNodeInfo.spaceToSmall=This node was selected for placement beyond the cabinet
 NodeManageAction.addNodeInfo.boxHadNodeDesc=This node has placed a node in the selected cabinet location
 NodeManageAction.addNodeInfo.nodeHadIpDesc=This IP already exists in this node group
 NodeManageAction.addNodeInfo.importFaild=The node group for this node is empty and the import failed
@@ -6055,11 +6052,6 @@ BoxSetAction.queryBoxInfo.updateFaild=Update failed!
 BoxSetAction.queryBoxInfo.hadUpdateNodeToDelete1=The cabinet 
 BoxSetAction.queryBoxInfo.hadUpdateNodeToDelete2= has been maintained nodes  and it is forbidden to delete it!
 BoxSetAction.queryBoxInfo.deleteFaild=Delete failed!
-BoxSetAction.queryBoxInfo.title=Number (Required)
-BoxSetAction.queryBoxInfo.title=U-Bit (Required)
-BoxSetAction.queryBoxInfo.title=Room Number (Required)
-BoxSetAction.queryBoxInfo.title=Room Line Number (Required)
-BoxSetAction.queryBoxInfo.title=Room Column Number (Required )
 BoxSetAction.queryBoxInfo.title=Description (Required)
 BoxSetAction.queryBoxInfo.boxBaseInfo=Cabinet Basic Information Table
 BoxSetAction.queryBoxInfo.errorInfo1={0} line 1 column node number cannot be empty;
@@ -6408,7 +6400,6 @@ DeviceBrandManageAction.downloadExampleType1.title2.nameFormat=Name Format ([Y]:
 DeviceBrandManageAction.downloadExampleType1.title2.picLevel=Graphics Level
 DeviceBrandManageAction.downloadExampleType1.title2.isLeaf=Is The Leaf Device (Required, 1 Yes, 0 No)
 DeviceBrandManageAction.downloadExampleType1.title3.bordModel=Board Model (Required, Unique identifier of the device)
-DeviceBrandManageAction.downloadExampleType1.title3.brand=Affiliated Brand (Required, Corresponding brand code)
 DeviceBrandManageAction.downloadExampleType1.title3.brand=Equipment description
 DeviceBrandManageAction.downloadExampleType1.title3.picType=Picture Type
 DeviceBrandManageAction.downloadExampleType1.title3.X=X Coordinate
@@ -6560,7 +6551,7 @@ DeviceBrandManageAction.impDevicesByExcel.deviceManageValidateFaild=Device manag
 GuideManageAction.getUserMk.systemManage=View Management
 GuideManageAction.getUserMk.usergroupManage=User Group Management
 GuideManageAction.getUserMk.roomManage=Room Management
-GuideManageAction.getUserMk.boxManage=Enclosure Management
+GuideManageAction.getUserMk.boxManage=Cabinet Management
 GuideManageAction.getUserMk.nodegroupManage=Node Group Management
 GuideManageAction.getUserMk.missionManage=Task Management
 GuideManageAction.getUserMk.detecateTypeManage=Monitoring Category Settings
@@ -6713,9 +6704,9 @@ MailingThread.call.threadName=Mail Sending Thread
 
 #EmailTypeConstants.java
 EmailTypeConstants.content.DESC_DETECTION_INFO_RECOVER=Monitoring information recovery
-EmailTypeConstants.content.DESC_DETECTION_INFO_EXCEPTION=Anomaly monitoring information
+EmailTypeConstants.content.DESC_DETECTION_INFO_EXCEPTION=Abnormal monitoring information
 EmailTypeConstants.content.DESC_DETECTION_INFO_TIMEOUT=Monitoring information timeout
-EmailTypeConstants.content.DESC_ALARM_INFO_EXCEPTION=Active alarm anomaly
+EmailTypeConstants.content.DESC_ALARM_INFO_EXCEPTION=Active alarm abnormal
 EmailTypeConstants.content.DESC_ALARM_INFO_RECOVER=Active alarm recovery
 EmailTypeConstants.content.DESC_TASK_NODE_RESULT_ERROR=Node result failure
 EmailTypeConstants.content.DESC_TASK_STATE_CHANGE=Task state change
@@ -6906,24 +6897,24 @@ ThreadService.detectDatasTimeoutCheck.timeout=Get monitoring data timeout
 ThreadService.detectDatasTimeoutCheck.ips=Multipe ip
 
 
-client.Sysconfig.init=Lack of configuration file, program cannot be executed! \n Please execute the configuration program for configuration first
+client.Sysconfig.init=Lack of configuration file, program cannot be executed\! \n Please execute the configuration program for configuration first
 client.Sysconfig.error=Error
 
 client.AlarmThread.processExists=process exists, but
-client.AlarmThread.loopMission1=The scheduled task\u201c
-client.AlarmThread.loopMission2=\u201ddoes not exist
+client.AlarmThread.loopMission1=The scheduled task\u201C
+client.AlarmThread.loopMission2=\u201Ddoes not exist
 client.AlarmThread.state=This status lasted
 client.AlarmThread.times=times
-client.AlarmThread.dataFileNotExists1=Data file directory\u201c
-client.AlarmThread.dataFileNotExists2=\u201ddoes not exist
+client.AlarmThread.dataFileNotExists1=Data file directory\u201C
+client.AlarmThread.dataFileNotExists2=\u201Ddoes not exist
 client.AlarmThread.dataSize=Monitor data file size is 0
 client.AlarmThread.noDetecateData=No monitoring data
 
 client.StartPluginRun.startupDetecate=Start Tripartite Monitoring
-client.StartPluginRun.startupDetecateErr1=Tripartite monitor failed to start. Please check if the process startup file\u201c
-client.StartPluginRun.startupDetecateErr1.isTrue=\u201dis set correctly!
-client.StartPluginRun.startupDetecateErr2=Initiate tripartite monitoring anomaly and the monitoring script has not been issued!
-client.StartPluginRun.startupDetecateErr3=Initiate tripartite monitoring anomaly and monitor script execution error!
+client.StartPluginRun.startupDetecateErr1=Tripartite monitor failed to start. Please check if the process startup file\u201C
+client.StartPluginRun.startupDetecateErr1.isTrue=\u201Dis set correctly\!
+client.StartPluginRun.startupDetecateErr2=Initiate tripartite monitoring abnormal and the monitoring script has not been issued!
+client.StartPluginRun.startupDetecateErr3=Initiate tripartite monitoring abnormal and monitor script execution error!
 client.ServerCollectData.transFile=Postback Success
 
 client.SSLServer.sendMsg=The task parameters are incomplete and the task result cannot be found
@@ -6956,7 +6947,7 @@ client.AgentCommand.execFailDesc11=Execution failed: parameter is empty
 client.AgentCommand.execFailDesc12=Execution failed: Current server version is up-to-date
 client.AgentCommand.execFailDesc13=Execution failed: owner incorrect
 client.AgentCommand.execFailDesc14=Execution failed: Upgrade file name is empty
-client.AgentCommand.execFailDesc15=Execution failed: Upgrade file 
+client.AgentCommand.execFailDesc15=Execution failed\: Upgrade file 
 client.AgentCommand.execFailDesc16=Execution failed: Overwrite directory is empty
 client.AgentCommand.execFailDesc17=Execution failed: Overwrite directory does not exist
 client.AgentCommand.DCupdate=DC upgrade request
@@ -6976,17 +6967,16 @@ client.AgentCommand.backupSuccess5=The backup was successful. Details are as fol
 client.AgentCommand.backupFail5=Backup failed, details are as follows
 client.AgentCommand.backupFail6=Backup failed: An exception occurred
 client.AgentCommand.coverSuccess1=Overwrite success: no parameters specified, no need to override
-client.AgentCommand.coverFail1=Overwrite
 client.AgentCommand.coverFail1=failed, source file is empty
 client.AgentCommand.coverFail2=failed, source file does not exist 
 client.AgentCommand.coverFail3=failed, overwrite directory is empty
-client.AgentCommand.coverFail4=failed: Overwrite directory does not exist 
-client.AgentCommand.coverFail5=failed: overwrite directory 
+client.AgentCommand.coverFail4=failed\: Overwrite directory does not exist 
+client.AgentCommand.coverFail5=failed\: overwrite directory 
 client.AgentCommand.coverFail5.sameDir= with same source directory!
 client.AgentCommand.coverSuccess2=succeeds
 client.AgentCommand.coverSuccess2.to=to
 client.AgentCommand.coverFail6=failed
-client.AgentCommand.coverFail7= failed: The directory to be overwritten is read-only 
+client.AgentCommand.coverFail7= failed\: The directory to be overwritten is read-only 
 client.AgentCommand.coverSuccess3=Overwrite success, details are as follows
 client.AgentCommand.coverFail8=Overwrite failed, details are as follows
 client.AgentCommand.coverFail9=Overwrite failed: An exception occurred
@@ -7148,7 +7138,7 @@ server.CommonResources.mt_4=Command execution
 server.CommonResources.mt_6=Upgrade deployment
 server.CommonResources.loop_0=Acyclic tasks
 server.CommonResources.loop_1=Period tasks
-server.CommonResources.ec_1=Mission started
+server.CommonResources.ec_1=Task started
 
 server.Config.initConfig=Parameter configuration file not found\! \nPlease run 
 server.Config.initConfig.init=initialization parameter configuration
@@ -7200,11 +7190,11 @@ server.CommonService.errorInfo5=Location {0} Data Monitoring Category cannot be
 server.CommonService.errorInfo6=Location {0} data ""+startTime+"" monitoring service start time must be integer
 server.CommonService.errorInfo7=Location {0} data monitoring service startup time cannot be empty
 server.CommonService.errorInfo8=Location {0} data "{1}" Detection delay (seconds) must be integer
-server.CommonService.errorInfo9=Location {0} data \u201c{1}\u201d The detection time must be integer
+server.CommonService.errorInfo9=Location {0} data \u201C{1}\u201D The detection time must be integer
 server.CommonService.errorInfo10=Location {0} Data This test cannot be empty
 server.CommonService.errorInfo11=Location {0} data "{1}" Attempt must be an integer
 server.CommonService.errorInfo12=Location {0} data Attempt cannot be empty
-server.CommonService.errorInfo13=Location {0} data \u201c{1}\u201d The next scheduled monitoring time must be integer
+server.CommonService.errorInfo13=Location {0} data \u201C{1}\u201D The next scheduled monitoring time must be integer
 server.CommonService.errorInfo14=Location {0} Data Attempt cannot be null
 server.CommonService.errorInfo15=Location {0} data "{1}" Execution state must be integer
 server.CommonService.errorInfo16=Location {0} Data Execution state cannot be empty
@@ -7225,14 +7215,14 @@ server.CommonService.errorInfo21=Location {0} Data node seqId (Physical Host ID)
 server.CommonService.errorInfo22=Location {0} Data Monitoring Settings ID cannot be empty
 server.CommonService.errorInfo23=Location {0} Data Monitoring Settings ID is not an integer (including 0)
 server.CommonService.errorInfo24=Location {0} Data Monitoring Category cannot be empty
-server.CommonService.errorInfo25=Location {0} data \u201c{1}\u201d monitoring service startup time must be integer
+server.CommonService.errorInfo25=Location {0} data \u201C{1}\u201D monitoring service startup time must be integer
 server.CommonService.errorInfo26=Location {0} data monitoring service startup time cannot be empty
 server.CommonService.errorInfo27=Location {0} data "{1}" Detection delay (seconds) must be integer
-server.CommonService.errorInfo28=Location {0} Data \u201c{1}\u201d This detection time must be an integer
+server.CommonService.errorInfo28=Location {0} Data \u201C{1}\u201D This detection time must be an integer
 server.CommonService.errorInfo29=Location {0} Data This test cannot be empty
 server.CommonService.errorInfo30=Location {0} data "{1}" Attempt must be an integer
 server.CommonService.errorInfo31=Location {0} data Attempt cannot be empty
-server.CommonService.errorInfo32=Location {0} data \u201c{1}\u201d The next scheduled monitoring time must be integer
+server.CommonService.errorInfo32=Location {0} data \u201C{1}\u201D The next scheduled monitoring time must be integer
 server.CommonService.errorInfo33=Location {0} data Attempt cannot be empty
 server.CommonService.errorInfo34=Location {0} data "{1}" Execution state must be integer
 server.CommonService.errorInfo35=Location {0} data Execution state cannot be empty
@@ -7293,7 +7283,7 @@ server.LoadNewMissionThread.errorInfo2=The task end time has been exceeded The t
 server.LoadNewMissionThread.loopMissionState=Period task status
 server.LoadNewMissionThread.errorInfo3=Cycle task initialization exception, task cannot be executed
 server.LoadNewMissionThread.missionRevoke=Task Revocation Notification
-server.LoadNewMissionThread.missionRevokeStart=Mission cancelled execution started
+server.LoadNewMissionThread.missionRevokeStart=Task cancelled execution started
 server.LoadNewMissionThread.missionExecFail=Task execution failed
 server.LoadNewMissionThread.errorInfo4=The upgrade deployment task parameter is empty and the task cannot be executed
 server.LoadNewMissionThread.missionStart=Start the task
@@ -7364,10 +7354,10 @@ topoManage.topoNodeError2=There can only be one node
 topoManage.topoNodeGroupError1=Topo nodegroup cannot be empty
 topoManage.topoNodeGroupError2=There can only be one nodegroup
 topoManage.topoNodeInfoError=Topo picture cannot be empty
-topoManage.handleSuccessInfo=Operation is successful\uff01
+topoManage.handleSuccessInfo=Operation is successful\uFF01
 topoManage.handleErrorInfo=Operation is error!
 topoManage.chooseTopoMessage=Please choose topo picture
 topoManage.TopoNodeMessage=Topo Node Message
 
-xt_mk_jbxx.604.mkmc=Advanced Configuration
+xt_mk_jbxx.604.mkmc=Advanced
 xt_mk_jbxx.604.mkms=Advanced configuration function menu
diff --git a/WebRoot/login.jsp b/WebRoot/login.jsp
index 3f90a4e..724075b 100644
--- a/WebRoot/login.jsp
+++ b/WebRoot/login.jsp
@@ -1,142 +1,141 @@
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%@ taglib uri="/jstl/c" prefix="c"%>
-<%@ taglib prefix="fn" uri="/jstl/fn"%>
-<%@ taglib prefix="fmt" uri="/jstl/fmt"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<link rel="Shortcut icon" href="images/logo.ico"/>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>i18n_login.message.title_n81i</title>
-<style type="text/css">
-* {margin:0px;
-   padding:0px;}
-	
-html, body {;
-           background:#EBECEB;;}
-
-.login{font-size:14px;
-     margin-left:10px;
-	 width:200px;
-	 height:155px;}
-.loginInput{
-	margin-top:5px;
-	/* border:1px solid #62c1c6;
-	border-radius: 5px 5px 5px 5px; */
-	text-align: left;
-}
-.loginInput img{
-	width: 25px;
-	height: 20px;
-	margin-right:5px;
-	float:left;
-}	   	 
-
-</style>
-</head>
-<script type="text/javascript">  
-	function sub(){
-		var userName=document.getElementById("yhmc").value;
-		var password=document.getElementById("yhmm").value;
-		if(userName==''){
-			//ymPrompt.errorInfo({message:'请输入用户编号或密码！',title:'提示',width:250,height:180});
-			alert("i18n_login.message.username_n81i");
-			return false;
-		}
-		if(password==''){
-			//ymPrompt.errorInfo({message:'请输入用户编号或密码！',title:'提示',width:250,height:180});
-			alert("i18n_login.message.password_n81i");
-			return false;
-		}
-		
-		document.form1.submit();
-			
-	}
-	function enterkey(){
-	    try{	
-	    	var userName=document.getElementById("yhmc").value;
-			var password=document.getElementById("yhmm").value;
-	        //var el_keydown=window.event.srcElement;
-	        var event=arguments.callee.caller.arguments[0]||window.event;
-	        var el_keydown=arguments.callee.caller.arguments[0].target||window.event.srcElement;
-	         if(event.keyCode==13){
-	         	if(el_keydown.id=="yhmc" && el_keydown.value!=''&& password!=''){
-	         		 document.form1.submit();
-	         	}else if(el_keydown.id=="yhmm" && el_keydown.value!=''&& userName!=''){
-	         		 document.form1.submit();
-	         	}else{
-	         		//ymPrompt.errorInfo({message:'请输入用户编号或密码！',title:'提示',width:250,height:180});
-	         		alert("i18n_login.message.username_n81i");
-					return false;
-	         	}
-	         } 
-	    }catch(e){
-			return ;
-	    }
-}
-
-</script>
-<body>
-	<form action="login!login.do" name="form1" method="post">
-		<!-- 外部表格开始 -->
-		<table width="100%" height="100%" align="center" style="vertical-align:middle">
-			<tr>
-				<td width="55">&nbsp;</td>
-				<td height="750" >
-					<div align="center" style="vertical-align:middle">
-						<table cellpadding="0" cellspacing="0" border="0"  >
-							<tr>
-								<td><img src="images/login_web_03.jpg" height="114" /></td>
-								<td rowspan="4" style="background:#999999;width:4px;"></td>
-							</tr>
-							<tr>
-								<td><img src="images/login_web_04.jpg"  height="157" /></td>	 
-								<td width="43%">
-									<div class="login">
-										<table width="215"  height="100" cellpadding="0" cellspacing="0" >
-											<tr>
-												<td style="float:left;" colspan="2"><img src="images/login_07.jpg" width="212"  /></td>
-											</tr>
-											<tr>
-												<td height="25" colspan="2" ><div class="loginInput"><img  src="images/user.png"  /><input type="text" name="logInInfo.yhmc" title="i18n_login.message.yhmc_n81i" id="yhmc" value="" onkeyDown="enterkey();" style="width:150px;" /></div></td>
-											</tr>
-											<tr>
-												<td height="25" colspan="2"><div class="loginInput"><img  src="images/pwd.png"  /><input type="password" name="logInInfo.yhmm" id="yhmm" value="" onkeyDown="enterkey();" style="width:150px;"/></div></td>
-											</tr>
-											<!-- 
-											<tr>
-												<td width="163"  height="25">验证码：<input type="text" name="验证码" style="width:95px;" /></td>
-												<td width="53" ><img src="images/img.jpg" /></td>
-											</tr>
-											 -->
-											<tr>
-												<td>
-													<table cellpadding="0" cellspacing="0" style="margin-left:56px;"  height="40" >
-														<tr>
-															<td width="45"  ><img src="images/button1.png" onclick="sub();"  /></td>
-															<td width="5">&nbsp;</td>
-															<td width="45"  ><img src="images/button2.png"  onclick="javascript:document.forms['form1'].reset()" /></td>
-														</tr>
-													</table>
-												</td>
-											</tr>
-										</table>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<td><img src="images/login_web_05.jpg"  height="134" /></td>
-							</tr> 
-						</table>
-					</div>
-				</td>
-				<td width="55">&nbsp;</td>
-			</tr>
-		</table>
-<!-- 外部表格结束 -->
-	</form>
-</body>
-<script>
-document.getElementById("yhmc").focus();
-</script>
-</html>
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>

+<%@ taglib uri="/jstl/c" prefix="c"%>

+<%@ taglib prefix="fn" uri="/jstl/fn"%>

+<%@ taglib prefix="fmt" uri="/jstl/fmt"%>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<link rel="Shortcut icon" href="images/logo.ico"/>

+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+<title>i18n_login.message.title_n81i</title>

+<style type="text/css">

+* {margin:0px;

+   padding:0px;}

+	

+html, body {;

+           background:#EBECEB;;}

+

+.login{font-size:14px;

+     margin-left:10px;

+     margin-top:65px;

+	 width:200px;

+	 height:155px;}

+.loginInput{

+	margin-top:5px;

+	/* border:1px solid #62c1c6;

+	border-radius: 5px 5px 5px 5px; */

+	text-align: left;

+}

+.loginInput img{

+	width: 25px;

+	height: 20px;

+	margin-right:5px;

+	float:left;

+}	   	 

+

+</style>

+</head>

+<script type="text/javascript">  

+	function sub(){

+		var userName=document.getElementById("yhmc").value;

+		var password=document.getElementById("yhmm").value;

+		if(userName==''){

+			//ymPrompt.errorInfo({message:'请输入用户编号或密码！',title:'提示',width:250,height:180});

+			alert("i18n_login.message.username_n81i");

+			return false;

+		}

+		if(password==''){

+			//ymPrompt.errorInfo({message:'请输入用户编号或密码！',title:'提示',width:250,height:180});

+			alert("i18n_login.message.password_n81i");

+			return false;

+		}

+		

+		document.form1.submit();

+			

+	}

+	function enterkey(){

+	    try{	

+	    	var userName=document.getElementById("yhmc").value;

+			var password=document.getElementById("yhmm").value;

+	        //var el_keydown=window.event.srcElement;

+	        var event=arguments.callee.caller.arguments[0]||window.event;

+	        var el_keydown=arguments.callee.caller.arguments[0].target||window.event.srcElement;

+	         if(event.keyCode==13){

+	         	if(el_keydown.id=="yhmc" && el_keydown.value!=''&& password!=''){

+	         		 document.form1.submit();

+	         	}else if(el_keydown.id=="yhmm" && el_keydown.value!=''&& userName!=''){

+	         		 document.form1.submit();

+	         	}else{

+	         		//ymPrompt.errorInfo({message:'请输入用户编号或密码！',title:'提示',width:250,height:180});

+	         		alert("i18n_login.message.username_n81i");

+					return false;

+	         	}

+	         } 

+	    }catch(e){

+			return ;

+	    }

+}

+

+</script>

+<body>

+	<form action="login!login.do" name="form1" method="post">

+		<!-- 外部表格开始 -->

+		<table width="100%" height="100%" align="center" style="vertical-align:middle">

+			<tr>

+				<td width="55">&nbsp;</td>

+				<td height="750" >

+					<div align="center" style="vertical-align:middle">

+						<table cellpadding="0" cellspacing="0" border="0"  >

+							<tr>

+								<td><img src="images/login_web_03.jpg" height="114" /></td>

+								<td rowspan="4" style="background:#999999;width:4px;"></td>

+							</tr>

+							<tr>

+								<td><img src="images/login_web_04.jpg"  height="157" /></td>	 

+								<td width="43%">

+									<div class="login">

+										<table width="215"  height="100" cellpadding="0" cellspacing="0" >

+											<tr></tr>

+											<tr>

+												<td height="25" colspan="2" ><div class="loginInput"><img  src="images/user.png"  /><input type="text" name="logInInfo.yhmc" title="i18n_login.message.yhmc_n81i" id="yhmc" value="" onkeyDown="enterkey();" style="width:150px;" /></div></td>

+											</tr>

+											<tr>

+												<td height="25" colspan="2"><div class="loginInput"><img  src="images/pwd.png"  /><input type="password" name="logInInfo.yhmm" id="yhmm" value="" onkeyDown="enterkey();" style="width:150px;"/></div></td>

+											</tr>

+											<!-- 

+											<tr>

+												<td width="163"  height="25">验证码：<input type="text" name="验证码" style="width:95px;" /></td>

+												<td width="53" ><img src="images/img.jpg" /></td>

+											</tr>

+											 -->

+											<tr>

+												<td>

+													<table cellpadding="0" cellspacing="0" style="margin-left:56px;"  height="40" >

+														<tr>

+															<td width="45"  ><img src="images/button1.png" onclick="sub();"  /></td>

+															<td width="5">&nbsp;</td>

+															<td width="45"  ><img src="images/button2.png"  onclick="javascript:document.forms['form1'].reset()" /></td>

+														</tr>

+													</table>

+												</td>

+											</tr>

+										</table>

+									</div>

+								</td>

+							</tr>

+							<tr>

+								<td><img src="images/login_web_05.jpg"  height="134" /></td>

+							</tr> 

+						</table>

+					</div>

+				</td>

+				<td width="55">&nbsp;</td>

+			</tr>

+		</table>

+<!-- 外部表格结束 -->

+	</form>

+</body>

+<script>

+document.getElementById("yhmc").focus();

+</script>

+</html>

diff --git a/WebRoot/page/systemManage/nodeGroupManage/nodegroupInfoList.jsp b/WebRoot/page/systemManage/nodeGroupManage/nodegroupInfoList.jsp
index 51c381e..63501cd 100644
--- a/WebRoot/page/systemManage/nodeGroupManage/nodegroupInfoList.jsp
+++ b/WebRoot/page/systemManage/nodeGroupManage/nodegroupInfoList.jsp
@@ -365,6 +365,7 @@
 			function commitAdd(){

 				if(checkForm()) {

 					$("input[id='isValid']").removeAttr('disabled');

+					$("#nodeGroupForm select").removeAttr('disabled');

 					document.nodeGroupForm.action="<%=path%>/nodeGroupManage/nodeGroupManage!execute.do?action=addNodeGroup";

 					document.nodeGroupForm.submit();	

 				}

diff --git a/WebRoot/systemSelect.jsp b/WebRoot/systemSelect.jsp
index cc0adec..96849e2 100644
--- a/WebRoot/systemSelect.jsp
+++ b/WebRoot/systemSelect.jsp
@@ -1,134 +1,136 @@
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%@ taglib uri="/jstl/c" prefix="c"%>
-<%@ taglib prefix="fn" uri="/jstl/fn"%>
-<%@ taglib prefix="fmt" uri="/jstl/fmt"%>
-<%
-String path = request.getContextPath();
-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><link rel="Shortcut icon" href="images/logo.ico"/>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>i18n_systemSelect.message.title_n81i</title>
-<script type="text/javascript" src="<c:url value='/js/menu.js'/>"></script>
-<link href="<c:url value='/css/nms.css'/>" rel="stylesheet" type="text/css" />	
-<script src="<c:url value='js/jquery-1.4.2.min.js'/>" type="text/javascript"></script>
-<style type="text/css">
-* {margin:0px;
-   padding:0px;}
-	
-html, body {;
-           background:#EBECEB;;}
-
-.login{font-size:14px;
-     margin-left:10px;
-	 width:200px;
-	 height:155px;}
-	 
-
-</style>
-</head>
-<script type="text/javascript">  
-	function sub(){	
-		document.form1.submit();
-	}
-	function exitSystem(){
-		document.form1.action = "<%=path%>/login!logout.do";
-		document.form1.submit();
-	}
-	function enterkey(){
-	   if(event.keyCode==13){
-			document.form1.submit();
-		}
-	}
-$(function(){
-	var wHight = $(window).height();//alert('wHight '+wHight);
-	var dHight = $(document).height();//alert('dHight '+dHight);
-	if(dHight > wHight){//滚动条滚动
-		$(document).scrollTop((dHight-wHight)/2);
-	}
-	$("#system").trigger('focus');
-});
-$(function(){
-	if(isFirefox=navigator.userAgent.indexOf("Firefox")>0){
-		$(document).keypress(function(e) {  
-		       if(e.which == 13) { 
-		       		sub(); 
-		       }  
-		}); 
-	 } 
-});
-</script>
-<body>
-	<form action="<c:url value='/login!systemSelect.do'/>" name="form1" method="post"  onkeydown="enterkey();">
-		<!-- 外部表格开始 -->
-		<table width="100%" height="100%" align="center" style="vertical-align:middle">
-			<tr>
-				<td width="55">&nbsp;</td>
-				<td height="750" >
-					<div align="center" style="vertical-align:middle" id="test">
-						<table cellpadding="0" cellspacing="0" border="0"  >
-							<tr>
-								<td><img src="<c:url value='/images/login_web_03.jpg'/>" height="114" /></td>
-								<td rowspan="4" style="background:#999999;width:4px;"></td>
-							</tr>
-							<tr>
-								<td><img src="<c:url value='/images/login_web_04.jpg'/>"  height="157" /></td>	 
-								<td width="%">
-									<div class="login" id="login">
-										<table width="215"  height="100" cellpadding="0" cellspacing="0" >
-											<tr>
-												<td style="float:left;" colspan="2"><img src="<c:url value='/images/login_08.jpg'/>" width="212"  /></td>
-											</tr>
-											<tr>
-												<td height="25" colspan="2" style="font-family: '微软雅黑';font-size: 15px;" align="middle">i18n_systemSelect.message.loginSuccess_n81i！</td>
-											</tr>
-											<tr>
-												<td height="25" colspan="2" style="font-family: '微软雅黑';font-size: 15px" nowrap="nowrap">
-												i18n_systemSelect.message.system_n81i：<select id='system' name='systemId'  >
-																						<c:forEach items="${stList}" var="st" >
-																						<option value="${st[0] }">${st[1] }</option>
-																						</c:forEach>
-																					</select>
-																					<input type="hidden" value=""/>
-																					<!-- 
-																					<input type="text" />
-																					 -->
-												</td>
-											</tr>
-											<tr>
-												<td>
-													<table cellpadding="0" cellspacing="0" style="margin-left:56px;"  height="40" >
-														<tr>
-															<td width="45">
-																	<img src="<c:url value='/images/button1.png'/>" onclick="sub();" />
-															</td>
-															<td width="5">
-																	&nbsp;
-															</td>
-															<td width="45">
-																	<img src="<c:url value='/images/tuichu.png'/>" onclick="exitSystem();"/>
-															</td>
-														</tr>
-													</table>
-												</td>
-											</tr>
-										</table>
-									</div>
-								</td>
-							</tr>
-							<tr>
-								<td><img src="<c:url value='/images/login_web_05.jpg'/>"  height="134" /></td>
-							</tr> 
-						</table>
-					</div>
-				</td>
-				<td width="55">&nbsp;</td>
-			</tr>
-		</table>
-<!-- 外部表格结束 -->
-	</form>
-</body>
-</html>
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>

+<%@ taglib uri="/jstl/c" prefix="c"%>

+<%@ taglib prefix="fn" uri="/jstl/fn"%>

+<%@ taglib prefix="fmt" uri="/jstl/fmt"%>

+<%

+String path = request.getContextPath();

+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";

+%>

+

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head><link rel="Shortcut icon" href="images/logo.ico"/>

+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+<title>i18n_systemSelect.message.title_n81i</title>

+<script type="text/javascript" src="<c:url value='/js/menu.js'/>"></script>

+<link href="<c:url value='/css/nms.css'/>" rel="stylesheet" type="text/css" />	

+<script src="<c:url value='js/jquery-1.4.2.min.js'/>" type="text/javascript"></script>

+<style type="text/css">

+* {margin:0px;

+   padding:0px;}

+	

+html, body {;

+           background:#EBECEB;;}

+

+.login{font-size:14px;

+     margin-left:10px;

+	 width:200px;

+	 height:155px;

+	 margin-top:25px;

+	 }

+	 

+

+</style>

+</head>

+<script type="text/javascript">  

+	function sub(){	

+		document.form1.submit();

+	}

+	function exitSystem(){

+		document.form1.action = "<%=path%>/login!logout.do";

+		document.form1.submit();

+	}

+	function enterkey(){

+	   if(event.keyCode==13){

+			document.form1.submit();

+		}

+	}

+$(function(){

+	var wHight = $(window).height();//alert('wHight '+wHight);

+	var dHight = $(document).height();//alert('dHight '+dHight);

+	if(dHight > wHight){//滚动条滚动

+		$(document).scrollTop((dHight-wHight)/2);

+	}

+	$("#system").trigger('focus');

+});

+$(function(){

+	if(isFirefox=navigator.userAgent.indexOf("Firefox")>0){

+		$(document).keypress(function(e) {  

+		       if(e.which == 13) { 

+		       		sub(); 

+		       }  

+		}); 

+	 } 

+});

+</script>

+<body>

+	<form action="<c:url value='/login!systemSelect.do'/>" name="form1" method="post"  onkeydown="enterkey();">

+		<!-- 外部表格开始 -->

+		<table width="100%" height="100%" align="center" style="vertical-align:middle">

+			<tr>

+				<td width="55">&nbsp;</td>

+				<td height="750" >

+					<div align="center" style="vertical-align:middle" id="test">

+						<table cellpadding="0" cellspacing="0" border="0"  >

+							<tr>

+								<td><img src="<c:url value='/images/login_web_03.jpg'/>" height="114" /></td>

+								<td rowspan="4" style="background:#999999;width:4px;"></td>

+							</tr>

+							<tr>

+								<td><img src="<c:url value='/images/login_web_04.jpg'/>"  height="157" /></td>	 

+								<td width="%">

+									<div class="login" id="login">

+										<table width="215"  height="100" cellpadding="0" cellspacing="0" >

+											<tr>

+												<td style="float:left;font-size:20px;font-weight:bold;" colspan="2"><font>Please select a view</font><%-- <img src="<c:url value='/images/login_08.jpg'/>" width="212"  /> --%></td>

+											</tr>

+											<tr>

+												<td height="25" colspan="2" style="font-family: '微软雅黑';font-size: 15px;" align="middle">i18n_systemSelect.message.loginSuccess_n81i！</td>

+											</tr>

+											<tr>

+												<td height="25" colspan="2" style="font-family: '微软雅黑';font-size: 15px" nowrap="nowrap">

+												i18n_systemSelect.message.system_n81i：<select id='system' name='systemId'  >

+																						<c:forEach items="${stList}" var="st" >

+																						<option value="${st[0] }">${st[1] }</option>

+																						</c:forEach>

+																					</select>

+																					<input type="hidden" value=""/>

+																					<!-- 

+																					<input type="text" />

+																					 -->

+												</td>

+											</tr>

+											<tr>

+												<td>

+													<table cellpadding="0" cellspacing="0" style="margin-left:56px;"  height="40" >

+														<tr>

+															<td width="45">

+																	<img src="<c:url value='/images/button1.png'/>" onclick="sub();" />

+															</td>

+															<td width="5">

+																	&nbsp;

+															</td>

+															<td width="45">

+																	<img src="<c:url value='/images/tuichu.png'/>" onclick="exitSystem();"/>

+															</td>

+														</tr>

+													</table>

+												</td>

+											</tr>

+										</table>

+									</div>

+								</td>

+							</tr>

+							<tr>

+								<td><img src="<c:url value='/images/login_web_05.jpg'/>"  height="134" /></td>

+							</tr> 

+						</table>

+					</div>

+				</td>

+				<td width="55">&nbsp;</td>

+			</tr>

+		</table>

+<!-- 外部表格结束 -->

+	</form>

+</body>

+</html>