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/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
This commit is contained in:
DuanDongmei
2018-12-05 09:41:05 +08:00
parent c02af9efb2 ebbf999cf7
commit 53555aa73a
70 changed files with 575 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -964,12 +964,12 @@ encrypted_tunnel_behavior_ratelimit=Behavior Identify Rate Limit
encrypted_tunnel_behavior_monit=Behavior Identify Monitor
encrypted_tunnel_behavior_drop=Behavior Identify Drop
ip_protocol=IP Protocol
MM_AV_IP=AV IP
MM_PIC_IP=Picture IP
MM_PIC_URL=Picture URL
MM_AV_URL=AV URL
INLINE_IP_CB=IP Drop
MM_VOIP_IP=VoIP IP
MM_AV_IP=IP
MM_PIC_IP=IP
MM_PIC_URL=URL
MM_AV_URL=URL
INLINE_IP_CB=IP
MM_VOIP_IP=IP
MM_VOIP_ACCOUNT=VoIP Account
drop_ip=IP Drop
loop_ip=IP Loop
@@ -1336,4 +1336,5 @@ address_pool_is_used=Address pool is used and cannot perform this operation!
cgi_service_failed=Request CGI server failed
available_ip=Available IP
config_sync=Configuration Synchronization
info_failed=Information Acquisition Failure
info_failed=Information Acquisition Failure
address_pool_ip_configuration=Address Pool IP Configuration

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

@@ -1334,4 +1334,5 @@ address_pool_id=Address Pool ID
log_to_cfg=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
address_pool_is_used=Address pool is used and cannot perform this operation!
available_ip=Available IP
config_sync=Configuration Synchronization
config_sync=Configuration Synchronization
address_pool_ip_configuration=Address Pool IP Configuration

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

@@ -1334,4 +1334,5 @@ address_pool_is_used=\u5730\u5740\u6C60\u5DF2\u88AB\u4F7F\u7528\uFF0C\u65E0\u6CD
cgi_service_failed=\u8BF7\u6C42CGI\u670D\u52A1\u63A5\u53E3\u5931\u8D25
available_ip=\u53EF\u7528IP\u5730\u5740
config_sync=\u914D\u7F6E\u540C\u6B65
info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
address_pool_ip_configuration=\u5730\u5740\u6C60 IP\u914D\u7F6E