MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:MISP/MISP into develop

pull/7024/head
mokaddem 2021-02-15 13:55:03 +01:00
parent 0b8055c260 7398c71403
commit 5f30ecf322
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Locale/default.pot
View File

@ -4100,11 +4100,11 @@ msgid "Click this to download all network related attributes that you have acces
msgstr ""
#: Model/Event.php:446
msgid "Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to."
msgid "Click this to download a STIX document containing the STIX version of all events and attributes that you have access to."
msgstr ""
#: Model/Event.php:454
msgid "Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
msgid "Click this to download a STIX2 document containing the STIX2 version of all events and attributes that you have access to."
msgstr ""
#: Model/Event.php:462

4
app/Model/Event.php
View File

@ -340,7 +340,7 @@ class Event extends AppModel
'scope' => 'Event',
'requiresPublished' => 1,
'params' => array('returnFormat' => 'stix', 'includeAttachments' => 1),
'description' => __('Click this to download an a STIX document containing the STIX version of all events and attributes that you have access to.')
'description' => __('Click this to download a STIX document containing the STIX version of all events and attributes that you have access to.')
),
'stix2' => array(
'extension' => '.json',
@ -348,7 +348,7 @@ class Event extends AppModel
'scope' => 'Event',
'requiresPublished' => 1,
'params' => array('returnFormat' => 'stix2', 'includeAttachments' => 1),
'description' => __('Click this to download an a STIX2 document containing the STIX2 version of all events and attributes that you have access to.')
'description' => __('Click this to download a STIX2 document containing the STIX2 version of all events and attributes that you have access to.')
),
'rpz' => array(
'extension' => '.txt',