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

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

@@ -1188,4 +1188,4 @@ APP_DNS_ADMIN=APP DNS Admin
APP_SSL_ADMIN=APP SSL Admin
APP_DK_GL=APP\u591A\u7528\u9014\u6807\u7B7E
dnat_complex_loop=DNAT IP\u590D\u7528\u56DE\u6D41
ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41
ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41