Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into
develop Conflicts: src/main/resources/messages/message_en.properties src/main/resources/messages/message_ru.properties src/main/resources/messages/message_zh_CN.properties 证书颁发机构及 吊销列表功能提交
This commit is contained in:
@@ -1319,7 +1319,6 @@ user_behavior_data=\u7528\u6237\u7edf\u8ba1
|
||||
ip_behavior_data=\u7528\u6237IP\u7edf\u8ba1
|
||||
not_valid_domain=%s\u4e0d\u662f\u4e00\u4e2a\u5408\u6cd5\u57df\u540d
|
||||
cert_not_match_domain=\u57df\u540d\u4e0e\u6240\u9009\u8bc1\u4e66\u4fe1\u606f\u4e0d\u7b26\u5408\uff01
|
||||
request_uri=SIP\u8bf7\u6c42URIcert_not_match_domain=\u57DF\u540D\u4E0E\u6240\u9009\u8BC1\u4E66\u4FE1\u606F\u4E0D\u7B26\u5408\uFF01
|
||||
crl_file_error=CRL\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
|
||||
crl_issuer_error=crl\u6587\u4EF6\u7684issuer\u4E0E\u8BC1\u4E66\u6587\u4EF6\u7684issuer\u4E0D\u5339\u914D \u7FFB\u8BD1
|
||||
cert_name=\u8BC1\u4E66\u540D\u79F0
|
||||
@@ -1334,4 +1333,15 @@ sip_d_ip=SIP\u670d\u52a1\u7aefIP\u5730\u5740
|
||||
sip_s_ip=SIP\u5ba2\u6237\u7aefIP\u5730\u5740
|
||||
sip_d_port=SIP\u670d\u52a1\u7aef\u7aef\u53e3
|
||||
sip_s_port=SIP\u5ba2\u6237\u7aef\u7aef\u53e3
|
||||
call_id=SIP\u4f1a\u8bddID
|
||||
call_id=SIP\u4f1a\u8bddID
|
||||
collect_voip=VoIP \u6cdb\u6536
|
||||
rtp_d_ip=RTP\u670d\u52a1\u7aefIP\u5730\u5740
|
||||
rtp_s_ip=RTP\u5ba2\u6237\u7aefIP\u5730\u5740
|
||||
rtp_d_port=RTP\u670d\u52a1\u7aef\u7aef\u53e3
|
||||
rtp_s_port=RTP\u5ba2\u6237\u7aef\u7aef\u53e3
|
||||
sip_d_ip=SIP\u670d\u52a1\u7aefIP\u5730\u5740
|
||||
sip_s_ip=SIP\u5ba2\u6237\u7aefIP\u5730\u5740
|
||||
sip_d_port=SIP\u670d\u52a1\u7aef\u7aef\u53e3
|
||||
sip_s_port=SIP\u5ba2\u6237\u7aef\u7aef\u53e3
|
||||
call_id=SIP\u4f1a\u8bddID
|
||||
request_uri=SIP\u8bf7\u6c42URI
|
||||
|
||||
Reference in New Issue
Block a user