Merge remote-tracking branch 'origin/develop' into develop
Conflicts: src/main/resources/messages/message_en.properties src/main/resources/messages/message_zh_CN.properties
This commit is contained in:
fangshunjian
@@ -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
|
||||
|
||||
@@ -314,7 +314,6 @@ config_describe=\u914D\u7F6E\u63CF\u8FF0
|
||||
match_area=\u5339\u914D\u533A\u57DF
|
||||
key_word=\u5173\u952E\u5B57
|
||||
block_type=\u7BA1\u63A7\u7C7B\u578B
|
||||
letter=\u6765\u51FD
|
||||
whether_area_block=\u533A\u57DF\u7BA1\u63A7\u8303\u56F4
|
||||
classification=\u5206\u7C7B
|
||||
label=\u6807\u7B7E
|
||||
@@ -422,7 +421,7 @@ name_existed=\u7528\u6237\u540D\u5DF2\u5B58\u5728
|
||||
parent_org=\u4E0A\u7EA7\u673A\u6784
|
||||
is_useable=\u662F\u5426\u53EF\u7528
|
||||
address=\u8054\u7CFB\u5730\u5740
|
||||
nochange=\u6682\u65E0\u4FEE\u6539\u8BB0\u5F55!
|
||||
nochange=\u6682\u65E0\u4FEE\u6539\u8BB0\u5F55\!
|
||||
module_name=\u6A21\u5757\u540D\u79F0
|
||||
dict_mark=\u5B57\u5178\u6807\u8BC6
|
||||
run_state=\u8FD0\u884C\u72B6\u6001
|
||||
@@ -709,7 +708,7 @@ pid=\u8282\u76EEID
|
||||
log_uri=\u5C01\u5835\u73B0\u573A\u7247\u6BB5\u8DEF\u5F84
|
||||
fd_type=\u5C01\u5835\u7C7B\u578B
|
||||
access_url=\u8282\u76EE\u8BBF\u95EE\u5730\u5740
|
||||
refer=\u5165\u53E3\u9875\u9762
|
||||
referer=\u5165\u53E3\u9875\u9762
|
||||
black_block_list=\u52A8\u6001\u9ED1\u540D\u5355
|
||||
static_cfg_block=\u9759\u6001\u914D\u7F6E
|
||||
first_hit=\u9996\u6B21\u5206\u6790\u547D\u4E2D
|
||||
@@ -737,9 +736,8 @@ default_group=\u7F3A\u7701\u7EC4
|
||||
policy_group_manage=\u7B56\u7565\u5206\u7EC4
|
||||
#===========policy_group_manage end =============
|
||||
#=============about manipulation=========
|
||||
ratelimit_config=\u9650\u6D41\u7BA1\u7406
|
||||
target_ip_protect=\u76EE\u6807IP\u9632\u62A4
|
||||
ratelimit_config=\u9650\u901F
|
||||
target_ip_protect=\u6297DDOS\u653B\u51FB
|
||||
ip_ratelimit=IP\u9650\u6D41
|
||||
domain_ratelimit=\u57DF\u540D\u9650\u6D41
|
||||
ratelimit=\u9650\u901F\u6BD4\u4F8B
|
||||
@@ -983,10 +981,9 @@ 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===================
|
||||
ip_multiplex_policy=IP Reuse Policy
|
||||
target_ip_protect=Anti DDOS
|
||||
ip_multiplex_pool_config=IP Reuse Addr Pool
|
||||
letter=Official Letter
|
||||
ip_multiplex_policy=IP\u590D\u7528\u7B56\u7565
|
||||
ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60
|
||||
letter=\u6765\u51FD
|
||||
show_more=\u5C55\u793A\u66F4\u591A
|
||||
#===============dashboard begin===================================
|
||||
dashboard=\u7EDF\u8BA1\u56FE\u8868
|
||||
@@ -1044,6 +1041,46 @@ tunnel_code=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u5E8F\u53F7
|
||||
tunnel_name=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u540D\u79F0
|
||||
tunnel_desc=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u63CF\u8FF0
|
||||
call_external_procedures_failed=\u8C03\u7528\u5916\u90E8\u7A0B\u5E8F\u51FA\u9519
|
||||
is_hex=\u662F\u5426\u5341\u516D\u8FDB\u5236
|
||||
is_case_insenstive=\u662F\u5426\u5927\u5C0F\u5199\u654F\u611F
|
||||
case_senstive=\u5927\u5C0F\u5199\u654F\u611F
|
||||
case_insenstive=\u5927\u5C0F\u5199\u4E0D\u654F\u611F
|
||||
hex=\u5341\u516D\u8FDB\u5236
|
||||
not_hex=\u975E\u5341\u516D\u8FDB\u5236
|
||||
|
||||
p2p_reject=P2P\u7BA1\u63A7
|
||||
NTC_P2P_IP=IP\u914D\u7F6E
|
||||
NTC_P2P_HASH_BIN=HASH\u914D\u7F6E
|
||||
NTC_P2P_KEYWORDS=\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
|
||||
|
||||
s_asn=\u5BA2\u6237\u7AEFASN
|
||||
d_asn=\u670D\u52A1\u7AEFASN
|
||||
s_subscribe_id=\u5BA2\u6237\u7AEF\u7528\u6237\u540D
|
||||
d_subscribe_id=\u670D\u52A1\u7AEF\u7528\u6237\u540D
|
||||
scene_file=\u73B0\u573A\u65E5\u5FD7\u6587\u4EF6\u5730\u5740
|
||||
req_hdr_key=\u8BF7\u6C42\u5934\u8F6C\u50A8\u6587\u4EF6KEY
|
||||
req_body_key=\u8BF7\u6C42\u4F53\u8F6C\u50A8\u6587\u4EF6KEY
|
||||
res_hdr_key=\u5E94\u7B54\u5934\u8F6C\u50A8\u6587\u4EF6KEY
|
||||
res_body_key=\u5E94\u7B54\u4F53\u8F6C\u50A8\u6587\u4EF6KEY
|
||||
website=\u7F51\u7AD9\u57DF\u540D
|
||||
|
||||
p2p_ip_config_type=IP\u914D\u7F6E\u7C7B\u578B
|
||||
p2p_hash_type=HASH\u7C7B\u578B
|
||||
NTC_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E
|
||||
|
||||
app_header_config=APP\u5C42\u5934\u7279\u5F81
|
||||
app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81
|
||||
ip_intercepter_replace=IP\u62E6\u622A\u66FF\u6362
|
||||
domain_intercepter_replace=\u57DF\u540D\u62E6\u622A\u66FF\u6362
|
||||
ip_intercepter_ratelimit=IP\u62E6\u622A\u9650\u901F
|
||||
domain_intercepter_ratelimit=\u57DF\u540D\u62E6\u622A\u9650\u901F
|
||||
app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4
|
||||
PXY_INTERCEPT_PKT_BIN=\u62E6\u622A\u62A5\u6587
|
||||
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
|
||||
file_strategy=\u6587\u4EF6\u7B56\u7565
|
||||
file_desc=\u6587\u4EF6\u63CF\u8FF0
|
||||
content_type=\u5185\u5BB9\u7C7B\u578B
|
||||
|
||||
Reference in New Issue
Block a user