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

This commit is contained in:
wangxin
2018-09-21 19:46:15 +08:00
3 changed files with 16 additions and 5 deletions

View File

@@ -996,7 +996,7 @@ traffic_chart=Traffic Chart
os_type=OS Type
browser_type=Browser Type
traffic_protocol_chart=Protocol TOP10
traffic_ipactive_chart=IP Active TOP10
traffic_ipactive_chart=Active IP TOP10
traffic_app_chart=App TOP10
traffic_ua_list=UA TOP10
traffic_ua_chart=UA
@@ -1123,7 +1123,7 @@ certificate_validity=Certificate Validity Period
header=Header
layer=Layer
can_not_delete_issued_asn_group=Can not delete issued ASN group
bandwith=Bandwith
bandwith=Bandwidth
limit_rate_type=Limit Rate Type
business_type=Business Type
topic=Topic
@@ -1168,4 +1168,7 @@ ASN_POLICY_REJECT=ASN Policy Control
ASN_POLICY_MONIT=ASN Policy Monitoring
p2p_monit=P2P Monitoring
av_content_url_whitelist=Multimedia Content Url White List
av_content_ip_whitelist=Multimedia Content IP White List
av_content_ip_whitelist=Multimedia Content IP White List
active_port=Active Port TOP10
visits=Visits
percentage=Percentage

View File

@@ -1169,4 +1169,9 @@ mm_face_recognization_reject=Face Recognization Reject
app_topic_domain_monit=Topic Website Momotoring
ASN_POLICY_REJECT=ASN Policy Control
ASN_POLICY_MONIT=ASN Policy Monitoring
p2p_monit=P2P Monitoring
p2p_monit=P2P Monitoring
av_content_url_whitelist=Multimedia Content Url White List
av_content_ip_whitelist=Multimedia Content IP White List
active_port=Active Port TOP10
visits=visits
percentage=Percentage

View File

@@ -1165,4 +1165,7 @@ ASN_POLICY_REJECT=ASN\u7B56\u7565\u7BA1\u63A7
ASN_POLICY_MONIT=ASN\u7B56\u7565\u76D1\u6D4B
p2p_monit=P2P\u76D1\u6D4B
av_content_url_whitelist=\u591A\u5A92\u4F53\u5185\u5BB9URL\u914D\u7F6E\u767D\u540D\u5355
av_content_ip_whitelist=\u591A\u5A92\u4F53\u5185\u5BB9IP\u914D\u7F6E\u767D\u540D\u5355
av_content_ip_whitelist=\u591A\u5A92\u4F53\u5185\u5BB9IP\u914D\u7F6E\u767D\u540D\u5355
active_port=\u6D3B\u8DC3\u7AEF\u53E3 TOP10
visits=\u8BBF\u95EE\u6B21\u6570
percentage=\u767E\u5206\u6BD4