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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
This commit is contained in:
fangshunjian
2018-08-20 22:17:34 +08:00
parent 1bb113766b 14301b43f3
commit 974a34ea49
161 changed files with 10070 additions and 1890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -774,8 +774,8 @@ res_group_num=Response Group Number
policy_number_value_valid=The policy number can only be 0, or more than 100
policy_number_value_unique=The policy number has already existed
location=Location
extra=Abroad
intra=Territory
extra=Outbound
intra=Inbound
#=============about Maintenance=========
#=============some validation===========
line=line %s
@@ -1044,6 +1044,7 @@ tunnel_code=Tunnel Behavior No
tunnel_name=Tunnel Behavior Name
tunnel_desc=Tunnel Behavior Description
call_external_procedures_failed=Call external procedures failedfile_strategy=\u6587\u4EF6\u7B56\u7565
file_strategy=File Strategy
file_desc=File Desc
content_type=Content Type
content_length=Content Length