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
	拦截域名增加拦截强度
This commit is contained in:
duandongmei
2018-10-15 19:22:17 +08:00
parent 3aa398811a 7eb2c88858
commit fe516d44a8
25 changed files with 270 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1248,4 +1248,4 @@ ipsec_protocol=IPSEC Protocol
intercept_intensity=Intercept Intensity
weak_intensity=Weak
stronger_intensity=Strong
strong_intensity=Stronger
strong_intensity=Stronger

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

@@ -1264,8 +1264,8 @@ mail_address=Mail Address
mail_address_whitelist=Mail Address Whitelist
mail_address_monit=Mail Address Monit
mail_address_reject=Mail Address Reject
ipsec_protocol=IPSEC Protocol
ipsec_protocol=IPSEC Protocol
intercept_intensity=Intercept Intensity
weak_intensity=Weak
stronger_intensity=Strong
strong_intensity=Stronger
strong_intensity=Stronger

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

@@ -1224,14 +1224,14 @@ area_id=\u5730\u57DF
link_num=\u8FDE\u63A5\u6B21\u6570
stat_time=\u7EDF\u8BA1\u65F6\u95F4
log_menu=\u64CD\u4F5C\u83DC\u5355
system_log=\u65E5\u5FD7\u7BA1\u7406
log_management=\u65E5\u5FD7\u7BA1\u7406
log_date=\u65E5\u671F\u8303\u56F4
log_exception=\u53EA\u67E5\u8BE2\u5F02\u5E38\u4FE1\u606F
log_user=\u64CD\u4F5C\u7528\u6237
log_submission=\u63D0\u4EA4\u65B9\u5F0F
log_ip=\u64CD\u4F5C\u8005IP
log_exception_info=\u5F02\u5E38\u4FE1\u606F
system_log=\u65E5\u5FD7\u7BA1\u7406
system_log=Log Management
protected_ddos=\u4FDD\u62A4DDOS\u653B\u51FB
usual_ddos=\u5E38\u7528DDOS\u653B\u51FB
mail_address=\u90AE\u4EF6\u5730\u5740
@@ -1241,5 +1241,6 @@ mail_address_reject=\u90AE\u4EF6\u5730\u5740\u7BA1\u63A7
ipsec_protocol=IPSEC\u534F\u8BAE
intercept_intensity=\u62E6\u622A\u5F3A\u5EA6
weak_intensity=\u5F31
stronger_intensity=\u5F3A
strong_intensity=\u8F83\u5F3A
stronger_intensity=\u8F83\u5F3A
strong_intensity=\u5F3A