1、修改部分英文翻译

2、修改页面 显示信息

13 files changed, 97 insertions, 88 deletions

diff --git a/gloam/.settings/org.eclipse.jdt.core.prefs b/gloam/.settings/org.eclipse.jdt.core.prefs
index fe16944..5500212 100644
--- a/gloam/.settings/org.eclipse.jdt.core.prefs
+++ b/gloam/.settings/org.eclipse.jdt.core.prefs
@@ -9,8 +9,13 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -98,4 +103,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/gloam/WebRoot/auditlog/auditlog-index.html b/gloam/WebRoot/auditlog/auditlog-index.html
index c9582fb..5bc509e 100644
--- a/gloam/WebRoot/auditlog/auditlog-index.html
+++ b/gloam/WebRoot/auditlog/auditlog-index.html
@@ -54,12 +54,12 @@
 													<th style='text-align:center;vertical-align: middle;'>
 														<span>#(_res.get("ip"))</span>
 													</th>
-													<th style='text-align:center;vertical-align: middle;'>
+													<!-- <th style='text-align:center;vertical-align: middle;'>
 														<span>#(_res.get("uri"))</span>
 													</th>
 													<th style='text-align:center;vertical-align: middle;'>
 														<span>#(_res.get("request.way"))</span>
-													</th>
+													</th> -->
 												</tr>
 											</thead>
 											<tbody>
@@ -78,12 +78,12 @@
 														<td class="logmessage">
 															<span>#(x.remote_addr)</span>
 														</td>
-														<td class="logmessage">
+														<!-- <td class="logmessage">
 															<span>#(x.request_uri)</span>
 														</td>
 														<td class="logmessage">
 															<span>#(x.method)</span>
-														</td>
+														</td> -->
 													</tr>
 													#end
 												#else
diff --git a/gloam/WebRoot/config/config.html b/gloam/WebRoot/config/config.html
index a1925cd..8467147 100644
--- a/gloam/WebRoot/config/config.html
+++ b/gloam/WebRoot/config/config.html
@@ -233,7 +233,7 @@ label.control-label{
 									<div class="control-group">
 										<label class="control-label" for="focusedInput">#(_res.get("mac"))</label>
 										<div class="controls">
-											<input class="input-medium focused" id=""
+											<input class="input-medium focused" id="" readonly="readonly"
 												type="text" value="#(deviceInfo.manageMac)"
 												name="deviceInfo#(for.index).manageMac"
 												onblur="checkMac(this, #(deviceInfo.manageMac == null || deviceInfo.manageMac == '' ? 0 : 1))">
diff --git a/gloam/WebRoot/detection/detectionInfoNew-setDetail.html b/gloam/WebRoot/detection/detectionInfoNew-setDetail.html
index f64633b..a3573d3 100644
--- a/gloam/WebRoot/detection/detectionInfoNew-setDetail.html
+++ b/gloam/WebRoot/detection/detectionInfoNew-setDetail.html
@@ -97,11 +97,11 @@ function mydown(obj) {
 								<thead>
 									<tr>
 										<th width="13%">#(_res.get("node.ip"))</th>
-										<th width="13%">#(_res.get("monitor.type"))</th>
-										<th width="13%">#(_res.get("monitor.setting"))</th>
+										<!-- <th width="13%">#(_res.get("monitor.type"))</th> -->
+										<th width="13%">#(_res.get("monitor"))</th>
 										<th width="5%">#(_res.get("monitor.status"))</th>
 										<th width="13%">#(_res.get("monitor.checktime"))</th>
-										<th width="43%">#(_res.get("monitor.information"))</th>
+										<th>#(_res.get("monitor.information"))</th>
 									</tr>
 								</thead>
 								<tbody id="tbody">
@@ -113,7 +113,7 @@ function mydown(obj) {
 									#for(x : page.getList())
 									<tr>
 										<td>#(x.ip)</td>
-										<td>#(x.monitorType)</td>
+										<!-- <td>#(x.monitorType)</td> -->
 										<td>#(x.monitorSetting)</td>
 										<td>
 											#if(x.monitorStatus == '1') 
diff --git a/gloam/WebRoot/detection/detectionInfoNew-typeDetail.html b/gloam/WebRoot/detection/detectionInfoNew-typeDetail.html
index 733adaa..f4d2a33 100644
--- a/gloam/WebRoot/detection/detectionInfoNew-typeDetail.html
+++ b/gloam/WebRoot/detection/detectionInfoNew-typeDetail.html
@@ -70,7 +70,7 @@ function mydown(obj) {
 									<td colspan="6" style="background-color:#eee;font-size:16px;color:black;">#(_res.get("monitor.data.details"))</td>
 								</tr>
 								<tr class="logmessage">
-									<td class="head">#(_res.get("monitor.setting"))</td>
+									<td class="head">#(_res.get("monitor"))</td>
 									<td>#(base.get("monitorSetting"))</td>
 									<td class="head">#(_res.get("node.ip"))</td>
 									<td>#(base.get("ip"))</td>
@@ -82,8 +82,10 @@ function mydown(obj) {
 									<td>#(base.get("checkTime"))</td>
 									<td class="head">#(_res.get("monitor.nextchecktime"))</td>
 									<td>#(base.get("nextCheckTime"))</td>
-									<td class="head">#(_res.get("monitor.arriveTime"))</td>
-									<td>#(base.get("arriveTime"))</td>
+									<td></td>
+									<td></td>
+									<!-- <td class="head">#(_res.get("monitor.arriveTime"))</td>
+									<td>#(base.get("arriveTime"))</td> -->
 								</tr>
 								<tr class="logmessage">
 									<td colspan="2" class="head" style="height:100px;">#(_res.get("monitor.information"))</td>
diff --git a/gloam/WebRoot/i18n/globalMessages_en_US.properties b/gloam/WebRoot/i18n/globalMessages_en_US.properties
index bb51a2c..e2da791 100644
--- a/gloam/WebRoot/i18n/globalMessages_en_US.properties
+++ b/gloam/WebRoot/i18n/globalMessages_en_US.properties
@@ -4932,7 +4932,7 @@ metadata.RX_PACKETS.filed_comments=Total Number Of Packages Received
 metadata.dpCpuRatioPeak.filed_comments=Peak CPU Utilization
 metadata.dpSlotStatus.filed_comments=Status Of Device Slot
 metadata.ifInDiscardsPerc.filed_comments=Enter Packet Loss Rate
-metadata.RX_BPS.filed_comments=Input bps (Unit:bps)
+metadata.RX_BPS.filed_comments=Input (Unit:bps)
 metadata.dpMemRatio.filed_comments=Memory Utilization
 metadata.TX_ERRORS_PERC.filed_comments=Send Error Packet Rate
 metadata.ifOutErrors.filed_comments=Outbound Failed Packets
@@ -4940,13 +4940,13 @@ metadata.PACKETS_LOST_RATE.filed_comments=Packet Loss Rate
 metadata.TIME_CONSUMING_MAX.filed_comments=Maximum Elapsed Time (In Milliseconds)
 metadata.ifLastChange.filed_comments=Status Change Time
 metadata.INOCTETSSPEED.filed_comments=Input Speed
-metadata.WAIT_CPU_PERC.filed_comments=Current Waiting Rate (wa%)
+metadata.WAIT_CPU_PERC.filed_comments=IO Wait (%)
 metadata.ifInErrors.filed_comments=Inbound Error Packets
 metadata.OUTERRORSSCALE.filed_comments=Output Error Packet Rate
-metadata.SYS_USED_CPU_PERC.filed_comments=System Utilization (sy%)
+metadata.SYS_USED_CPU_PERC.filed_comments=Os (%)
 metadata.sysDescr.table_comments=Get Target Host Basic Information
 metadata.dpMemRatioAverage.filed_comments=Average Memory Utilization
-metadata.FREE_DISK_SIZE.filed_comments=Disk Free Capacity (G)
+metadata.FREE_DISK_SIZE.filed_comments=Disk Free Capacity (GB)
 metadata.outPktsSpeed.filed_comments=Package Rate
 metadata.ifOutQLen.filed_comments=The Length Of The Output Packet Arrangement (intra-packet)
 metadata.RX_PPS.filed_comments=Input pps (Packets received per second)
@@ -4955,8 +4955,8 @@ metadata.DETECT_DATE.filed_comments=Monitor Time
 metadata.dpCpuTemperature.filed_comments=CPU Temperature
 metadata.ifInNUcastPkts.filed_comments=Admitted Non-unidirectional Transport Packets
 metadata.sysUpTime.table_comments=Get Target Host Basic Information
-metadata.FREE_MEMORY_SIZE.filed_comments=Free Memory (freeG)
-metadata.MEMORY_SIZE.filed_comments=Memory Size (unit: G)
+metadata.FREE_MEMORY_SIZE.filed_comments=Free Memory (GB)
+metadata.MEMORY_SIZE.filed_comments=Memory Size (GB)
 metadata.SEND_TIME.filed_comments=Send Time
 metadata.TX_BYTES.filed_comments=Total Bytes Sent
 metadata.ifHighSpeed.filed_comments=Port Rate Units (Mbps)
@@ -4966,8 +4966,8 @@ metadata.DELAY_TIME.filed_comments=Delay Time
 metadata.dpCpuRatio.filed_comments=CPU Utilization
 metadata.SEND_INFO.filed_comments=Send Information
 metadata.PACKETS_LOST.filed_comments=Number Of Lost Packets
-metadata.USER_USED_CPU_PERC.filed_comments=User Usage (us%)
-metadata.NICE_PERC.filed_comments=User Space Process CPU Occupancy Ratio (ni%)
+metadata.USER_USED_CPU_PERC.filed_comments=Application (%)
+metadata.NICE_PERC.filed_comments=User Nice Cpu Time (%)
 metadata.ifType.filed_comments=Port Type
 metadata.PACKETS_RECEIVED.filed_comments=Number Of Accepted Packages
 metadata.DISK_ISWRITE.filed_comments=Whether The Disk Is Writable
@@ -4985,19 +4985,19 @@ metadata.MEM_USED_PERC.filed_comments=\ Memory Usage Of The Process
 metadata.TX_PACKETS.filed_comments=Total Number Of Packages Sent
 metadata.dpSlotDesc.filed_comments=Description Of Device Hot Swappable Board
 metadata.dpSlotPortNum.filed_comments=Number Of Ports On The Device Hot-pluggable Board
-metadata.SIZE_STOREDINPAGING_FILES.filed_comments=Total Swap Space (SwaptotalG)
-metadata.CPU_MHZ.filed_comments=Frequency
+metadata.SIZE_STOREDINPAGING_FILES.filed_comments=Total Swap Space (GB)
+metadata.CPU_MHZ.filed_comments=Cpu MHz
 metadata.USED_DISK_PERC.filed_comments=Disk Usage (%)
 metadata.PROC_PRIORITY.filed_comments=Priority Of The Process
 metadata.USED_MEMORY_PERC.filed_comments=Memory Usage (%)
 metadata.ifInUcastPkts_t1.filed_comments=Acknowledgment Unidirectional Transport Packets
-metadata.FREE_SPACE_INPAGING_FILES.filed_comments=Available Swap Space (SwapfreeG)
+metadata.FREE_SPACE_INPAGING_FILES.filed_comments=Available Swap Space (GB)
 metadata.dpCpuRatio5min.filed_comments=CPU utilization in 300 seconds
 metadata.dpSlotType.filed_comments=Type Of Device Hot-pluggable Board
 metadata.RX_DROPPED.filed_comments=Number Of Packets Discarded Upon Receipt
 metadata.sysName.table_comments=Get Target Host Basic Information
 metadata.OUTOCTETSSPEED.filed_comments=Output Speed
-metadata.TOTAL_MEMORY_SIZE.filed_comments=Total Memory (TotalG)
+metadata.TOTAL_MEMORY_SIZE.filed_comments=Total Memory (GB)
 metadata.ifInUnknownProtos.filed_comments=Inbound Unknown Packets
 metadata.TIME_CONSUMING_MIN.filed_comments=Minimum Elapsed Time (In Milliseconds)
 metadata.RX_ERRORS.filed_comments=Number Of Error Packets Received
@@ -5009,10 +5009,10 @@ metadata.TX_PPS.filed_comments=Output pps (Number of packets sent per second)
 metadata.TIME_DELAY.filed_comments=Time Difference (Unit: Minutes)
 metadata.sysObjectID.table_comments=Get Target Host Basic Information
 metadata.inPktsSpeed.filed_comments=Package Rate
-metadata.FREE_CPU_PERC.filed_comments=Current Idle Rate (Id%)
+metadata.FREE_CPU_PERC.filed_comments=Idle Rate (%)
 metadata.IS_IDENTICAL.filed_comments=Is it accessible 
 metadata.ifOutNUcastPkts.filed_comments=Non-unidirectional Data Packets
-metadata.USED_MEMORY_SIZE.filed_comments=Used Memory (UsedG)
+metadata.USED_MEMORY_SIZE.filed_comments=Used Memory (GB)
 metadata.HOST_NAME.filed_comments=Host Name
 metadata.ifSpecific.filed_comments=Detailed description of the port by the Management Information Base (MIB).
 metadata.SERVICE_DATE.filed_comments=Server Time
@@ -7036,7 +7036,7 @@ client.NmsClient.ncDeamonStartException=The NC daemon starts an exception
 
 client.SystemInfo.memerySize=Total memory size
 client.SystemInfo.core=core
-client.SystemInfo.mhz=frequency
+client.SystemInfo.mhz=Cpu MHz
 client.SystemInfo.currentUsed=Used now
 client.SystemInfo.spaceRemain=Remaining
 client.SystemInfo.shiyonglv=Usage
@@ -7331,20 +7331,20 @@ procInfoList.text.process=Process
 procInfoList.text.updateFile=Upgrade File
 procInfoList.text.updateSuccess=The update is successful
 procInfoList.text.updateFaild=Update failed
-procInfoList.text.bordName=Board Name
-procInfoList.text.procName=Process Name
+procInfoList.text.bordName=Compute Sled
+procInfoList.text.procName=Process
 procInfoList.text.proceNo=Process No.
 procInfoList.text.procStartTime=Process Start Time
 procInfoList.text.cpuUsage=CPU Usage
-procInfoList.text.memeryUsage=Memory Footprint
-procInfoList.text.procState=Process Status
+procInfoList.text.memeryUsage=Memory Usage
+procInfoList.text.procState=Status
 procInfoList.text.ok=Normal
 procInfoList.text.no=Abnormal
 procInfoList.text.strengthened=System Strengthened 
 procInfoList.text.optimized=System Optimized
-procInfoList.text.sysname=System Name
-procInfoList.text.serviceName=Service Name
-procInfoList.text.serviceState=Service Status
+procInfoList.text.sysname=Compute Sled
+procInfoList.text.serviceName=Name
+procInfoList.text.serviceState=Status
 
 processReset.text.result=Reset mirror not saved.Reset failed!
 processReset.text.confirm=Confirm reset?This oparetion is dangerous and irreversible.
diff --git a/gloam/WebRoot/main.html b/gloam/WebRoot/main.html
index a43af0c..3d8e53a 100644
--- a/gloam/WebRoot/main.html
+++ b/gloam/WebRoot/main.html
@@ -18,7 +18,7 @@
 	display:none;
 }
 </style>
-<title>网络流处理设备</title>
+<title>Network Flow Processing Equipment</title>
 <!-- header页面保存引入的css js样式 -->
 #include("/common/header.html")
 </head>
@@ -123,7 +123,7 @@
 									<li class="dropdown-menu-title" style="height:25px">
 										<a href="/exit" class="international-a" style="width:93.5%">
 											<span>#(_res.get("exit.system"))</span>
-											<i class='icon-off'></i>
+											<i class='icon-signout'></i>
 										</a> 
 										
 										
diff --git a/gloam/WebRoot/process/processInfoList.html b/gloam/WebRoot/process/processInfoList.html
index 9ef6f91..252d6c3 100644
--- a/gloam/WebRoot/process/processInfoList.html
+++ b/gloam/WebRoot/process/processInfoList.html
@@ -49,12 +49,12 @@
 													<th style='text-align:center;vertical-align: middle;'>
 														<span>i18n_procInfoList.text.procName_n81i</span>
 													</th>
-													<th style='text-align:center;vertical-align: middle;'>
+													<!-- <th style='text-align:center;vertical-align: middle;'>
 														<span>i18n_procInfoList.text.proceNo_n81i</span>
 													</th>
 													<th style='text-align:center;vertical-align: middle;'>
 														<span>i18n_procInfoList.text.procStartTime_n81i</span>
-													</th>
+													</th> -->
 													<th style='text-align:center;vertical-align: middle;'>
 														<span>i18n_procInfoList.text.cpuUsage_n81i(%)</span>
 													</th>
@@ -86,12 +86,12 @@
 														<td class="logmessage">
 															<span>#(proc["procName"])</span>
 														</td>
-														<td class="logmessage">
+														<!-- <td class="logmessage">
 															<span>#(proc["pid"])</span>
 														</td>
 														<td class="logmessage">
 															<span>#(proc["startTime"])</span>
-														</td>
+														</td> -->
 														<td class="logmessage">
 															<span>#(proc["cpu"])</span>
 														</td>
diff --git a/gloam/WebRoot/process/serviceInfoList.html b/gloam/WebRoot/process/serviceInfoList.html
index 3af7502..5f41298 100644
--- a/gloam/WebRoot/process/serviceInfoList.html
+++ b/gloam/WebRoot/process/serviceInfoList.html
@@ -34,7 +34,7 @@
 					</noscript>
 
 					<!-- start: Content -->
-					<div id="content" class="span10" >
+					<div id="content" class="span10 hidden"  style="display:none;">
 						<div class="row-fluid  " style="margin-top:10px">
 							<div class="box">
 								<div class="box-header" data-original-title>
diff --git a/gloam/WebRoot/route/route.html b/gloam/WebRoot/route/route.html
index 1570fb7..9e8399e 100644
--- a/gloam/WebRoot/route/route.html
+++ b/gloam/WebRoot/route/route.html
@@ -98,7 +98,7 @@
 										aria-controls="DataTables_Table_0" rowspan="1" colspan="1"
 										aria-sort="ascending"
 										aria-label="Username: activate to sort column descending"
-										style="width: 153px;">Ip</th>
+										style="width: 153px;">IP</th>
 									<th style='text-align:center;vertical-align: middle;'class="sorting" role="columnheader" tabindex="0"
 										aria-controls="DataTables_Table_0" rowspan="1" colspan="1"
 										aria-label="Date registered: activate to sort column ascending"
@@ -110,11 +110,11 @@
 									<th style='text-align:center;vertical-align: middle;'class="sorting" role="columnheader" tabindex="0"
 										aria-controls="DataTables_Table_0" rowspan="1" colspan="1"
 										aria-label="Role: activate to sort column ascending"
-										style="width: 126px;">Interface</th>
+										style="width: 126px;">Network Interface</th>
 									<th style='text-align:center;vertical-align: middle;'class="sorting" role="columnheader" tabindex="0"
 										aria-controls="DataTables_Table_0" rowspan="1" colspan="1"
 										aria-label="Actions: activate to sort column ascending"
-										style="width: 50px;">Handle</th>
+										style="width: 50px;">Management</th>
 								</tr>
 							</thead>
 
diff --git a/gloam/conf/collector/device_config b/gloam/conf/collector/device_config
index 5106aaa..4e2a109 100644
--- a/gloam/conf/collector/device_config
+++ b/gloam/conf/collector/device_config
@@ -10,13 +10,13 @@ import shutil
 def update_route(data):
     list = []
     route_path = '/etc/sysconfig/static-routes'
-    requestOldParam = 'any net ' + data['destination_ip_old'] + ' netmask ' + data['ip_mask_old'] + ' gw ' + data['gateway_old'] + ' ' + \
+    requestOldParam = 'any net ' + data['destination_ip_old'] + ' netmask ' + data['ip_mask_old'] + ' gw ' + data['gateway_old'] + ' dev ' + \
                   data['interface']
     result = os.system(
-        'route add -net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' ' +
+        'route add -net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' dev ' +
         data['interface'])
     result2 = os.system(
-        'route del -net ' + data['destination_ip_old'] + ' netmask ' + data['ip_mask_old'] + ' gw ' + data['gateway_old'] + ' ' +
+        'route del -net ' + data['destination_ip_old'] + ' netmask ' + data['ip_mask_old'] + ' gw ' + data['gateway_old'] + ' dev ' +
         data['interface'])
     # ��������쳣����ֹ����
     if (result != 0):
@@ -30,7 +30,7 @@ def update_route(data):
         lines = f_route.readlines()
         for line in reversed(lines):
             if (requestOldParam in line):
-                list.append('any net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' ' + \
+                list.append('any net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' dev ' + \
                   data['interface'] + '\n')
             else:
                 list.append(line)
@@ -41,8 +41,9 @@ def update_route(data):
 
 def new_route(data):
     # �����·��
+    print('route add -net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] +' dev '+data['interface'])
     result = os.system(
-        'route add -net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] +' '+data['interface'])
+        'route add -net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] +' dev '+data['interface'])
     # ��������쳣����ֹ����
     if (result != 0):
         print(result)
@@ -54,7 +55,7 @@ def new_route(data):
         with open(route_path, 'w') as f:
             f.close()
     with open(route_path, 'r+') as f:
-        strData = 'any net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' ' + \
+        strData = 'any net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' dev ' + \
                   data['interface']
         f.seek(0, 2)
         f.write('\n' + strData)
@@ -64,9 +65,9 @@ def remove_route(data):
     #ɾ��·����Ϣ
     route_path = '/etc/sysconfig/static-routes'
     list = []
-    requestParam='any net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' ' + data['interface']
+    requestParam='any net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' dev ' + data['interface']
     result = os.system(
-        'route del -net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' ' +
+        'route del -net ' + data['destination_ip'] + ' netmask ' + data['ip_mask'] + ' gw ' + data['gateway'] + ' dev ' +
         data['interface'])
     # ��������쳣����ֹ����
     if (result != 0):
@@ -106,7 +107,7 @@ def query_route():
                     result['destination_ip'] = data[2]
                     result['ip_mask'] = data[4]
                     result['gateway'] = data[6]
-                    result['r_interface'] = data[7]
+                    result['r_interface'] = data[8]
                     if(result):
                         list.append(result)
     return list
diff --git a/gloam/conf/i18n_en_US.properties b/gloam/conf/i18n_en_US.properties
index 558160a..2f3af92 100644
--- a/gloam/conf/i18n_en_US.properties
+++ b/gloam/conf/i18n_en_US.properties
@@ -1,11 +1,11 @@
 msg=International
 admin.common.choice                  = Choice
-admin.common.close                   = Close
+admin.common.close                   = Cancel
 admin.common.delete                  = Delete
 admin.common.determine               = Determine
 admin.common.edit                    = The editor
 admin.common.export                  = Export
-system.config						 = NIC Set
+system.config						 = Network Interface
 audit.log						     = Audit Log
 sign.in								 = Sign In
 sign.out							 = Sign Out
@@ -14,17 +14,17 @@ page.up								 = Page Up
 page.down							 = Page Down
 total								 = Total
 page								 = Page
-creater								 = Creator
-create.time							 = Create Time
-cpuuser.usage						 = CPU Monitor: User Usage Rate\uff08us%\uff09
+creater								 = Username
+create.time							 = Time
+cpuuser.usage						 = CPU\uff08us%\uff09
 cpuuser								 = User Usage Rate\uff08us%\uff09
-memory.usage						 = Memory Monitor: Memory Utilization Rate\uff08us%\uff09
-memory								 = Memory Utilization Rate\uff08us%\uff09
-disk.usage						 	 = Disk Monitor: Disk Usage \uff08us%\uff09
+memory.usage						 = Memory\uff08us%\uff09
+memory								 = Memory Usage Rate\uff08us%\uff09
+disk.usage						 	 = Disk\uff08us%\uff09
 disk								 = Disk Usage \uff08us%\uff09
-netdata.usage						 = Netdata Monitor: Number Of Network Card Packets
+netdata.usage						 = Packet I/O
 netdata								 = Number Of Network Card Packets
-ip									 = IP
+ip									 = Source IP
 uri									 = URI
 request.way							 = Request Way
 log.message							 = Log Message
@@ -32,17 +32,17 @@ home.page							 = Home Page
 exit.system							 = Exit
 login								 = Login
 exit								 = Exit
-explain	                             = Explain
-route.config                         = Route Config
+explain	                             = Operation
+route.config                         = Route
 route.modify						 = Route Modify
 config.modify						 = Config Modify
-monitor								 = Equipment Monitoring
-monitor.card						 = Card Name
-monitor.type						 = Monitoring Category
-monitor.setting						 = Setting Name
-monitor.status						 = Status
-monitor.check						 = Status	Recent Check Time
-monitor.information					 = Status Information
+monitor								 = Monitoring
+monitor.card						 = Compute Sled
+monitor.type						 = Current
+monitor.setting						 = History
+monitor.status						 = Check
+monitor.check						 = Last Check time
+monitor.information					 = Status
 monitor.performacedata				 = Performace Data
 monitor.checktime				 	 = Check Time
 monitor.nextchecktime				 = Next Check Time
@@ -51,14 +51,14 @@ save.changes						 = Save
 reset								 = Reset
 reboot								 = Reboot
 shutdown							 = Shutdown
-handle.success						 = Handle Success
+handle.success						 = Success
 handle.error					     = Error ! Please try again later 
 software.type						 = Software Type
 software.release					 = Software Release
 gateway								 = Gateway
 mask								 = Mask
-destination.ip						 = Destination Ip
-interface							 = Interface
+destination.ip						 = Destination IP
+interface							 = Network Interface
 mac									 = MAC
 account                              = Account
 password                             = Password
@@ -69,28 +69,28 @@ remove.message						 = Are you sure remove?
 modify								 = Modify
 create								 = Create
 error.message						 = Please check again!
-handle								 = Handle
+handle								 = Management
 signError							 = Other account login
 loginTimeOut						 = Time out please login again
 waitInfo 							 = Please waiting
 modify.message						 = Are you sure modify?
-node.ip								 = Node IP
-normal								 = Normal
-abnormal							 = Abnormal
+node.ip								 = IP
+normal								 = Passed
+abnormal							 = Failed
 monitor.error						 = Monitor Error
 monitor.data.details				 = Monitoring Data Details
 monitor.data						 = Monitoring Data
-serviceConfig						 = Software Management
-showProcess							 = Show Process
+serviceConfig						 = Device Overview
+showProcess							 = Process
 device.config						 = Device Settings
-os.Config							 = OS Settings
+os.Config							 = Service
 software.config						 = Software Configuration
 software.update						 = Business Software Upgrade
 other.business						 = Third Party Business Plug-in Management
 net.config							 = The Network Configuration
 device.operate						 = Equipment Operation
 hardware.info						 = Hardware Information
-base.info							 = The Basic Information
+base.info							 = Hardware Information
 hardware.config						 = The Hardware Configuration
 snmp								 = Information Management
 
@@ -98,7 +98,7 @@ startTime							 = Start Time
 endTime								 = End Time
 chart.submit						 = Submit
 chart.oneMore						 = Please choose at least one option
-os.Config							 = OS Settings
+os.Config							 = Service
 startTime							 = Start Time
 endTime								 = End Time
 chart.submit						 = Submit
diff --git a/gloam/src/com/nis/gloam/service/DeviceInfoNewService.java b/gloam/src/com/nis/gloam/service/DeviceInfoNewService.java
index 732ab43..b55829c 100644
--- a/gloam/src/com/nis/gloam/service/DeviceInfoNewService.java
+++ b/gloam/src/com/nis/gloam/service/DeviceInfoNewService.java
@@ -46,7 +46,7 @@ public class DeviceInfoNewService {
 	public List<Object> getMonitorTypeDetailInfo(Long detectionInfoId, String checkTypeId) {
 		List<Object> result = new ArrayList<Object>();
 		
-		String showColunmSql = "select m.TABLE_NAME as tableName, m.FILED_NAME as fieldName, m.FILED_COMMENTS as fieldComments from METADATA m where m.check_type_id=? and m.state=0";
+		String showColunmSql = "select m.TABLE_NAME as tableName, m.FILED_NAME as fieldName, m.FILED_COMMENTS as fieldComments from METADATA m where m.check_type_id=? and m.state=0 order by show_num";
 		List<Metadata> metadatas = Metadata.dao.find(showColunmSql, checkTypeId);
 		
 		result.add(metadatas);