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

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