From 8bc06c78c7728c41964bcb74a43a60bebcc903f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Mon, 17 Dec 2018 13:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9spoofing=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=9A=84=E4=B8=8D=E9=9C=80=E8=A6=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84td=E6=9C=AA=E9=9A=90=E8=97=8Fbug=20=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E5=A2=9E=E5=8A=A0area=5Ftype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties     | 3 ++-
 src/main/resources/messages/message_ru.properties     | 3 ++-
 src/main/resources/messages/message_zh_CN.properties  | 3 ++-
 src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 353507165..57feba518 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1394,4 +1394,5 @@ start_ip=Start IP
 end_ip=End IP
 action_detail=Action Detail
 pass=Pass
-live_link=Live Link
\ No newline at end of file
+live_link=Live Link
+area_type=Area Type
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index c57915e0f..ee25a064f 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1398,4 +1398,5 @@ start_ip=Start IP
 end_ip=End IP
 action_detail=Action Detail
 pass=Pass
-live_link=Live Link
\ No newline at end of file
+live_link=Live Link
+area_type=Area Type
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 3ff37d43f..d4b30d3b7 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1394,4 +1394,5 @@ start_ip=Start IP
 end_ip=End IP
 action_detail=\u52a8\u4f5c\u8be6\u60c5
 pass=Pass
-live_link=Live Link
\ No newline at end of file
+live_link=Live Link
+area_type=Area Type
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index 4c16c5cf0..8c6d0b66b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -31,7 +31,7 @@ $(document).ready(function(){
 	<div class="theme-panel hidden-xs hidden-sm">
 	</div>
 	<h3 class="page-title">
-	<spring:message code="openvpn_control"/>
+	<spring:message code="spoofing_ip_policy"/>
 	</h3>
 	
 	<h5 class="page-header"></h5>
@@ -246,7 +246,7 @@ $(document).ready(function(){
 										<spring:message code="${entrances}"/>
 									</td>
 									
-									<td>${log.version}</td>
+									<%-- <td>${log.version}</td>
 									<td>${log.encryptMode}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SYS_YES_NO')}" var="dic">
@@ -256,7 +256,7 @@ $(document).ready(function(){
 									<td>
 										<c:if test="${log.tunnelType==1}">TCP</c:if>
 										<c:if test="${log.tunnelType==2}">UDP</c:if>
-									</td>
+									</td> --%>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>
 										<c:set var="transProtos">${log.transProto }</c:set>