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://10.0.6.99/gwall/gwall.git into develop

Browse Source 
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-06-20 13:37:07 +08:00
parent c4388a6351 e21380a7f1
commit 20e38eb0e8
38 changed files with 2957 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -606,13 +606,21 @@ action_loop=\u56DE\u6D41
action_forward=\u8F6C\u53D1
action_ratelimit=\u9650\u901F
action_replace=\u66FF\u6362
<<<<<<< HEAD
action_whitelist=\u767D\u540D\u5355
=======
action_whitelist=\u767D\u540D\u5355
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git
action_monit=\u76D1\u6D4B
file_digest_control=\u6587\u4EF6\u6458\u8981\u7BA1\u63A7
bgp_control=BGP\u7BA1\u63A7
bgp_ip=bgp Ip
xmpp_control=XMPP\u7BA1\u63A7
<<<<<<< HEAD
xmpp_ip=xmpp Ip
=======
xmpp_ip=xmpp Ip
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git
#===============protocol IP Import start=================
chooseFile=\u9009\u62E9\u6587\u4EF6
download=\u6A21\u677F\u4E0B\u8F7D
@@ -685,10 +693,14 @@ data_tunnel=\u6570\u636E\u901A\u9053
contrl_message=\u63A7\u5236\u62A5\u6587
data_message=\u6570\u636E\u62A5\u6587
user_name=\u7528\u6237\u540D\u79F0
<<<<<<< HEAD
#===========log end =============
#===========policy_group_manage start =============
all_types=\u6240\u6709\u7C7B\u578B
group_type=\u5206\u7EC4\u7C7B\u578B
group_name=\u5206\u7EC4\u540D\u79F0
policy_group_manage=\u7B56\u7565\u5206\u7EC4\u7BA1\u7406
#===========policy_group_manage end =============
#===========policy_group_manage end =============
=======
#===========log end =============
>>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git