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

Merge branch '2.4' into guides

pull/3843/head
Steve Clement 2018-11-03 19:48:00 +09:00
parent a9543f0ec1 0dbacf4975
commit 66d21effca
15 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit 0be65bfca87031b252ee53578d708e7add0f4418
Subproject commit f500d46470ff49a36e1911c5f71628a5ae5ae415

2
app/Locale/cze/LC_MESSAGES/default.po
View File

@ -6931,7 +6931,7 @@ msgid "This event has "
msgstr ""
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr ""
#: View/Events/view.ctp:344

2
app/Locale/dan/LC_MESSAGES/default.po
View File

@ -6938,7 +6938,7 @@ msgid "This event has "
msgstr "Denne event har "
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr ""
#: View/Events/view.ctp:344

2
app/Locale/default.pot
View File

@ -7174,7 +7174,7 @@ msgid "This event has "
msgstr ""
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr ""
#: View/Events/view.ctp:344

2
app/Locale/deu/LC_MESSAGES/default.po
View File

@ -6931,7 +6931,7 @@ msgid "This event has "
msgstr ""
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr ""
#: View/Events/view.ctp:344

4
app/Locale/fra/LC_MESSAGES/default.po
View File

@ -6950,8 +6950,8 @@ msgid "This event has "
msgstr "Cet événement a"
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr "la corrélations avec les données obtenues depuis des flux variés, peut toutefois, en raison du grand nombre d'attributs ne sont pas affichés.Cliquez (<a href=\"%s\\/overrideLimit:1\">ici</a> pour rafraichir la page avec les données de flux chargés."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr "la corrélations avec les données obtenues depuis des flux variés, peut toutefois, en raison du grand nombre d'attributs ne sont pas affichés.Cliquez <a href=\"%s\\/overrideLimit:1\">ici</a> pour rafraichir la page avec les données de flux chargés."
#: View/Events/view.ctp:344
msgid "Warning: Potential false positives"

2
app/Locale/ita/LC_MESSAGES/default.po
View File

@ -6936,7 +6936,7 @@ msgid "This event has "
msgstr "Questo evento ha "
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr ""
#: View/Events/view.ctp:344

2
app/Locale/jpn/LC_MESSAGES/default.po
View File

@ -6945,7 +6945,7 @@ msgid "This event has "
msgstr "This event has "
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr "さまざまなフィードに含まれるデータの相関、しかしながら多数のアトリビュートがあるため、実際のフィードの相関は表示されません。フィードが読み込まれたページを更新するためには<a href=\"%s\\/overrideLimit:1\">ここ</a>をクリックしてください。"
#: View/Events/view.ctp:344

2
app/Locale/kor/LC_MESSAGES/default.po
View File

@ -6931,7 +6931,7 @@ msgid "This event has "
msgstr ""
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr ""
#: View/Events/view.ctp:344

2
app/Locale/pt_BR/LC_MESSAGES/default.po
View File

@ -6931,7 +6931,7 @@ msgid "This event has "
msgstr ""
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr ""
#: View/Events/view.ctp:344

2
app/Locale/spa/LC_MESSAGES/default.po
View File

@ -6931,7 +6931,7 @@ msgid "This event has "
msgstr ""
#: View/Events/view.ctp:336
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgid "correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href=\"%s\\/overrideLimit:1\">here</a> to refresh the page with the feed data loaded."
msgstr ""
#: View/Events/view.ctp:344

2
app/View/Events/view.ctp
View File

@ -333,7 +333,7 @@
?>
<span>
<?php echo __('This event has ');?><span class="bold"><?php echo h($event['Event']['FeedCount']); ?></span>
<?php echo __('correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click (<a href="%s\/overrideLimit:1">here</a> to refresh the page with the feed data loaded.', h($this->here));?>
<?php echo __('correlations with data contained within the various feeds, however, due to the large number of attributes the actual feed correlations are not shown. Click <a href="%s\/overrideLimit:1">here</a> to refresh the page with the feed data loaded.', h($this->here));?>
</span>
<?php
endif;

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit 6e03108fb104ae90617701aa5d0749cb932c821f
Subproject commit 78bfd806e757ea4ecb91ea6088675b05e4d457ce

2
docs/INSTALL.ubuntu1804.md
View File

@ -123,7 +123,7 @@ sudo -u www-data git submodule foreach --recursive git config core.filemode fals
sudo -u www-data git config core.filemode false
# Create a python3 virtualenv
sudo -u www-data virtualenv -p python3 ${PATH_TO_MISP}/MISP/venv
sudo -u www-data virtualenv -p python3 ${PATH_TO_MISP}/venv
# make pip happy
sudo mkdir /var/www/.cache/

2
docs/generic/MISP_CAKE_init.md
View File

@ -1,5 +1,7 @@
#### Initialize MISP configuration and set some defaults
```bash
# Default Cake path
export CAKE="$PATH_TO_MISP/app/Console/cake"
# Initialize user and fetch Auth Key
sudo -E $CAKE userInit -q
AUTH_KEY=$(mysql -u $DBUSER_MISP -p$DBPASSWORD_MISP misp -e "SELECT authkey FROM users;" | tail -1)