From f2ddc8ec656cbb07f5e0ba55620579c6b4e9df09 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Tue, 28 Aug 2018 09:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BB=9F=E4=B8=80=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=E6=BA=90IP,=E7=9B=AE=E7=9A=84IP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_ru.properties    | 4 ++--
 src/main/resources/messages/message_zh_CN.properties | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index e315f4c40..863cf5202 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -333,8 +333,8 @@ cancel_approved=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C \u043E\u0434\u0
 
 #==========youjianguankong end=====================
 #==========guankongbaimingdan begin=====================
-client_ip=IP-\u0430\u0434\u0440\u0435\u0441 \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0430
-server_ip=IP-\u0430\u0434\u0440\u0435\u0441 \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0442\u044F
+client_ip=IP-\u0430\u0434\u0440\u0435\u0441 \u043A\u043B\u0438\u0435\u043D\u0442\u0430
+server_ip=IP-\u0430\u0434\u0440\u0435\u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
 port=\u041F\u043E\u0440\u0442
 ip=IP-\u0430\u0434\u0440\u0435\u0441
 client_port=\u041F\u043E\u0440\u0442 \u0438\u0441\u0442\u043E\u0447\u043D\u0438\u043A\u0430
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index d3d46de79..27db5be58 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -627,8 +627,8 @@ found_time=\u53D1\u73B0\u65F6\u95F4
 recv_time=\u63A5\u6536\u65F6\u95F4
 protocol_type=\u534F\u8BAE\u7C7B\u578B
 addr_type=IP\u5730\u5740\u7C7B\u578B
-serverip=\u670D\u52A1\u7AEFIP\u5730\u5740
-clientip=\u5BA2\u6237\u7AEFIP\u5730\u5740
+serverip=\u76EE\u7684IP
+clientip=\u6E90IP
 serverport=\u670D\u52A1\u7AEFIP\u7AEF\u53E3
 clientport=\u5BA2\u6237\u7AEFIP\u7AEF\u53E3
 entrance_id=\u51FA\u5165\u53E3
@@ -1024,7 +1024,7 @@ MM_AV_IP=\u97F3\u89C6\u9891IP
 MM_PIC_IP=\u56FE\u7247IP
 MM_PIC_URL=\u56FE\u7247URL
 MM_AV_URL=\u97F3\u89C6\u9891URL
-#INLINE_IP_CB=\u4e32\u8054IP
+#INLINE_IP_CB=\u4E32\u8054IP
 MM_VOIP_IP=VoIP IP
 MM_VOIP_ACCOUNT=VoIP\u8D26\u53F7
 #=======================for import ip configuration=================