gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步feature-traffic-log分支修改的增加定时器插件策略表单

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
This commit is contained in:
zhangwei
2019-01-26 19:01:41 +06:00
parent 3373978073
commit 5f321f96ab
38 changed files with 294 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1496,4 +1496,5 @@ on=On
validate_error=Unexpected error occurred while validating
Is_schduler=Scheduler
v4_num=IPv4 Number
v6_num=IPv6 Number
v6_num=IPv6 Number
is_schduler=Scheduler

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

@@ -1497,4 +1497,6 @@ everyWeek=\u0415\u0436\u0435\u043D\u0435\u0434\u0435\u043B\u044C\u043D\u043E
everyMonth=\u0415\u0436\u0435\u043C\u0435\u0441\u044F\u0447\u043D\u043E
validate_error=Unexpected error occurred while validating
v4_num=IPv4 Number
v6_num=IPv6 Number
v6_num=IPv6 Number
on=On
is_schduler=Scheduler