Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/resources/messages/message_en.properties

@@ -709,7 +709,7 @@ pid=Program Id
 log_uri=Log URI
 fd_type=Block Type
 access_url=Progam Access URL
-referer=Referer
+refer=Refer
 black_block_list=Active Block Black List
 static_cfg_block=Static Cfg Block
 first_hit=First Hit
@@ -738,7 +738,7 @@ policy_group_manage=Policy Group
 #===========policy_group_manage end  =============
 #=============about manipulation=========
 ip_Reuse_policy=IP Reuse Policy
-target_ip_protect=Anti DDOS 
+target_ip_protect=Target IP Protect
 ratelimit_config=Ratelimit
 ip_ratelimit=IP Ratelimit
 domain_ratelimit=Website Ratelimit
@@ -984,6 +984,7 @@ dest_ip_report=Dest IP Report
 isp_report=ISP Report
 #=============about report===================
 ip_multiplex_policy=IP Reuse Policy
+target_ip_protect=Anti DDOS 
 ip_multiplex_pool_config=IP Reuse Addr Pool
 letter=Official Letter
 show_more=Show More
@@ -1042,44 +1043,9 @@ app_desc=Application Description
 tunnel_code=Tunnel Behavior No
 tunnel_name=Tunnel Behavior Name
 tunnel_desc=Tunnel Behavior Description
-call_external_procedures_failed=Call external procedures failed
-is_hex=Is HEX
-is_case_insenstive=Is Case-senstive
-case_senstive=Case-senstive
-case_insenstive=Case-insenstive
-hex=Hex
-not_hex=Not HEX
-
-p2p_reject=P2P Control
-NTC_P2P_IP=IP Configuration
-NTC_P2P_HASH_BIN=HASH Configuration
-NTC_P2P_KEYWORDS=Content Configuration
-
-s_asn=Source ASN
-d_asn=Destination ASN
-s_subscribe_id=Source Subscribe ID
-d_subscribe_id=Destination Subscribe ID
-scene_file=Scene File
-req_hdr_key=Request Header File Key
-req_body_key=Request Body File Key
-res_hdr_key=Response Header File Key
-res_body_key=Response Body File Key
-website=Website
-
-p2p_ip_config_type=IP Config Type
-p2p_hash_type=Hash Type
-NTC_SUBSCRIBE_ID=Certification Mark Configuration
-
-app_header_config=APP Header Feature
-app_ssl_config=APP SSL Cert Feature
-ip_intercepter_replace=IP Intercept Replace
-domain_intercepter_replace=Domain Intercept Replace
-ip_intercepter_ratelimit=IP Intercept Ratelimit
-domain_intercepter_ratelimit=Domain Intercept Ratelimit
-app_built_in_features_config=APP Built-in Features
-PXY_INTERCEPT_PKT_BIN=Intercept Messages
-certificate=Certificate
-do_log=Do Log
-no_log=Not Do Log
-all_log=Log All Logs
-framework_log=Only Framework Logs
+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
+response_file=Response File

src/main/resources/messages/message_ru.properties

@@ -883,4 +883,9 @@ MM_VOIP_ACCOUNT=VOIP Account
 drop_ip=IP Drop
 loop_ip=IP Loop
 drop_or_loop_ip=IP Drop Or Loop
-reject_or_monit_ip=IP Reject Or Monit
+reject_or_monit_ip=IP Reject Or Monit
+
+file_desc=File Desc
+content_type=Content Type
+content_length=Content Length
+response_file=Response File

src/main/resources/messages/message_zh_CN.properties

@@ -1080,4 +1080,9 @@ certificate=\u8BC1\u4E66
 do_log=\u662F\u5426\u8BB0\u5F55\u65E5\u5FD7
 no_log=\u4E0D\u8BB0\u5F55
 all_log=\u8BB0\u5F55\u6240\u6709\u65E5\u5FD7
-framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7
+framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7
+file_strategy=\u6587\u4EF6\u7B56\u7565
+file_desc=\u6587\u4EF6\u63CF\u8FF0	
+content_type=\u5185\u5BB9\u7C7B\u578B
+content_length=\u6587\u4EF6\u957F\u5EA6
+response_file=\u54CD\u5E94\u6587\u4EF6