gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'demostration_08'

Browse Source 
Develop

See merge request !24
This commit is contained in:
duandongmei
2018-08-15 18:49:00 -04:00
parent f52e526456 83b61fb040
commit 1744feb9e3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/messages/message_en.properties
View File

@@ -549,7 +549,7 @@ ip_pattern=IP Pattern
port_pattern=Port Pattern
port_mask=Port Mask
ip_range=IP Range
ip_subnet=IP Subnet
ip_subnet=IP/Subnet mask
district=Matching District
keywords=Keyword
http_ip_title=IP
@@ -608,7 +608,7 @@ import_failed=Import Failed
import_template_failed=Failed to download the template! Failure information:
the_line_of=Line rowNum
val_protocol_id=Protocol name is empty or not exist
val_ip_type=IP Type Can't be empty,and should by 4(IPV4) or 6(IPV6)
val_ip_type=IP Type Can't be empty,and should by 4(IPv4) or 6(IPv6)
val_src_ip=Client IP format is incorrect or inconsistent with IP type
val_src_mask=Client IP mask format is incorrect or inconsistent with IP type
val_src_port=Client port is empty or incorrectly formatting(0-65535)

4
src/main/resources/messages/message_zh_CN.properties
View File

@@ -548,7 +548,7 @@ ip_pattern=IP\u683C\u5F0F
port_pattern=\u7AEF\u53E3\u683C\u5F0F
port_mask=\u7AEF\u53E3\u63A9\u7801
ip_range=IP\u8303\u56F4
ip_subnet=IP\u63A9\u7801
ip_subnet=IP/\u5B50\u7F51\u63A9\u7801
district=\u5339\u914D\u533A\u57DF
keywords=\u5173\u952E\u5B57
http_ip_title=HTTP IP\u914D\u7F6E
@@ -607,7 +607,7 @@ import_failed=\u5BFC\u5165\u6570\u636E\u5931\u8D25
import_template_failed=\u5BFC\u5165\u6A21\u677F\u4E0B\u8F7D\u5931\u8D25\uFF01\u5931\u8D25\u4FE1\u606F\uFF1A
the_line_of=\u7B2CrowNum\u884C
val_protocol_id=\u534F\u8BAE\u540D\u79F0\u4E3A\u7A7A\u6216\u4E0D\u5B58\u5728
val_ip_type=IP\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A\u5E76\u4E14\u503C\u53EA\u80FD\u4E3A4(IPV4)\u62166(IPV6)
val_ip_type=IP\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A\u5E76\u4E14\u503C\u53EA\u80FD\u4E3A4(IPv4)\u62166(IPv6)
val_src_ip=\u6E90IP\u683C\u5F0F\u4E0D\u6B63\u786E\u6216\u4E0EIP\u7C7B\u578B\u4E0D\u4E00\u81F4
val_src_mask=\u6E90IP\u63A9\u7801\u683C\u5F0F\u4E0D\u6B63\u786E\u6216\u4E0EIP\u7C7B\u578B\u4E0D\u4E00\u81F4
val_src_port=\u6E90\u7AEF\u53E3\u4E3A\u7A7A\u6216\u683C\u5F0F\u4E0D\u6B63\u786E(0-65535)