diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index cc8187761..79c6634b3 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -35,14 +35,14 @@ control_grey=Grey List social_app_grey=Social Application Grey List encryption_control=Encrypted Text Control specific_agreement_control=Specific Protocol Control -social_app_control=Social Application Control +social_app_control=Social Application online_media_control=Online Media Control sip_ip_control=SIP IP Control domain_control_white=Domainl White List -ip_address_control=IP Control -ip_control=IP Control +ip_address_control=IP +ip_control=IP domain_control=Domain Control -dns_control=DNS Control +dns_control=DNS basic_configuration=Basic Configuration Request_from=Request Office classification_manage=Classification Management @@ -53,34 +53,34 @@ label_manage=Label Management protect_list=Protect List effect_range=Effective Range agreement_ip_configuration=Protocol IP Management -ip_spoofing_configuration=Spoofing IP Management -website_control=Website Control +ip_spoofing_configuration=Spoofing IP +website_control=Website host_control=HOST Control url_control=URL Control website_keyword_control=Website Keyword Control -mail_control=Mail Control +mail_control=Mail recipient_control=Recipient Control sender_control=Sender Control subject_control=Subject Control mail_keyword_control=Mail Keyword Control mail_attachment_name_control=Mail Attachment Name Control mail_attachment_content_control=Mail Attachment Content Control -file_transfer_control=File Transfer Control +file_transfer_control=File Transfer ftp_address_control=FTP Url Control ftp_name_control=FTP Filename Control ftp_content_control=FTP File Content Control http_app_feature=Social Application HTTP Feature ssl_app_feature=Social Application SSL Feature -tunnel_protocol_control=Tunnel Protocol IP Control -l2tp_ip_control=L2TP IP Control -pptp_ip_control=pptp IP Control -openvpn_control=OpenVPN Control -socks_control=Socks Control -gre_control=GRE Control -ike_control=IKE Control -ipsec_control=IPSec Control -ssh_control=SSH Control -ssl_control=SSL Control +tunnel_protocol_control=Tunnel Protocol IP +l2tp_ip_control=L2TP +pptp_ip_control=PPTP +openvpn_control=OpenVPN +socks_control=SOCKS +gre_control=GRE +ike_control=IKE +ipsec_control=IPSEC +ssh_control=SSH +ssl_control=SSL ssl_feature_control=SSL Cert Control ssl_sni_control=SSL SNI Control ssl_address_control=SSL IP Control @@ -153,7 +153,7 @@ request_header_keyword_control=Request Header Keyword Control response_header_keyword_control=Response Header Keyword Control mail_key_control=Mail Keyowrd Control ftp_multi_control=FTP Multiple Control -ftp_control=FTP Control +ftp_control=FTP tunnel_protocol_multi_control=Tunnel Multiple Control l2tp_protocol_control=L2TP Control pptp_protocol_control=PPTP Control @@ -346,7 +346,8 @@ cancel_approved=Cancel Confirmation #==========guankongbaimingdan begin===================== client_ip=Client IP server_ip=Server IP -port=port +port=Port +ip=IP client_port=Client Port client_port_mask=Client Port Mask client_address_mask=Client IP Mask @@ -549,21 +550,21 @@ http_req_body_control=HTTP Request Body Control http_res_control=HTTP Response Control http_res_hdr_control=HTTP Response Header Control http_res_body_control=HTTP Response Header Control -av_control=Multi-Media Control -av_content_ip_control=Content IP Control -av_picture_ip_control=Picture IP Control -av_content_url_control=Content URL Control -av_picture_url_control=Picture URL Control -av_voip_control=VoIP Control -av_voip_ip_control=VoIP IP Control -av_voip_account_control=VoIP Account Control -av_sample_audio_control=Audio Sample Control -av_sample_vedio_control=Vedio Sample Control -av_sample_picture_control=Picture Sample Control -av_sample_voip_control=VoIP Sample Control -av_sample_audio_porn_control=Audio Porn Sign Sample Control -av_sample_vedio_porn_control=Vedio Porn Sign Sample Control -av_sample_control=Sample Control +av_control=Multi-Media +av_content_ip_control=Content IP +av_picture_ip_control=Picture IP +av_content_url_control=Content URL +av_picture_url_control=Picture URL +av_voip_control=VoIP +av_voip_ip_control=VoIP IP +av_voip_account_control=VoIP Account +av_sample_audio_control=Audio Sample +av_sample_vedio_control=Vedio Sample +av_sample_picture_control=Picture Sample +av_sample_voip_control=VoIP Sample +av_sample_audio_porn_control=Audio Porn Sign Sample +av_sample_vedio_porn_control=Vedio Porn Sign Sample +av_sample_control=Sample configure_statistics_info=Configure statistics info harm_level=Degree of harm src_file=Source File @@ -626,14 +627,15 @@ action_ratelimit=rate limit action_replace=replace action_whitelist=White List action_monit=monit -file_digest_control=File Digest Control +file_digest_control=File Digest raw_len=File Length digest=Digest cfds_level=Matching Confidence file_url=File URL -bgp_control=BGP Control +other=Other +bgp_control=BGP bgp_ip=bgp Ip -xmpp_control=XMPP Control +xmpp_control=XMPP xmpp_ip=xmpp Ip #===============protocol IP Import start================= chooseFile=Choose File @@ -728,9 +730,9 @@ ip_intercept=IP Intercept domain_intercept=Domain Intercept control_policy=Control Policy domain_forward=Domain Forward -http_redirect=HTTP redirect +http_redirect=HTTP Redirect http_req_replace=Http Request Body Replace -http_res_replace=Http ResponseContent Replace +http_res_replace=Http Response Body Replace replace_content=Replace Content #=============about proxy========= #===========policy_group_manage start ============= @@ -742,26 +744,26 @@ policy_group_manage=Policy Group Management #=============about manipulation========= ip_Reuse_policy=IP Reuse Policy target_ip_protectTarget IP Protect -ratelimit_config=Ratelimit Management -ip_ratelimit=IP speed limit -domain_ratelimit=Domain speed limit +ratelimit_config=Ratelimit +ip_ratelimit=IP Speed Limit +domain_ratelimit=Domain Speed Limit ratelimit=Limit Rate ir_type=Reuse type dns_strategy_id=DNS Policy ID #=============about manipulation========= #=============about app config=========== domain=Domain -app_ip_config=APP Protocol IP Configuration +app_ip_config=APP Protocol IP bytes=byte -app_http_config=APP HTTP Feature Configuration -app_domain_config=APP Domain Feature Configuration -app_byte_config=APP Byte Feature Configuration +app_http_config=APP HTTP Feature +app_domain_config=APP Domain Feature +app_byte_config=APP Byte Feature social_app=Social Applicaiton -app_policy_config=APP Policy Configuration -app_features_config=APP Feature Configuration +app_policy_config=APP Policy +app_features_config=APP Feature #=============about app config=========== #=============about Maintenance========= -ip_Reuse_pool_config=IP Reuseing Pool Configuration +ip_Reuse_pool_config=IP Reuseing Pool dns_res_strategy=DNS Response Policy No. policy_number=Policy No. policy_name=Policy Name @@ -771,6 +773,9 @@ ttl_unit=Unit / second 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 #=============about Maintenance========= #=============some validation=========== line=line %s @@ -953,8 +958,8 @@ src_ip_report=Domestic Source IP Report dest_ip_report=Destination Country IP Report isp_report=ISP Report #=============about report=================== -ip_multiplex_policy=IP Reuse Policy Configuration -target_ip_protect=Target IP Protect Configuration -ip_multiplex_pool_config=IP Reuse Addr Pool Configuration +ip_multiplex_policy=IP Reuse Policy +target_ip_protect=Target IP Protect +ip_multiplex_pool_config=IP Reuse Addr Pool letter=Request Info show_more=Show More \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 6671f00f6..dab7b9588 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -35,14 +35,14 @@ control_grey=\u7BA1\u63A7\u7070\u540D\u5355 social_app_grey=\u793E\u4EA4\u5E94\u7528\u7070\u540D\u5355 encryption_control=\u52A0\u5BC6\u5185\u5BB9\u7BA1\u63A7 specific_agreement_control=\u7279\u5B9A\u534F\u8BAE\u7BA1\u63A7 -social_app_control=\u793E\u4EA4\u5E94\u7528\u7BA1\u63A7 +social_app_control=\u793E\u4EA4\u5E94\u7528 online_media_control=\u5728\u7EBF\u5A92\u4F53\u7BA1\u63A7 sip_ip_control=SIP\u534F\u8BAEIP\u7BA1\u63A7 domain_control_white=\u57DF\u540D\u7BA1\u63A7\u767D\u540D\u5355 ip_address_control=IP\u5730\u5740\u7BA1\u63A7 -ip_control=IP\u7BA1\u63A7 +ip_control=IP domain_control=\u57DF\u540D\u7BA1\u63A7 -dns_control=DNS\u7BA1\u63A7 +dns_control=DNS basic_configuration=\u57FA\u672C\u914D\u7F6E letter_from=\u6765\u51FD\u5355\u4F4D classification_manage=\u5206\u7C7B\u7BA1\u7406 @@ -53,34 +53,34 @@ label_manage=\u6807\u7B7E\u7BA1\u7406 protect_list=\u4FDD\u62A4\u540D\u5355 effect_range=\u751F\u6548\u8303\u56F4 agreement_ip_configuration=\u534F\u8BAEIP\u914D\u7F6E -ip_spoofing_configuration=\u6B3A\u9A97IP\u914D\u7F6E -website_control=\u7F51\u7AD9\u7BA1\u63A7 +ip_spoofing_configuration=\u6B3A\u9A97IP +website_control=\u7F51\u7AD9 host_control=HOST\u7BA1\u63A7 url_control=URL\u7BA1\u63A7 website_keyword_control=\u7F51\u9875\u5185\u5BB9\u5173\u952E\u5B57\u7BA1\u63A7 -mail_control=\u90AE\u4EF6\u7BA1\u63A7 +mail_control=\u90AE\u4EF6 recipient_control=\u6536\u4EF6\u4EBA\u7BA1\u63A7 sender_control=\u53D1\u4EF6\u4EBA\u7BA1\u63A7 subject_control=\u4E3B\u9898\u7BA1\u63A7 mail_keyword_control=\u90AE\u4EF6\u5185\u5BB9\u5173\u952E\u5B57\u7BA1\u63A7 mail_attachment_name_control=\u90AE\u4EF6\u9644\u4EF6\u540D\u5173\u952E\u5B57\u7BA1\u63A7 mail_attachment_content_control=\u90AE\u4EF6\u9644\u4EF6\u5185\u5BB9\u5173\u952E\u5B57\u7BA1\u63A7 -file_transfer_control=\u6587\u4EF6\u4F20\u8F93\u7BA1\u63A7 +file_transfer_control=\u6587\u4EF6\u4F20\u8F93 ftp_address_control=FTP\u5730\u5740\u7BA1\u63A7 ftp_name_control=FTP\u6587\u4EF6\u540D\u7BA1\u63A7 ftp_content_control=FTP \u6587\u4EF6\u5185\u5BB9\u7BA1\u63A7 http_app_feature=\u793E\u4EA4\u5E94\u7528HTTP\u7279\u5F81 ssl_app_feature=\u793E\u4EA4\u5E94\u7528SSL\u7279\u5F81 -tunnel_protocol_control=\u96A7\u9053\u534F\u8BAE\u7BA1\u63A7 -l2tp_ip_control=L2TP\u534F\u8BAEIP\u7BA1\u63A7 -pptp_ip_control=pptp\u534F\u8BAEIP\u7BA1\u63A7 -openvpn_control=OpenVPN\u7BA1\u63A7 -socks_control=socks\u7BA1\u63A7 -gre_control=gre\u7BA1\u63A7 -ike_control=ike\u7BA1\u63A7 -ipsec_control=ipsec\u7BA1\u63A7 -ssh_control=SSH\u7BA1\u63A7 -ssl_control=SSL\u7BA1\u63A7 +tunnel_protocol_control=\u96A7\u9053\u534F\u8BAE +l2tp_ip_control=L2TP +pptp_ip_control=PPTP +openvpn_control=OpenVPN +socks_control=SOCKS +gre_control=GRE +ike_control=IKE +ipsec_control=IPSEC +ssh_control=SSH +ssl_control=SSL ssl_feature_control=SSL\u8BC1\u4E66\u7279\u5F81\u7BA1\u63A7 ssl_sni_control=SSL\uFF08SNI\uFF09\u7BA1\u63A7 ssl_address_control=SSL\u5730\u5740\u7BA1\u63A7 @@ -153,7 +153,7 @@ request_header_keyword_control=\u8BF7\u6C42\u5934\u57DF\u5173\u952E\u5B57\u7BA1\ response_header_keyword_control=\u5E94\u7B54\u5934\u57DF\u5173\u952E\u5B57\u7BA1\u63A7 mail_key_control=\u90AE\u4EF6\u5173\u952E\u5B57\u7BA1\u63A7 ftp_multi_control=FTP\u591A\u57DF\u7BA1\u63A7 -ftp_control=FTP\u7BA1\u63A7 +ftp_control=FTP tunnel_protocol_multi_control=\u96A7\u9053\u534F\u8BAE\u591A\u57DF\u7BA1\u63A7 l2tp_protocol_control=L2TP\u534F\u8BAE\u7BA1\u63A7 pptp_protocol_control=PPTP\u534F\u8BAE\u7BA1\u63A7 @@ -249,7 +249,7 @@ has_approved=\u5DF2\u7ECF\u901A\u8FC7\u5BA1\u6838\uFF0C\u65E0\u6CD5\u8FDB\u884C\ hasnot_approved=\u672A\u901A\u8FC7\u5BA1\u6838\uFF0C\u65E0\u6CD5\u8FDB\u884C\u8BE5\u64CD\u4F5C\uFF01 check_one=\u8BF7\u9009\u62E9\u4E00\u6761\u6570\u636E\uFF01 one_more=\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u6761\u6570\u636E\! -one_more_area=\u533A\u57DF\u7BA1\u63A7\uFF0C\u5FC5\u987B\u586B\u5199\u8FD0\u8425\u5546\u6216ip\u4FE1\u606F\! +one_more_area=\u533A\u57DF\u7BA1\u63A7\uFF0C\u5FC5\u987B\u586B\u5199\u8FD0\u8425\u5546\u6216IP\u4FE1\u606F\! custom_columns=\u81EA\u5B9A\u4E49\u5217\u5B57\u6BB5 maxlength_64=\u8BF7\u8F93\u5165\u4E00\u4E2A\u957F\u5EA6\u6700\u591A\u662F 64\u7684\u5B57\u7B26\u4E32\uFF01 maxlength_128=\u8BF7\u8F93\u5165\u4E00\u4E2A\u957F\u5EA6\u6700\u591A\u662F 128\u7684\u5B57\u7B26\u4E32\uFF01 @@ -347,6 +347,7 @@ cancel_approved=\u53D6\u6D88\u5BA1\u6838\u901A\u8FC7 client_ip=\u6E90IP server_ip=\u76EE\u7684IP port=\u7AEF\u53E3 +ip=IP client_port=\u6E90\u7AEF\u53E3 client_port_mask=\u6E90\u7AEF\u53E3\u63A9\u7801 client_address_mask=\u6E90\u5730\u5740\u63A9\u7801 @@ -377,7 +378,7 @@ hex_binary=HEX\u683C\u5F0F\u4E8C\u8FDB\u5236 case_insensitive_nohex=\u5927\u5C0F\u5199\u4E0D\u654F\u611F\uFF0C\u4E14\u975EHEX case_sensitive_nohex=\u5927\u5C0F\u5199\u654F\u611F\uFF0C\u4E14\u975EHEX area_effect_id=\u533A\u57DF\u751F\u6548id -ip_type=ip\u7C7B\u578B +ip_type=IP\u7C7B\u578B #==========guankongbaimingdan end===================== #==========tedingfuwu begin===================== protocol_id=\u534F\u8BAEID @@ -541,29 +542,29 @@ ip_whitelist=IP\u767D\u540D\u5355 domain_whitelist=\u57DF\u540D\u767D\u540D\u5355 dns_ip_control=DNS IP\u7BA1\u63A7 dns_domain_control=DNS\u57DF\u540D\u7BA1\u63A7 -http_req_control=HTTP\u8BF7\u6C42\u7BA1\u63A7 +http_req_control=HTTP\u8BF7\u6C42 http_ip_control=HTTP IP\u5730\u5740\u7BA1\u63A7 http_url_control=HTTP URL\u7BA1\u63A7 http_req_hdr_control=HTTP\u8BF7\u6C42\u5934\u57DF\u7BA1\u63A7 http_req_body_control=HTTP\u8BF7\u6C42\u5185\u5BB9\u7BA1\u63A7 -http_res_control=HTTP\u5E94\u7B54\u7BA1\u63A7 +http_res_control=HTTP\u5E94\u7B54 http_res_hdr_control=HTTP\u5E94\u7B54\u5934\u57DF\u7BA1\u63A7 http_res_body_control=HTTP\u5E94\u7B54\u5934\u57DF\u7BA1\u63A7 -av_control=\u97F3\u89C6\u9891\u7BA1\u63A7 -av_content_ip_control=\u5185\u5BB9IP\u7BA1\u63A7 -av_picture_ip_control=\u56FE\u7247IP\u7BA1\u63A7 -av_content_url_control=\u5185\u5BB9URL\u7BA1\u63A7 -av_picture_url_control=\u56FE\u7247URL\u7BA1\u63A7 -av_voip_control=VoIP\u7BA1\u63A7 -av_voip_ip_control=VoIP IP\u7BA1\u63A7 -av_voip_account_control=VoIP\u8D26\u53F7\u7BA1\u63A7 -av_sample_audio_control=\u97F3\u9891\u6837\u4F8B\u7BA1\u63A7 -av_sample_vedio_control=\u89C6\u9891\u6837\u4F8B\u7BA1\u63A7 -av_sample_picture_control=\u56FE\u7247\u6837\u4F8B\u7BA1\u63A7 -av_sample_voip_control=VoIP\u6837\u4F8B\u7BA1\u63A7 -av_sample_audio_porn_control=\u97F3\u9891\u8272\u60C5\u6837\u4F8B\u7BA1\u63A7 -av_sample_vedio_porn_control=\u89C6\u9891\u8272\u60C5\u6837\u4F8B\u7BA1\u63A7 -av_sample_control=\u6837\u4F8B\u7BA1\u63A7 +av_control=\u97F3\u89C6\u9891 +av_content_ip_control=\u97F3\u89C6\u9891\u5185\u5BB9IP +av_picture_ip_control=\u97F3\u89C6\u9891\u56FE\u7247IP +av_content_url_control=\u97F3\u89C6\u9891\u5185\u5BB9URL +av_picture_url_control=\u97F3\u89C6\u9891\u56FE\u7247URL +av_voip_control=\u97F3\u89C6\u9891VoIP +av_voip_ip_control=VoIP IP +av_voip_account_control=VoIP\u8D26\u53F7 +av_sample_audio_control=\u97F3\u9891\u6837\u4F8B +av_sample_vedio_control=\u89C6\u9891\u6837\u4F8B +av_sample_picture_control=\u56FE\u7247\u6837\u4F8B +av_sample_voip_control=VoIP\u6837\u4F8B +av_sample_audio_porn_control=\u97F3\u9891\u8272\u60C5\u6837\u4F8B +av_sample_vedio_porn_control=\u89C6\u9891\u8272\u60C5\u6837\u4F8B +av_sample_control=\u97F3\u89C6\u9891\u6837\u4F8B configure_statistics_info=\u914D\u7F6E\u7EDF\u8BA1\u4FE1\u606F harm_level=\u5371\u5BB3\u7A0B\u5EA6 src_file=\u6E90\u6587\u4EF6 @@ -579,14 +580,14 @@ no_permission=\u6743\u9650\u4E0D\u8DB3 param_error=\u53C2\u6570\u6709\u8BEF\uFF0C\u670D\u52A1\u5668\u65E0\u6CD5\u89E3\u6790\u3002 request_service_failed=\u8BF7\u6C42\u670D\u52A1\u63A5\u53E3\u5931\u8D25 request_error=\u8BF7\u6C42\u9519\u8BEF -av_voip_ip_title=voip Ip -av_voip_account_title=voip\u8D26\u53F7 +av_voip_ip_title=VoIP Ip +av_voip_account_title=VoIP\u8D26\u53F7 account=\u8D26\u53F7 -ip_pattern=ip\u683C\u5F0F +ip_pattern=IP\u683C\u5F0F port_pattern=\u7AEF\u53E3\u683C\u5F0F port_mask=\u7AEF\u53E3\u63A9\u7801 -ip_range=ip\u8303\u56F4 -ip_subnet=ip\u63A9\u7801 +ip_range=IP\u8303\u56F4 +ip_subnet=IP\u63A9\u7801 district=\u5339\u914D\u533A\u57DF keywords=\u5173\u952E\u5B57 http_ip_title=HTTP IP\u914D\u7F6E @@ -599,7 +600,7 @@ ssl_ip=SSL IP\u914D\u7F6E ssl_sni=SSL SNI\u5173\u952E\u5B57\u914D\u7F6E ssl_san=SSL SAN\u5173\u952E\u5B57\u914D\u7F6E ssl_ca=SSL CA\u5173\u952E\u5B57\u914D\u7F6E -http_control=http\u914D\u7F6E +http_control=HTTP\u914D\u7F6E ingress=\u51FA\u53E3\u65B9\u5411 egress=\u5165\u53E3\u65B9\u5411 fileTransfer_control=\u6587\u4EF6\u4F20\u8F93\u914D\u7F6E @@ -626,15 +627,16 @@ action_ratelimit=\u9650\u901F action_replace=\u66FF\u6362 action_whitelist=\u767D\u540D\u5355 action_monit=\u76D1\u6D4B -file_digest_control=\u6587\u4EF6\u6458\u8981\u7BA1\u63A7 +file_digest_control=\u6587\u4EF6\u6458\u8981 raw_len=\u6587\u4EF6\u539F\u59CB\u957F\u5EA6 digest=\u6587\u4EF6\u6458\u8981 cfds_level=\u5339\u914D\u7F6E\u4FE1\u5EA6 file_url=\u6587\u4EF6\u8DEF\u5F84 -bgp_control=BGP\u7BA1\u63A7 -bgp_ip=bgp Ip -xmpp_control=XMPP\u7BA1\u63A7 -xmpp_ip=xmpp Ip +other=\u5176\u4ED6 +bgp_control=BGP +bgp_ip=BGP IP +xmpp_control=XMPP +xmpp_ip=XMPP IP #===============protocol IP Import start================= chooseFile=\u9009\u62E9\u6587\u4EF6 download=\u6A21\u677F\u4E0B\u8F7D @@ -663,11 +665,11 @@ cfg_id=\u914D\u7F6EID found_time=\u53D1\u73B0\u65F6\u95F4 recv_time=\u63A5\u6536\u65F6\u95F4 protocol_type=\u534F\u8BAE\u7C7B\u578B -addr_type=ip\u5730\u5740\u7C7B\u578B -serverip=\u670D\u52A1\u7AEFip\u5730\u5740 -clientip=\u5BA2\u6237\u7AEFip\u5730\u5740 -serverport=\u670D\u52A1\u7AEFip\u7AEF\u53E3 -clientport=\u5BA2\u6237\u7AEFip\u7AEF\u53E3 +addr_type=IP\u5730\u5740\u7C7B\u578B +serverip=\u670D\u52A1\u7AEFIP\u5730\u5740 +clientip=\u5BA2\u6237\u7AEFIP\u5730\u5740 +serverport=\u670D\u52A1\u7AEFIP\u7AEF\u53E3 +clientport=\u5BA2\u6237\u7AEFIP\u7AEF\u53E3 entrance_id=\u51FA\u5165\u53E3\u7F16\u53F7 deviceid=\u4E32\u8054\u8BBE\u5907 direct=\u4F20\u8F93\u65B9\u5411 @@ -728,9 +730,9 @@ ip_intercept=IP\u62E6\u622A domain_intercept=\u57DF\u540D\u62E6\u622A control_policy=\u63A7\u5236\u7B56\u7565 domain_forward=\u57DF\u540D\u8F6C\u53D1 -http_redirect=http\u91CD\u5B9A\u5411 -http_req_replace=http\u8BF7\u6C42\u5185\u5BB9\u66FF\u6362 -http_res_replace=http\u5E94\u7B54\u5185\u5BB9\u66FF\u6362 +http_redirect=HTTP\u91CD\u5B9A\u5411 +http_req_replace=HTTP\u8BF7\u6C42\u5185\u5BB9\u66FF\u6362 +http_res_replace=HTTP\u5E94\u7B54\u5185\u5BB9\u66FF\u6362 replace_content=\u66FF\u6362\u5185\u5BB9 #=============about proxy========= #===========policy_group_manage start ============= @@ -740,10 +742,10 @@ group_name=\u5206\u7EC4\u540D\u79F0 policy_group_manage=\u7B56\u7565\u5206\u7EC4\u7BA1\u7406 #===========policy_group_manage end ============= #=============about manipulation========= -ip_multiplex_policy=ip\u590D\u7528\u7B56\u7565 +ip_multiplex_policy=IP\u590D\u7528\u7B56\u7565 target_ip_protect=\u76EE\u6807IP\u9632\u62A4 ratelimit_config=\u9650\u6D41\u7BA1\u7406 -ip_ratelimit=ip\u9650\u6D41 +ip_ratelimit=IP\u9650\u6D41 domain_ratelimit=\u57DF\u540D\u9650\u6D41 ratelimit=\u9650\u901F\u6BD4\u4F8B ir_type=\u590D\u7528\u7C7B\u578B @@ -751,18 +753,18 @@ dns_strategy_id=dns\u7B56\u7565id #=============about manipulation========= #=============about app config=========== domain=\u57DF\u540D -app_ip_config=APP\u534F\u8BAEip\u914D\u7F6E +app_ip_config=APP\u534F\u8BAEIP bytes=\u5B57\u8282 -app_http_config=APP HTTP\u7279\u5F81\u914D\u7F6E -app_domain_config=APP\u57DF\u540D\u7279\u5F81\u914D\u7F6E -app_byte_config=APP\u5B57\u8282\u7279\u5F81\u914D\u7F6E +app_http_config=APP HTTP\u7279\u5F81 +app_domain_config=APP\u57DF\u540D\u7279\u5F81 +app_byte_config=APP\u5B57\u8282\u7279\u5F81 social_app=\u793E\u4EA4\u5E94\u7528 -app_policy_config=APP\u7B56\u7565\u914D\u7F6E -app_features_config=APP\u7279\u5F81\u914D\u7F6E +app_policy_config=APP\u7B56\u7565 +app_features_config=APP\u7279\u5F81 #=============about app config=========== #=============about Maintenance========= -ip_multiplex_pool_config=ip\u590D\u7528\u5730\u5740\u6C60\u914D\u7F6E -dns_res_strategy=dns\u54CD\u5E94\u7B56\u7565 +ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60 +dns_res_strategy=DNS\u54CD\u5E94\u7B56\u7565 policy_number=\u7B56\u7565\u53F7 policy_name=\u7B56\u7565\u540D\u79F0 min_ttl=\u6700\u5C0F\u5B58\u6D3B\u65F6\u95F4 @@ -771,6 +773,9 @@ ttl_unit=\u5355\u4F4D/\u79D2 res_group_num=\u5E94\u7B54\u6570 policy_number_value_valid=\u7B56\u7565\u53F7\u503C\u53EA\u80FD\u4E3A0\uFF0C\u6216\u5927\u4E8E100 policy_number_value_unique=\u7B56\u7565\u53F7\u5DF2\u5B58\u5728 +location=\u4F4D\u7F6E +extra=\u5883\u5916 +intra=\u5883\u5185 #=============about Maintenance========= #=============some validation=========== line=\u7B2C%s\u884C @@ -785,11 +790,11 @@ not_number=%s\u5FC5\u987B\u4E3A\u6570\u5B57 av_sample_audio=\u97F3\u9891\u6837\u4F8B av_sample_vedio=\u89C6\u9891\u6837\u4F8B av_sample_picture=\u56FE\u7247\u6837\u4F8B -av_sample_voip=voip\u6837\u4F8B +av_sample_voip=VoIP\u6837\u4F8B av_sample_audio_porn=\u97F3\u9891\u8272\u60C5\u573A\u666F\u6837\u4F8B av_sample_vedio_porn=\u89C6\u9891\u8272\u60C5\u573A\u666F\u6837\u4F8B WHITE_LIST_IP=IP\u767D\u540D\u5355 -av_voip_ip=voip ip\u914D\u7F6E +av_voip_ip=VoIP IP\u914D\u7F6E NTC_HTTP_URL=URL\u914D\u7F6E NTC_HTTP_REQ_HDR=\u8BF7\u6C42\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E NTC_HTTP_RES_HDR=\u5E94\u7B54\u5934\u57DF\u5173\u952E\u5B57\u914D\u7F6E @@ -798,7 +803,7 @@ NTC_HTTP_RES_BODY=\u5E94\u7B54\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E NTC_UNIVERSAL_IP=IP\u914D\u7F6E NTC_DNS_REGION=\u5173\u952E\u5B57\u914D\u7F6E WHITE_LIST_DOMAIN=\u57DF\u540D\u767D\u540D\u5355 -av_voip_account=voip\u8D26\u53F7\u914D\u7F6E +av_voip_account=VoIP\u8D26\u53F7\u914D\u7F6E av_cont_ip=\u5185\u5BB9IP\u914D\u7F6E NTC_SSL_SNI=SNI\u5173\u952E\u5B57\u914D\u7F6E NTC_SSL_SAN=SAN\u5173\u952E\u5B57\u914D\u7F6E @@ -899,8 +904,8 @@ ssh_monit=ssh\u76D1\u6D4B ssh_reject=ssh\u7BA1\u63A7 ftp_monit=FTP\u76D1\u6D4B ftp_reject=FTP\u7BA1\u63A7 -openvpn_reject=openvpn\u7BA1\u63A7 -openvpn_monit=openvpn\u76D1\u6D4B +openvpn_reject=OpenVPN\u7BA1\u63A7 +openvpn_monit=OpenVPN\u76D1\u6D4B l2tp_reject=l2tp\u7BA1\u63A7 l2tp_monit=l2tp\u76D1\u6D4B pptp_reject=pptp\u7BA1\u63A7 @@ -937,7 +942,7 @@ proxy_domain_forward=PXY\u57DF\u540D\u8F6C\u53D1 ip_ratelimit=IP\u9650\u6D41 domain_ratelimit=\u57DF\u540D\u9650\u6D41 ip_complex_loop=IP\u590D\u7528 -http_redirect=HTTP\u91CD\u5B9A\u5411\u914D\u7F6E +http_redirect=HTTP\u91CD\u5B9A\u5411 ddos_ip_drop=DDOS\u76EE\u6807\u9632\u62A4IP ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u914D\u7F6E app_strategy_monit=APP\u7B56\u7565\u76D1\u6D4B @@ -985,18 +990,18 @@ ssh_monit=ssh\u76D1\u6D4B ssh_reject=ssh\u7BA1\u63A7 ftp_monit=FTP\u76D1\u6D4B ftp_reject=FTP\u7BA1\u63A7 -openvpn_reject=openvpn\u7BA1\u63A7 -openvpn_monit=openvpn\u76D1\u6D4B -l2tp_reject=l2tp\u7BA1\u63A7 -l2tp_monit=l2tp\u76D1\u6D4B -pptp_reject=pptp\u7BA1\u63A7 -pptp_monit=pptp\u76D1\u6D4B +openvpn_reject=OpenVPN\u7BA1\u63A7 +openvpn_monit=OpenVPN\u76D1\u6D4B +l2tp_reject=L2TP\u7BA1\u63A7 +l2tp_monit=L2TP\u76D1\u6D4B +pptp_reject=PPTP\u7BA1\u63A7 +pptp_monit=PPTP\u76D1\u6D4B socks_reject=SOCKS\u7BA1\u63A7 -socks_monit=socks\u76D1\u6D4B +socks_monit=SOCKS\u76D1\u6D4B gre_drop=GRE\u4E22\u5F03 gre_monit=GRE\u76D1\u6D4B -ike_drop=ike\u4E22\u5F03 -ike_monit=ike\u76D1\u6D4B +ike_drop=IKE\u4E22\u5F03 +ike_monit=IKE\u76D1\u6D4B ipsec_drop=IPSEC\u4E22\u5F03 ipsec_monit=IPSEC\u76D1\u6D4B bgp_reject=BGP\u7BA1\u63A7 @@ -1040,4 +1045,4 @@ src_ip_report=\u5883\u5185\u6E90IP\u62A5\u8868 dest_ip_report=\u76EE\u7684\u56FD\u5BB6IP\u62A5\u8868 isp_report=\u8FD0\u8425\u5546\u5C40\u70B9\u62A5\u8868 #=============about report=================== -show_more=\u5C55\u793A\u66F4\u591A \ No newline at end of file +show_more=\u5C55\u793A\u66F4\u591A diff --git a/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp index a6d2daa0d..b0669aad2 100644 --- a/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/complexIpInfo.jsp @@ -40,7 +40,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp index 71ffbe792..af2857327 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp @@ -158,12 +158,12 @@ $(function(){ name="exprType" value="1" class="required" checked> + code="and_expression" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp index a507304a1..85262ef3a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp @@ -158,12 +158,12 @@ $(function(){ name="exprType" value="1" class="required" checked> + code="and_expression" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp index c7ffb103f..21d592d47 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp @@ -180,12 +180,12 @@ $(function(){ name="exprType" value="1" class="required" checked> + code="and_expression" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index 45d899c0f..75670c650 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -65,12 +65,12 @@ name="${cfgName}.exprType" value="1" class="required" checked> + code="and_expression" />
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp index 9a943f31d..d55b92d88 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp @@ -126,8 +126,8 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp index c79a099fe..3ab32b8d7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp @@ -134,8 +134,8 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp index f6a465667..c3790a539 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppSubList.jsp @@ -131,8 +131,8 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp index d9e5d22c9..949aa08de 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp @@ -151,8 +151,8 @@ @@ -206,8 +206,8 @@ @@ -255,8 +255,8 @@ @@ -310,8 +310,8 @@ @@ -361,8 +361,8 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp index b3fab8021..bbd5d1d0a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp @@ -133,8 +133,8 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp index 2bf98f8ef..92f2cc7a6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp @@ -154,8 +154,8 @@ @@ -204,8 +204,8 @@ @@ -249,8 +249,8 @@ @@ -300,8 +300,8 @@ @@ -345,8 +345,8 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp index 3ab5aacf5..9eed42642 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp @@ -125,8 +125,8 @@