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
	
	业务配置的list和form的标题取自菜单的国际化code;
	修改dns ssl P2P mail ftp无subscribe时，无预配置也可提交的bug
This commit is contained in:
duandongmei
2018-10-04 13:13:00 +08:00
parent e6c8e78134 4c1bcce61d
commit 6fb3d05a92
70 changed files with 216 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1179,7 +1179,7 @@ protocol_note=Note:Recognizable Protocols Include SIP,RTCP,RTP.
snat_multiplex=SNAT Address Pool
dnat_multiplex=DNAT Address Pool
asn_reject=ASN Reject
asn_monit=ASN Monit
asn_monit=ASN Monitoring
ip_payload=IP Payload
streaming_media=Streaming Media
access_policy=Access Policy
@@ -1194,4 +1194,4 @@ APP_DK_GL=APP DK GL Admin
dnat_ip_complex_loop=DNAT Complex Loop
snat_ip_complex_loop=SNAT Complex Loop
snat_ip_reuse_adress_pool_loop=SNAT IP Reuse Address Pool Loop
dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop
dnat_ip_reuse_adress_pool_loop=DNAT IP Reuse Address Pool Loop