From 752386dd28620a1e84ef9147ca5d1d8de9301b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= Date: Tue, 23 Apr 2019 18:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E9=94=80=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conflicts: src/main/resources/messages/message_en.properties --- src/main/resources/messages/message_en.properties | 2 +- src/main/resources/messages/message_zh_CN.properties | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 7ec5441ce..48e208763 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1515,7 +1515,6 @@ src_ip_pattern=Client IP Pattern dest_ip_pattern=Server IP Pattern src_port_pattern=Client Port Pattern dest_port_pattern=Server Port Pattern -range_cross=Found intersections between Server IP address and Client IP address url_group_configuration=URL Group Configuration dns_keyword_group_configuration=DNS Keyword Group Configuration app_ip_correlation=APP IP Correlation @@ -1525,3 +1524,4 @@ common_group=Common Group dns_keyword_group_manage=DNS Keyword Group Manage old_asn_group_manage=ASN Group url_group_manage=URL Group Manage +range_cross=Found intersections between Server IP address and Client IP address diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 36c015e26..331c2081c 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1514,14 +1514,4 @@ src_ip_pattern=\u6E90IP\u683C\u5F0F dest_ip_pattern=\u76EE\u7684IP\u683C\u5F0F src_port_pattern=\u6E90\u7AEF\u53E3\u683C\u5F0F dest_port_pattern=\u76EE\u7684\u7AEF\u53E3\u683C\u5F0F -range_cross=\u6E90IP\u4E0E\u76EE\u7684IP\u8303\u56F4\u6709\u4EA4\u53C9 -url_group_configuration=URL\u5206\u7ec4\u914d\u7f6e -dns_keyword_group_configuration=DNS\u5173\u952e\u5b57\u5206\u7ec4\u914d\u7f6e -app_ip_correlation=APP\u5173\u8054\u7279\u5f81IP\u914d\u7f6e -ip_group=IP\u5206\u7ec4 -common_ip_config=IP\u5206\u7ec4\u914d\u7f6e -common_group=\u5206\u7ec4\u7ba1\u7406 -dns_keyword_group_manage=DNS\u5173\u952e\u5b57\u5206\u7ec4\u7ba1\u7406 -old_asn_group_manage=ASN\u7ec4 -url_group_manage=URL\u5206\u7ec4\u7ba1\u7406\u000d\u000a - +range_cross=\u6E90IP\u4E0E\u76EE\u7684IP\u8303\u56F4\u6709\u4EA4\u53C9 \ No newline at end of file