Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
duandongmei
2018-10-17 17:22:19 +08:00
4 changed files with 108 additions and 3 deletions

View File

@@ -1246,4 +1246,9 @@ mail_address_monit=Mail Address Monit
mail_address_reject=Mail Address Reject
ipsec_protocol=IPSEC Protocol
intercept_intensity=Intercept Related Domains
exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit.
exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit.
file_in_wrong_format=File Format Error
select_certificate=Please Select Certificate Type First
root_certificate=der cer crt pem
intermediate_entity_certificate=p12
private_certificate=pem key p12

View File

@@ -1266,4 +1266,9 @@ mail_address_monit=Mail Address Monit
mail_address_reject=Mail Address Reject
ipsec_protocol=IPSEC Protocol
intercept_intensity=Intercept Related Domains
exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit.
exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit.
file_in_wrong_format=File Format Error
select_certificate=Please Select Certificate Type First
root_certificate=der cer crt pem
intermediate_entity_certificate=p12
private_certificate=pem key p12

View File

@@ -1240,4 +1240,9 @@ mail_address_monit=\u90AE\u4EF6\u5730\u5740\u76D1\u6D4B
mail_address_reject=\u90AE\u4EF6\u5730\u5740\u7BA1\u63A7
ipsec_protocol=IPSEC\u534F\u8BAE
intercept_intensity=\u62E6\u622A\u5F3A\u5EA6
exceeds_duration_limit=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25,\u6587\u4EF6\u65F6\u957F\u8D85\u51FA\u9650\u5236.
exceeds_duration_limit=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25,\u6587\u4EF6\u65F6\u957F\u8D85\u51FA\u9650\u5236.
file_in_wrong_format=\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
select_certificate=\u8BF7\u5148\u9009\u62E9\u6587\u4EF6\u8BC1\u4E66\u7C7B\u578B
root_certificate=der cer crt pem
intermediate_entity_certificate=p12
private_certificate=pem key p12