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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	
	国际化增加no_tc_udp_port_comment_tip
This commit is contained in:
duandongmei
2018-11-02 11:19:51 +08:00
parent 7808f09f1c bc908c37b3
commit c9d983f083
19 changed files with 172 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1275,7 +1275,7 @@ ipv6_subnet_tip=IPv6/Subnet Mask
example_tip=For Example
rule_desc_tip=Rule description
port_comment_tip=Port must between 0 and 65535
port_mask_comment_tip=Port and port mask must between 0 and 65535
port_mask_comment_tip=Port mask must between 0 and 65535
multi_keywords_tip=Allow multiple keywords to be entered and multiple keywords to be replaced by line breaks.
visible_keyword_tip=Single keyword is not allowed to enter invisible characters.
single_keyword_tip=Only single key input is allowed.
@@ -1305,4 +1305,5 @@ default_request=Default Letter
default_value=Default Value
intercept=Intercept
unkown_error=Unkown Error Infomation
exception_info=Exception Infomation
exception_info=Exception Infomation
no_tc_udp_port_comment_tip=Port must between 0